summaryrefslogtreecommitdiff
path: root/keyboards/handwired/consolekeyboard/30key
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/consolekeyboard/30key')
-rw-r--r--keyboards/handwired/consolekeyboard/30key/30key.c16
-rw-r--r--keyboards/handwired/consolekeyboard/30key/30key.h28
-rw-r--r--keyboards/handwired/consolekeyboard/30key/config.h20
-rw-r--r--keyboards/handwired/consolekeyboard/30key/info.json77
4 files changed, 46 insertions, 95 deletions
diff --git a/keyboards/handwired/consolekeyboard/30key/30key.c b/keyboards/handwired/consolekeyboard/30key/30key.c
deleted file mode 100644
index 4500206dd3..0000000000
--- a/keyboards/handwired/consolekeyboard/30key/30key.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * 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 "30key.h"
diff --git a/keyboards/handwired/consolekeyboard/30key/30key.h b/keyboards/handwired/consolekeyboard/30key/30key.h
deleted file mode 100644
index 34008dcb00..0000000000
--- a/keyboards/handwired/consolekeyboard/30key/30key.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Gareth Edwards
- *
- * 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/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K000, K001, K002, K004, K005, K006, K007, K009, K010, K011, \
- K100, K101, K102, K104, K105, K106, K107, K109, K110, K111, \
- K200, K201, K202, K204, K205, K206, K207, K209, K210, K211 \
- ) { \
- { K000, K001, K002, KC_NO, K004, K005, K006, K007, KC_NO, K009, K010, K011 }, \
- { K100, K101, K102, KC_NO, K104, K105, K106, K107, KC_NO, K109, K110, K111 }, \
- { K200, K201, K202, KC_NO, K204, K205, K206, K207, KC_NO, K209, K210, K211 }, \
-}
diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h
index ba82037cf4..30d9a2f459 100644
--- a/keyboards/handwired/consolekeyboard/30key/config.h
+++ b/keyboards/handwired/consolekeyboard/30key/config.h
@@ -16,29 +16,10 @@
#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 { D1, D0, F7}
-#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
- #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -49,4 +30,3 @@
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json
index e8f51b2c79..e2bac91ab1 100644
--- a/keyboards/handwired/consolekeyboard/30key/info.json
+++ b/keyboards/handwired/consolekeyboard/30key/info.json
@@ -8,43 +8,58 @@
"pid": "0x3433",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "F4"
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"],
+ "rows": ["D1", "D0", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D1,D4)", "x":0, "y":0},
- {"label":"K01 (D1,C6)", "x":1, "y":0},
- {"label":"K02 (D1,D7)", "x":2, "y":0},
- {"label":"K04 (D1,B3)", "x":4, "y":0},
- {"label":"K05 (D1,B2)", "x":5, "y":0},
- {"label":"K06 (D1,B6)", "x":6, "y":0},
- {"label":"K07 (D1,E6)", "x":7, "y":0},
- {"label":"K09 (D1,B5)", "x":9, "y":0},
- {"label":"K0A (D1,C4)", "x":10, "y":0},
- {"label":"K0B (D1,C5)", "x":11, "y":0},
- {"label":"K10 (D0,D4)", "x":0, "y":1},
- {"label":"K11 (D0,C6)", "x":1, "y":1},
- {"label":"K12 (D0,D7)", "x":2, "y":1},
- {"label":"K14 (D0,B3)", "x":4, "y":1},
- {"label":"K15 (D0,B2)", "x":5, "y":1},
- {"label":"K16 (D0,B6)", "x":6, "y":1},
- {"label":"K17 (D0,E6)", "x":7, "y":1},
- {"label":"K19 (D0,B5)", "x":9, "y":1},
- {"label":"K1A (D0,C4)", "x":10, "y":1},
- {"label":"K1B (D0,C5)", "x":11, "y":1},
- {"label":"K20 (F7,D4)", "x":0, "y":2},
- {"label":"K21 (F7,C6)", "x":1, "y":2},
- {"label":"K22 (F7,D7)", "x":2, "y":2},
- {"label":"K24 (F7,B3)", "x":4, "y":2},
- {"label":"K25 (F7,B2)", "x":5, "y":2},
- {"label":"K26 (F7,B6)", "x":6, "y":2},
- {"label":"K27 (F7,E6)", "x":7, "y":2},
- {"label":"K29 (F7,B5)", "x":9, "y":2},
- {"label":"K2A (F7,C4)", "x":10, "y":2},
- {"label":"K2B (F7,C5)", "x":11, "y":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2}
]
}
}
-
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 15:59:17 +0000