summaryrefslogtreecommitdiff
path: root/keyboards/xiudi/xd60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/xiudi/xd60')
-rw-r--r--keyboards/xiudi/xd60/info.json12
-rw-r--r--keyboards/xiudi/xd60/rev2/config.h19
-rw-r--r--keyboards/xiudi/xd60/rev2/info.json8
-rw-r--r--keyboards/xiudi/xd60/rev3/config.h19
-rw-r--r--keyboards/xiudi/xd60/rev3/info.json8
5 files changed, 22 insertions, 44 deletions
diff --git a/keyboards/xiudi/xd60/info.json b/keyboards/xiudi/xd60/info.json
index ce4274fc24..12787a72d7 100644
--- a/keyboards/xiudi/xd60/info.json
+++ b/keyboards/xiudi/xd60/info.json
@@ -30,8 +30,8 @@
{"label":")", "x":10, "y":0},
{"label":"_", "x":11, "y":0},
{"label":"+", "x":12, "y":0},
- {"label":"BS", "x":13, "y":0, "w":1},
- {"label":"BS", "x":14, "y":0, "w":1},
+ {"label":"BS", "x":13, "y":0},
+ {"label":"BS", "x":14, "y":0},
{"label":"Tab", "x":0, "y":1, "w":1.5},
{"label":"Q", "x":1.5, "y":1},
@@ -74,7 +74,7 @@
{"label":">", "x":10.25, "y":3},
{"label":"?", "x":11.25, "y":3},
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"FN", "x":14, "y":3, "w":1},
+ {"label":"FN", "x":14, "y":3},
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
{"label":"Win", "x":1.25, "y":4, "w":1.25},
@@ -106,8 +106,8 @@
{"label":")", "x":10, "y":0},
{"label":"_", "x":11, "y":0},
{"label":"+", "x":12, "y":0},
- {"label":"BS", "x":13, "y":0, "w":1},
- {"label":"BS", "x":14, "y":0, "w":1},
+ {"label":"BS", "x":13, "y":0},
+ {"label":"BS", "x":14, "y":0},
{"label":"Tab", "x":0, "y":1, "w":1.5},
{"label":"Q", "x":1.5, "y":1},
@@ -151,7 +151,7 @@
{"label":">", "x":10.25, "y":3},
{"label":"?", "x":11.25, "y":3},
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"FN", "x":14, "y":3, "w":1},
+ {"label":"FN", "x":14, "y":3},
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
{"label":"GUI", "x":1.25, "y":4, "w":1.25},
diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h
index 43a56c9a92..21efad0d81 100644
--- a/keyboards/xiudi/xd60/rev2/config.h
+++ b/keyboards/xiudi/xd60/rev2/config.h
@@ -17,27 +17,8 @@ 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 { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* RGB Underglow
- * F6 PIN for XD60v2 that has pre-soldered WS2812 LEDs
*/
-#define RGB_DI_PIN F6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json
index 1951e52dfe..c45ef7af64 100644
--- a/keyboards/xiudi/xd60/rev2/info.json
+++ b/keyboards/xiudi/xd60/rev2/info.json
@@ -3,11 +3,19 @@
"usb": {
"pid": "0x6060"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "F5",
"levels": 6,
"on_state": 0
},
+ "ws2812": {
+ "pin": "F6"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
}
diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h
index 617d77b1de..f8845d411f 100644
--- a/keyboards/xiudi/xd60/rev3/config.h
+++ b/keyboards/xiudi/xd60/rev3/config.h
@@ -17,27 +17,8 @@ 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 { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* RGB Underglow
- * F6 PIN for XD60v3 that has pre-soldered LEDs
*/
-#define RGB_DI_PIN F6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json
index 1b03e6c6e3..68c97c0a9e 100644
--- a/keyboards/xiudi/xd60/rev3/info.json
+++ b/keyboards/xiudi/xd60/rev3/info.json
@@ -3,11 +3,19 @@
"usb": {
"pid": "0x6363"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "F5",
"levels": 6,
"on_state": 0
},
+ "ws2812": {
+ "pin": "F6"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
}