summaryrefslogtreecommitdiff
path: root/keyboards/flx
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/flx')
-rw-r--r--keyboards/flx/lodestone/config.h17
-rw-r--r--keyboards/flx/lodestone/info.json5
-rw-r--r--keyboards/flx/lodestone/lodestone.c17
-rw-r--r--keyboards/flx/virgo/config.h16
-rw-r--r--keyboards/flx/virgo/info.json5
5 files changed, 10 insertions, 50 deletions
diff --git a/keyboards/flx/lodestone/config.h b/keyboards/flx/lodestone/config.h
index 97f2434c51..1d22c074e2 100644
--- a/keyboards/flx/lodestone/config.h
+++ b/keyboards/flx/lodestone/config.h
@@ -16,23 +16,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS { B3, B7, F0, F1, F4 }
-#define MATRIX_COL_PINS { B2, F5, F6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/flx/lodestone/info.json b/keyboards/flx/lodestone/info.json
index e4b19ca8cd..c0ff6682a9 100644
--- a/keyboards/flx/lodestone/info.json
+++ b/keyboards/flx/lodestone/info.json
@@ -8,6 +8,11 @@
"pid": "0x4C53",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B2", "F5", "F6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+ "rows": ["B3", "B7", "F0", "F1", "F4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"],
diff --git a/keyboards/flx/lodestone/lodestone.c b/keyboards/flx/lodestone/lodestone.c
deleted file mode 100644
index bb0df70cc7..0000000000
--- a/keyboards/flx/lodestone/lodestone.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Shaun Mitchell (Flex)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "lodestone.h"
diff --git a/keyboards/flx/virgo/config.h b/keyboards/flx/virgo/config.h
index f0c8fe016a..fe61b1ada8 100644
--- a/keyboards/flx/virgo/config.h
+++ b/keyboards/flx/virgo/config.h
@@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B0, B1 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN B3
#ifdef RGB_DI_PIN
#define RGBLED_NUM 0
diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json
index 3464c98976..213f439287 100644
--- a/keyboards/flx/virgo/info.json
+++ b/keyboards/flx/virgo/info.json
@@ -8,6 +8,11 @@
"pid": "0x5647",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B0", "B1"],
+ "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 5