summaryrefslogtreecommitdiff
path: root/keyboards/handwired/marauder
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/marauder')
-rw-r--r--keyboards/handwired/marauder/config.h17
-rw-r--r--keyboards/handwired/marauder/info.json210
-rw-r--r--keyboards/handwired/marauder/marauder.c17
-rw-r--r--keyboards/handwired/marauder/marauder.h41
4 files changed, 116 insertions, 169 deletions
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index 608411ef31..10f0d75ea9 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -16,28 +16,11 @@
#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 { D2, D4, C6, D7, E6, B4, B5, B7, D5, C7, F1, F0 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, B0 }
-#define DIODE_DIRECTION COL2ROW
#define LAYER_STATE_8BIT
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 7
#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 */
-#endif
diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json
index 16fdc30e26..a4bab13284 100644
--- a/keyboards/handwired/marauder/info.json
+++ b/keyboards/handwired/marauder/info.json
@@ -8,105 +8,127 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B0"],
+ "rows": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D0,B6)", "x":0, "y":0},
- {"label":"K01 (D0,B2)", "x":2, "y":0},
- {"label":"K02 (D0,B3)", "x":3, "y":0},
- {"label":"K03 (D0,B1)", "x":4, "y":0},
- {"label":"K04 (D0,F7)", "x":5, "y":0},
- {"label":"K05 (D0,F6)", "x":6.5, "y":0},
- {"label":"K06 (D0,F5)", "x":7.5, "y":0},
- {"label":"K07 (D0,F4)", "x":8.5, "y":0},
- {"label":"K08 (D0,B0)", "x":9.5, "y":0},
- {"label":"K68 (B5,B0)", "x":11, "y":0},
- {"label":"K67 (B5,F4)", "x":12, "y":0},
- {"label":"K66 (B5,F5)", "x":13, "y":0},
- {"label":"K65 (B5,F6)", "x":14, "y":0},
- {"label":"K63 (B5,B1)", "x":15.25, "y":0},
- {"label":"K62 (B5,B3)", "x":16.25, "y":0},
- {"label":"K61 (B5,B2)", "x":17.25, "y":0},
- {"label":"K60 (B5,B6)", "x":18.25, "y":0},
- {"label":"K10 (D4,B6)", "x":0, "y":1.5},
- {"label":"K11 (D4,B2)", "x":1, "y":1.5},
- {"label":"K12 (D4,B3)", "x":2, "y":1.5},
- {"label":"K13 (D4,B1)", "x":3, "y":1.5},
- {"label":"K14 (D4,F7)", "x":4, "y":1.5},
- {"label":"K15 (D4,F6)", "x":5, "y":1.5},
- {"label":"K16 (D4,F5)", "x":6, "y":1.5},
- {"label":"K17 (D4,F4)", "x":7, "y":1.5},
- {"label":"K18 (D4,B0)", "x":8, "y":1.5},
- {"label":"K78 (B7,B0)", "x":9, "y":1.5},
- {"label":"K77 (B7,F4)", "x":10, "y":1.5},
- {"label":"K76 (B7,F5)", "x":11, "y":1.5},
- {"label":"K75 (B7,F6)", "x":12, "y":1.5},
- {"label":"K74 (B7,F7)", "x":13, "y":1.5, "w":2},
- {"label":"K73 (B7,B1)", "x":15.25, "y":1.5},
- {"label":"K72 (B7,B3)", "x":16.25, "y":1.5},
- {"label":"K71 (B7,B2)", "x":17.25, "y":1.5},
- {"label":"K70 (B7,B6)", "x":18.25, "y":1.5},
- {"label":"K20 (C6,B6)", "x":0, "y":2.5, "w":1.5},
- {"label":"K21 (C6,B2)", "x":1.5, "y":2.5},
- {"label":"K22 (C6,B3)", "x":2.5, "y":2.5},
- {"label":"K23 (C6,B1)", "x":3.5, "y":2.5},
- {"label":"K24 (C6,F7)", "x":4.5, "y":2.5},
- {"label":"K25 (C6,F6)", "x":5.5, "y":2.5},
- {"label":"K26 (C6,F5)", "x":6.5, "y":2.5},
- {"label":"K27 (C6,F4)", "x":7.5, "y":2.5},
- {"label":"K28 (C6,B0)", "x":8.5, "y":2.5},
- {"label":"K88 (D5,B0)", "x":9.5, "y":2.5},
- {"label":"K87 (D5,F4)", "x":10.5, "y":2.5},
- {"label":"K86 (D5,F5)", "x":11.5, "y":2.5},
- {"label":"K85 (D5,F6)", "x":12.5, "y":2.5},
- {"label":"K84 (D5,F7)", "x":13.5, "y":2.5, "w":1.5},
- {"label":"K83 (D5,B1)", "x":15.25, "y":2.5},
- {"label":"K82 (D5,B3)", "x":16.25, "y":2.5},
- {"label":"K81 (D5,B2)", "x":17.25, "y":2.5},
- {"label":"K80 (D5,B6)", "x":18.25, "y":2.5, "h":2},
- {"label":"K30 (D7,B6)", "x":0, "y":3.5, "w":1.75},
- {"label":"K31 (D7,B2)", "x":1.75, "y":3.5},
- {"label":"K32 (D7,B3)", "x":2.75, "y":3.5},
- {"label":"K33 (D7,B1)", "x":3.75, "y":3.5},
- {"label":"K34 (D7,F7)", "x":4.75, "y":3.5},
- {"label":"K35 (D7,F6)", "x":5.75, "y":3.5},
- {"label":"K36 (D7,F5)", "x":6.75, "y":3.5},
- {"label":"K37 (D7,F4)", "x":7.75, "y":3.5},
- {"label":"K38 (D7,B0)", "x":8.75, "y":3.5},
- {"label":"K98 (C7,B0)", "x":9.75, "y":3.5},
- {"label":"K97 (C7,F4)", "x":10.75, "y":3.5},
- {"label":"K96 (C7,F5)", "x":11.75, "y":3.5},
- {"label":"K95 (C7,F6)", "x":12.75, "y":3.5, "w":2.25},
- {"label":"K93 (C7,B1)", "x":15.25, "y":3.5},
- {"label":"K92 (C7,B3)", "x":16.25, "y":3.5},
- {"label":"K91 (C7,B2)", "x":17.25, "y":3.5},
- {"label":"K40 (E6,B6)", "x":0, "y":4.5, "w":2.25},
- {"label":"K41 (E6,B2)", "x":2.25, "y":4.5},
- {"label":"K42 (E6,B3)", "x":3.25, "y":4.5},
- {"label":"K43 (E6,B1)", "x":4.25, "y":4.5},
- {"label":"K44 (E6,F7)", "x":5.25, "y":4.5},
- {"label":"K45 (E6,F6)", "x":6.25, "y":4.5},
- {"label":"K46 (E6,F5)", "x":7.25, "y":4.5},
- {"label":"K47 (E6,F4)", "x":8.25, "y":4.5},
- {"label":"K48 (E6,B0)", "x":9.25, "y":4.5},
- {"label":"KA8 (F1,B0)", "x":10.25, "y":4.5},
- {"label":"KA7 (F1,F4)", "x":11.25, "y":4.5},
- {"label":"KA6 (F1,F5)", "x":12.25, "y":4.5, "w":2.75},
- {"label":"KA3 (F1,B1)", "x":15.25, "y":4.5},
- {"label":"KA2 (F1,B3)", "x":16.25, "y":4.5},
- {"label":"KA1 (F1,B2)", "x":17.25, "y":4.5},
- {"label":"KA0 (F1,B6)", "x":18.25, "y":4.5, "h":2},
- {"label":"K50 (B4,B6)", "x":0, "y":5.5, "w":1.5},
- {"label":"K51 (B4,B2)", "x":1.5, "y":5.5},
- {"label":"K52 (B4,B3)", "x":2.5, "y":5.5, "w":1.5},
- {"label":"K56 (B4,F5)", "x":4, "y":5.5, "w":7},
- {"label":"KB7 (F0,F4)", "x":11, "y":5.5, "w":1.5},
- {"label":"KB6 (F0,F5)", "x":12.5, "y":5.5},
- {"label":"KB4 (F0,F7)", "x":13.5, "y":5.5, "w":1.5},
- {"label":"KB3 (F0,B1)", "x":15.25, "y":5.5, "w":2},
- {"label":"KB1 (F0,B2)", "x":17.25, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [6, 8], "x": 11, "y": 0},
+ {"matrix": [6, 7], "x": 12, "y": 0},
+ {"matrix": [6, 6], "x": 13, "y": 0},
+ {"matrix": [6, 5], "x": 14, "y": 0},
+
+ {"matrix": [6, 3], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [6, 0], "x": 18.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 7], "x": 10, "y": 1.5},
+ {"matrix": [7, 6], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 4], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [7, 3], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [7, 0], "x": 18.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [8, 3], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [8, 0], "x": 18.25, "y": 2.5, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 6], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [9, 3], "x": 15.25, "y": 3.5},
+ {"matrix": [9, 2], "x": 16.25, "y": 3.5},
+ {"matrix": [9, 1], "x": 17.25, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [10, 3], "x": 15.25, "y": 4.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 4.5},
+ {"matrix": [10, 0], "x": 18.25, "y": 4.5, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [11, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [11, 6], "x": 12.5, "y": 5.5},
+ {"matrix": [11, 4], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"matrix": [11, 3], "x": 15.25, "y": 5.5, "w": 2},
+ {"matrix": [11, 1], "x": 17.25, "y": 5.5}
]
}
}
diff --git a/keyboards/handwired/marauder/marauder.c b/keyboards/handwired/marauder/marauder.c
deleted file mode 100644
index c8f8781211..0000000000
--- a/keyboards/handwired/marauder/marauder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 BB-66
- *
- * 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 "marauder.h"
diff --git a/keyboards/handwired/marauder/marauder.h b/keyboards/handwired/marauder/marauder.h
deleted file mode 100644
index a8201a8db8..0000000000
--- a/keyboards/handwired/marauder/marauder.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 BB-66
- *
- * 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( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K68, K67, K66, K65, K63, K62, K61, K60, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K77, K76, K75, K74, K73, K72, K71, K70, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K86, K85, K84, K83, K82, K81, K80, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K96, K95, K93, K92, K91, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA6, KA3, KA2, KA1, KA0, \
- K50, K51, K52, K56, KB7, KB6, KB4, KB3, KB1 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO }, \
- { K60, K61, K62, K63, KC_NO, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \
- { K80, K81, K82, K83, K84, K85, K86, K87, K88 }, \
- { KC_NO, K91, K92, K93, KC_NO, K95, K96, K97, K98 }, \
- { KA0, KA1, KA2, KA3, KC_NO, KC_NO, KA6, KA7, KA8 }, \
- { KC_NO, KB1, KC_NO, KB3, KB4, KC_NO, KB6, KB7, KC_NO }, \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 21:26:24 +0000