summaryrefslogtreecommitdiff
path: root/keyboards/dz60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/dz60')
-rw-r--r--keyboards/dz60/config.h20
-rw-r--r--keyboards/dz60/dz60.c1
-rw-r--r--keyboards/dz60/info.json16
3 files changed, 12 insertions, 25 deletions
diff --git a/keyboards/dz60/config.h b/keyboards/dz60/config.h
index fdac282e3b..98673bdef0 100644
--- a/keyboards/dz60/config.h
+++ b/keyboards/dz60/config.h
@@ -1,24 +1,5 @@
#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, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,7 +15,6 @@
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/dz60/dz60.c b/keyboards/dz60/dz60.c
deleted file mode 100644
index 23db2e4d75..0000000000
--- a/keyboards/dz60/dz60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "dz60.h"
diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json
index 37ba71fcdf..5ef2ccf692 100644
--- a/keyboards/dz60/info.json
+++ b/keyboards/dz60/info.json
@@ -8,6 +8,11 @@
"pid": "0x2260",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 5
@@ -16,6 +21,9 @@
"caps_lock": "B2",
"on_state": 0
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi", "60_ansi_arrow_split_bs_7u_spc", "60_ansi_arrow", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_abnt2", "60_tsangan_hhkb"],
@@ -589,7 +597,7 @@
{"x": 1.25, "y": 4, "w": 1.25},
{"x": 2.5, "y": 4, "w": 1.25},
{"x": 3.75, "y": 4, "w": 2.25},
- {"x": 6.00, "y": 4, "w": 1.25},
+ {"x": 6, "y": 4, "w": 1.25},
{"x": 7.25, "y": 4, "w": 2.75},
{"x": 10, "y": 4, "w": 1.25},
{"x": 11.25, "y": 4, "w": 1.25},
@@ -1157,7 +1165,7 @@
{"x": 1.25, "y": 4, "w": 1.25},
{"x": 2.5, "y": 4, "w": 1.25},
{"x": 3.75, "y": 4, "w": 2.25},
- {"x": 6.00, "y": 4, "w": 1.25},
+ {"x": 6, "y": 4, "w": 1.25},
{"x": 7.25, "y": 4, "w": 2.75},
{"x": 10, "y": 4, "w": 1.25},
{"x": 11.25, "y": 4, "w": 1.25},
@@ -1592,7 +1600,7 @@
{"x": 1.25, "y": 4, "w": 1.25},
{"x": 2.5, "y": 4, "w": 1.25},
{"x": 3.75, "y": 4, "w": 2.25},
- {"x": 6.00, "y": 4, "w": 1.25},
+ {"x": 6, "y": 4, "w": 1.25},
{"x": 7.25, "y": 4, "w": 2.75},
{"x": 10, "y": 4, "w": 1.25},
{"x": 11.25, "y": 4, "w": 1.25},
@@ -1737,7 +1745,7 @@
{"x": 1.25, "y": 4, "w": 1.25},
{"x": 2.5, "y": 4, "w": 1.25},
{"x": 3.75, "y": 4, "w": 2.25},
- {"x": 6.00, "y": 4, "w": 1.25},
+ {"x": 6, "y": 4, "w": 1.25},
{"x": 7.25, "y": 4, "w": 2.75},
{"x": 10, "y": 4},
{"x": 11, "y": 4},