summaryrefslogtreecommitdiff
path: root/keyboards/maxr1998
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/maxr1998')
-rw-r--r--keyboards/maxr1998/phoebe/info.json362
-rw-r--r--keyboards/maxr1998/phoebe/phoebe.c2
-rw-r--r--keyboards/maxr1998/phoebe/phoebe.h18
-rw-r--r--keyboards/maxr1998/pulse4k/config.h9
-rw-r--r--keyboards/maxr1998/pulse4k/info.json24
-rw-r--r--keyboards/maxr1998/pulse4k/pulse4k.h9
6 files changed, 84 insertions, 340 deletions
diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json
index 12d53bb0f6..e277b1c266 100644
--- a/keyboards/maxr1998/phoebe/info.json
+++ b/keyboards/maxr1998/phoebe/info.json
@@ -23,301 +23,69 @@
"layouts": {
"LAYOUT": {
"layout": [
- {
- "w": 1,
- "x": 0,
- "y": 0
- },
- {
- "w": 1,
- "x": 1,
- "y": 0
- },
- {
- "w": 1,
- "x": 2,
- "y": 0
- },
- {
- "w": 1,
- "x": 3,
- "y": 0
- },
- {
- "w": 1,
- "x": 4,
- "y": 0
- },
- {
- "w": 1,
- "x": 5,
- "y": 0
- },
- {
- "w": 1,
- "x": 6,
- "y": 0
- },
- {
- "w": 1,
- "x": 7,
- "y": 0
- },
- {
- "w": 1,
- "x": 8,
- "y": 0
- },
- {
- "w": 1,
- "x": 9,
- "y": 0
- },
- {
- "w": 1,
- "x": 10,
- "y": 0
- },
- {
- "w": 1,
- "x": 11,
- "y": 0
- },
- {
- "w": 1,
- "x": 0,
- "y": 1
- },
- {
- "w": 1,
- "x": 1,
- "y": 1
- },
- {
- "w": 1,
- "x": 2,
- "y": 1
- },
- {
- "w": 1,
- "x": 3,
- "y": 1
- },
- {
- "w": 1,
- "x": 4,
- "y": 1
- },
- {
- "w": 1,
- "x": 5,
- "y": 1
- },
- {
- "w": 1,
- "x": 6,
- "y": 1
- },
- {
- "w": 1,
- "x": 7,
- "y": 1
- },
- {
- "w": 1,
- "x": 8,
- "y": 1
- },
- {
- "w": 1,
- "x": 9,
- "y": 1
- },
- {
- "w": 1,
- "x": 10,
- "y": 1
- },
- {
- "w": 1,
- "x": 11,
- "y": 1
- },
- {
- "w": 1,
- "x": 0,
- "y": 2
- },
- {
- "w": 1,
- "x": 1,
- "y": 2
- },
- {
- "w": 1,
- "x": 2,
- "y": 2
- },
- {
- "w": 1,
- "x": 3,
- "y": 2
- },
- {
- "w": 1,
- "x": 4,
- "y": 2
- },
- {
- "w": 1,
- "x": 5,
- "y": 2
- },
- {
- "w": 1,
- "x": 6,
- "y": 2
- },
- {
- "w": 1,
- "x": 7,
- "y": 2
- },
- {
- "w": 1,
- "x": 8,
- "y": 2
- },
- {
- "w": 1,
- "x": 9,
- "y": 2
- },
- {
- "w": 1,
- "x": 10,
- "y": 2
- },
- {
- "w": 1,
- "x": 11,
- "y": 2
- },
- {
- "w": 1,
- "x": 0,
- "y": 3
- },
- {
- "w": 1,
- "x": 1,
- "y": 3
- },
- {
- "w": 1,
- "x": 2,
- "y": 3
- },
- {
- "w": 1,
- "x": 3,
- "y": 3
- },
- {
- "w": 1,
- "x": 4,
- "y": 3
- },
- {
- "w": 1,
- "x": 5,
- "y": 3
- },
- {
- "w": 1,
- "x": 6,
- "y": 3
- },
- {
- "w": 1,
- "x": 7,
- "y": 3
- },
- {
- "w": 1,
- "x": 8,
- "y": 3
- },
- {
- "w": 1,
- "x": 9,
- "y": 3
- },
- {
- "w": 1,
- "x": 10,
- "y": 3
- },
- {
- "w": 1,
- "x": 11,
- "y": 3
- },
- {
- "w": 1,
- "x": 0,
- "y": 4
- },
- {
- "w": 1,
- "x": 1,
- "y": 4
- },
- {
- "w": 1,
- "x": 2,
- "y": 4
- },
- {
- "w": 1,
- "x": 3,
- "y": 4
- },
- {
- "w": 1,
- "x": 4,
- "y": 4
- },
- {
- "w": 2,
- "x": 5,
- "y": 4
- },
- {
- "w": 1,
- "x": 7,
- "y": 4
- },
- {
- "w": 1,
- "x": 8,
- "y": 4
- },
- {
- "w": 1,
- "x": 9,
- "y": 4
- },
- {
- "w": 1,
- "x": 10,
- "y": 4
- },
- {
- "w": 1,
- "x": 11,
- "y": 4
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "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, 8], "x": 8, "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, 3], "x": 3, "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, 8], "x": 8, "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, 3], "x": 3, "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, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4}
]
}
},
@@ -349,7 +117,9 @@
]
},
"rgblight": {
- "led_count": 8,
+ "led_count": 8
+ },
+ "ws2812": {
"pin": "F0"
}
}
diff --git a/keyboards/maxr1998/phoebe/phoebe.c b/keyboards/maxr1998/phoebe/phoebe.c
index 28d3afea50..b05f9b3235 100644
--- a/keyboards/maxr1998/phoebe/phoebe.c
+++ b/keyboards/maxr1998/phoebe/phoebe.c
@@ -1,3 +1,3 @@
-#include "phoebe.h"
+#include "quantum.h"
const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {50, 50, 50};
diff --git a/keyboards/maxr1998/phoebe/phoebe.h b/keyboards/maxr1998/phoebe/phoebe.h
deleted file mode 100644
index f3e61756a3..0000000000
--- a/keyboards/maxr1998/phoebe/phoebe.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
-}
diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h
index 3756899498..5da4e44855 100644
--- a/keyboards/maxr1998/pulse4k/config.h
+++ b/keyboards/maxr1998/pulse4k/config.h
@@ -17,20 +17,11 @@
#pragma once
-
-/* Matrix pins */
-#define MATRIX_ROW_PINS { B4, E6 }
-#define MATRIX_COL_PINS { B7, B3, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Combo setup */
#define COMBO_COUNT 1
#define COMBO_TERM 150
/* RGB LED Setup */
-#define RGB_DI_PIN F7 // pin the DI on the WS2812B is hooked-up to
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/maxr1998/pulse4k/info.json b/keyboards/maxr1998/pulse4k/info.json
index 9db0307940..2d3b6e8a4b 100644
--- a/keyboards/maxr1998/pulse4k/info.json
+++ b/keyboards/maxr1998/pulse4k/info.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "F7"
+ },
+ "matrix_pins": {
+ "cols": ["B7", "B3", "F0"],
+ "rows": ["B4", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D3"},
@@ -18,13 +26,15 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [
- { "w": 1, "x": 0, "y": 0 },
- { "w": 1, "x": 1, "y": 0 },
- { "w": 1, "x": 2, "y": 0 },
- { "w": 1, "x": 0, "y": 1 },
- { "w": 1, "x": 1, "y": 1 },
- { "w": 1, "x": 2, "y": 1 } ]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1}
+ ]
}
}
}
diff --git a/keyboards/maxr1998/pulse4k/pulse4k.h b/keyboards/maxr1998/pulse4k/pulse4k.h
index cc0a373b66..ba4514d451 100644
--- a/keyboards/maxr1998/pulse4k/pulse4k.h
+++ b/keyboards/maxr1998/pulse4k/pulse4k.h
@@ -19,15 +19,6 @@
#include "quantum.h"
-#define LAYOUT( \
- k00, k01, k02, \
- k10, k11, k12 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 }, \
-}
-
void encoder_one_update(bool clockwise);
void encoder_two_update(bool clockwise);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 01:11:49 +0000