summaryrefslogtreecommitdiff
path: root/keyboards/handwired/traveller
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/traveller')
-rw-r--r--keyboards/handwired/traveller/config.h20
-rw-r--r--keyboards/handwired/traveller/info.json108
-rw-r--r--keyboards/handwired/traveller/traveller.c2
-rw-r--r--keyboards/handwired/traveller/traveller.h17
4 files changed, 59 insertions, 88 deletions
diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h
index bd0d306dc3..8ac92c300c 100644
--- a/keyboards/handwired/traveller/config.h
+++ b/keyboards/handwired/traveller/config.h
@@ -17,32 +17,12 @@ 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, D3, D2 }
-#define MATRIX_COL_PINS { B5, D6, B7, B6, F6, B1, B3, F7, B4, E6, D7, C6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 1
# define RGBLIGHT_HUE_STEP 10
# define RGBLIGHT_SAT_STEP 17
# define RGBLIGHT_VAL_STEP 17
//# 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 */
-#endif
/*
* Feature disable options
diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json
index ee064ad0cc..91fe9e1cf4 100644
--- a/keyboards/handwired/traveller/info.json
+++ b/keyboards/handwired/traveller/info.json
@@ -8,68 +8,76 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B2"
+ },
+ "matrix_pins": {
+ "cols": ["B5", "D6", "B7", "B6", "F6", "B1", "B3", "F7", "B4", "E6", "D7", "C6", "D4"],
+ "rows": ["D0", "D1", "D3", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 1.2},
- {"x": 1, "y": 0.8},
- {"x": 2, "y": 0.4},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0.4},
- {"x": 5, "y": 0.8},
+ {"matrix": [0, 0], "x": 0, "y": 1.2},
+ {"matrix": [0, 1], "x": 1, "y": 0.8},
+ {"matrix": [0, 2], "x": 2, "y": 0.4},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.4},
+ {"matrix": [0, 5], "x": 5, "y": 0.8},
- {"x": 9, "y": 0.8},
- {"x": 10, "y": 0.4},
- {"x": 11, "y": 0},
- {"x": 12, "y": 0.4},
- {"x": 13, "y": 0.8},
- {"x": 14, "y": 1.2},
+ {"matrix": [0, 7], "x": 9, "y": 0.8},
+ {"matrix": [0, 8], "x": 10, "y": 0.4},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0.4},
+ {"matrix": [0, 11], "x": 13, "y": 0.8},
+ {"matrix": [0, 12], "x": 14, "y": 1.2},
- {"x": 0, "y": 2.2},
- {"x": 1, "y": 1.8},
- {"x": 2, "y": 1.4},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1.4},
- {"x": 5, "y": 1.8},
+ {"matrix": [1, 0], "x": 0, "y": 2.2},
+ {"matrix": [1, 1], "x": 1, "y": 1.8},
+ {"matrix": [1, 2], "x": 2, "y": 1.4},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.4},
+ {"matrix": [1, 5], "x": 5, "y": 1.8},
- {"x": 9, "y": 1.8},
- {"x": 10, "y": 1.4},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1.4},
- {"x": 13, "y": 1.8},
- {"x": 14, "y": 2.2},
+ {"matrix": [1, 7], "x": 9, "y": 1.8},
+ {"matrix": [1, 8], "x": 10, "y": 1.4},
+ {"matrix": [1, 9], "x": 11, "y": 1},
+ {"matrix": [1, 10], "x": 12, "y": 1.4},
+ {"matrix": [1, 11], "x": 13, "y": 1.8},
+ {"matrix": [1, 12], "x": 14, "y": 2.2},
- {"x": 0, "y": 3.2},
- {"x": 1, "y": 2.8},
- {"x": 2, "y": 2.4},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2.4},
- {"x": 5, "y": 2.8},
+ {"matrix": [2, 0], "x": 0, "y": 3.2},
+ {"matrix": [2, 1], "x": 1, "y": 2.8},
+ {"matrix": [2, 2], "x": 2, "y": 2.4},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.4},
+ {"matrix": [2, 5], "x": 5, "y": 2.8},
- {"x": 9, "y": 2.8},
- {"x": 10, "y": 2.4},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2.4},
- {"x": 13, "y": 2.8},
- {"x": 14, "y": 3.2},
+ {"matrix": [2, 7], "x": 9, "y": 2.8},
+ {"matrix": [2, 8], "x": 10, "y": 2.4},
+ {"matrix": [2, 9], "x": 11, "y": 2},
+ {"matrix": [2, 10], "x": 12, "y": 2.4},
+ {"matrix": [2, 11], "x": 13, "y": 2.8},
+ {"matrix": [2, 12], "x": 14, "y": 3.2},
- {"x": 0, "y": 4.2},
- {"x": 1, "y": 3.8},
- {"x": 2, "y": 3.4},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3.4},
- {"x": 5, "y": 3.8},
- {"x": 6, "y": 3.05, "h": 1.5},
+ {"matrix": [3, 0], "x": 0, "y": 4.2},
+ {"matrix": [3, 1], "x": 1, "y": 3.8},
+ {"matrix": [3, 2], "x": 2, "y": 3.4},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.4},
+ {"matrix": [3, 5], "x": 5, "y": 3.8},
+ {"matrix": [2, 6], "x": 6, "y": 3.05, "h": 1.5},
- {"x": 8, "y": 3.05, "h": 1.5},
- {"x": 9, "y": 3.8},
- {"x": 10, "y": 3.4},
- {"x": 11, "y": 3},
- {"x": 12, "y": 3.4},
- {"x": 13, "y": 3.8},
- {"x": 14, "y": 4.2}
+ {"matrix": [3, 6], "x": 8, "y": 3.05, "h": 1.5},
+ {"matrix": [3, 7], "x": 9, "y": 3.8},
+ {"matrix": [3, 8], "x": 10, "y": 3.4},
+ {"matrix": [3, 9], "x": 11, "y": 3},
+ {"matrix": [3, 10], "x": 12, "y": 3.4},
+ {"matrix": [3, 11], "x": 13, "y": 3.8},
+ {"matrix": [3, 12], "x": 14, "y": 4.2}
]
}
}
diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c
index 409abe7d14..91c6f603b1 100644
--- a/keyboards/handwired/traveller/traveller.c
+++ b/keyboards/handwired/traveller/traveller.c
@@ -1,4 +1,4 @@
-#include "traveller.h"
+#include "quantum.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
diff --git a/keyboards/handwired/traveller/traveller.h b/keyboards/handwired/traveller/traveller.h
deleted file mode 100644
index f78abe46aa..0000000000
--- a/keyboards/handwired/traveller/traveller.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0C, \
- k10, k11, k12, k13, k14, k15, k17, k18, k19, k1A, k1B, k1C, \
- k20, k21, k22, k23, k24, k25, k27, k28, k29, k2A, k2B, k2C, \
- k30, k31, k32, k33, k34, k35, k26, k36, k37, k38, k39, k3A, k3B, k3C \
-) { \
- { k00, k01, k02, k03, k04, k05, XXX, k07, k08, k09, k0A, k0B, k0C }, \
- { k10, k11, k12, k13, k14, k15, XXX, k17, k18, k19, k1A, k1B, k1C }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 09:35:31 +0000