summaryrefslogtreecommitdiff
path: root/keyboards/mschwingen/modelm
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mschwingen/modelm')
-rw-r--r--keyboards/mschwingen/modelm/config.h1
-rw-r--r--keyboards/mschwingen/modelm/info.json233
-rw-r--r--keyboards/mschwingen/modelm/led_ws2812/rules.mk3
-rw-r--r--keyboards/mschwingen/modelm/modelm.c2
-rw-r--r--keyboards/mschwingen/modelm/modelm.h36
5 files changed, 127 insertions, 148 deletions
diff --git a/keyboards/mschwingen/modelm/config.h b/keyboards/mschwingen/modelm/config.h
index 6545f91070..c828bd36ff 100644
--- a/keyboards/mschwingen/modelm/config.h
+++ b/keyboards/mschwingen/modelm/config.h
@@ -70,7 +70,6 @@
#endif
// 3* WS2812 LEDs instead of singlecolor GPIO LEDs
-#define RGB_DI_PIN B6
#define RGBLED_NUM 3
// disabled, needs PCB patch.
diff --git a/keyboards/mschwingen/modelm/info.json b/keyboards/mschwingen/modelm/info.json
index a1e22f1614..5118f4ed37 100644
--- a/keyboards/mschwingen/modelm/info.json
+++ b/keyboards/mschwingen/modelm/info.json
@@ -8,120 +8,137 @@
"pid": "0x558E",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B6"
+ },
"processor": "atmega32u4",
"bootloader": "lufa-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
- {"x":9.5, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
- {"x":13, "y":2, "w":2},
- {"x":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.5, "y":2},
- {"x":19, "y":2},
- {"x":20, "y":2},
- {"x":21, "y":2},
- {"x":22, "y":2},
-
- {"x":0, "y":3, "w":1.5},
- {"x":1.5, "y":3},
- {"x":2.5, "y":3},
- {"x":3.5, "y":3},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3, "w":1.5},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":19, "y":3},
- {"x":20, "y":3},
- {"x":21, "y":3},
- {"x":22, "y":3, "h":2},
-
- {"x":0, "y":4, "w":1.75},
- {"x":1.75, "y":4},
- {"x":2.75, "y":4},
- {"x":3.75, "y":4},
- {"x":4.75, "y":4},
- {"x":5.75, "y":4},
- {"x":6.75, "y":4},
- {"x":7.75, "y":4},
- {"x":8.75, "y":4},
- {"x":9.75, "y":4},
- {"x":10.75, "y":4},
- {"x":11.75, "y":4},
- {"x":12.75, "y":4},
- {"x":13.75, "y":4, "w":1.25},
- {"x":19, "y":4},
- {"x":20, "y":4},
- {"x":21, "y":4},
-
- {"x":0, "y":5, "w":1.25},
- {"x":1.25, "y":5},
- {"x":2.25, "y":5},
- {"x":3.25, "y":5},
- {"x":4.25, "y":5},
- {"x":5.25, "y":5},
- {"x":6.25, "y":5},
- {"x":7.25, "y":5},
- {"x":8.25, "y":5},
- {"x":9.25, "y":5},
- {"x":10.25, "y":5},
- {"x":11.25, "y":5},
- {"x":12.25, "y":5, "w":2.75},
- {"x":16.5, "y":5},
- {"x":19, "y":5},
- {"x":20, "y":5},
- {"x":21, "y":5},
- {"x":22, "y":5, "h":2},
-
- {"x":0, "y":6, "w":1.5},
- {"x":2.5, "y":6, "w":1.5},
- {"x":4, "y":6, "w":7},
- {"x":11, "y":6, "w":1.5},
- {"x":13.5, "y":6, "w":1.5},
- {"x":15.5, "y":6},
- {"x":16.5, "y":6},
- {"x":17.5, "y":6},
- {"x":19, "y":6, "w":2},
- {"x":21, "y":6}
+ {"matrix": [13, 7], "x": 0, "y": 0},
+
+ {"matrix": [12, 5], "x": 2, "y": 0},
+ {"matrix": [11, 5], "x": 3, "y": 0},
+ {"matrix": [11, 6], "x": 4, "y": 0},
+ {"matrix": [11, 7], "x": 5, "y": 0},
+
+ {"matrix": [9, 7], "x": 6.5, "y": 0},
+ {"matrix": [7, 7], "x": 7.5, "y": 0},
+ {"matrix": [6, 6], "x": 8.5, "y": 0},
+ {"matrix": [6, 5], "x": 9.5, "y": 0},
+
+ {"matrix": [9, 5], "x": 11, "y": 0},
+ {"matrix": [9, 4], "x": 12, "y": 0},
+ {"matrix": [4, 4], "x": 13, "y": 0},
+ {"matrix": [3, 4], "x": 14, "y": 0},
+
+ {"matrix": [0, 4], "x": 15.5, "y": 0},
+ {"matrix": [0, 3], "x": 16.5, "y": 0},
+ {"matrix": [1, 1], "x": 17.5, "y": 0},
+
+ {"matrix": [13, 5], "x": 0, "y": 2},
+ {"matrix": [13, 4], "x": 1, "y": 2},
+ {"matrix": [12, 4], "x": 2, "y": 2},
+ {"matrix": [11, 4], "x": 3, "y": 2},
+ {"matrix": [10, 4], "x": 4, "y": 2},
+ {"matrix": [10, 5], "x": 5, "y": 2},
+ {"matrix": [8, 5], "x": 6, "y": 2},
+ {"matrix": [8, 4], "x": 7, "y": 2},
+ {"matrix": [7, 4], "x": 8, "y": 2},
+ {"matrix": [6, 4], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [5, 5], "x": 11, "y": 2},
+ {"matrix": [7, 5], "x": 12, "y": 2},
+ {"matrix": [9, 6], "x": 13, "y": 2, "w": 2},
+
+ {"matrix": [3, 5], "x": 15.5, "y": 2},
+ {"matrix": [1, 5], "x": 16.5, "y": 2},
+ {"matrix": [2, 5], "x": 17.5, "y": 2},
+
+ {"matrix": [4, 1], "x": 19, "y": 2},
+ {"matrix": [3, 1], "x": 20, "y": 2},
+ {"matrix": [2, 1], "x": 21, "y": 2},
+ {"matrix": [2, 0], "x": 22, "y": 2},
+
+ {"matrix": [13, 6], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [13, 3], "x": 1.5, "y": 3},
+ {"matrix": [12, 3], "x": 2.5, "y": 3},
+ {"matrix": [11, 3], "x": 3.5, "y": 3},
+ {"matrix": [10, 3], "x": 4.5, "y": 3},
+ {"matrix": [10, 6], "x": 5.5, "y": 3},
+ {"matrix": [8, 6], "x": 6.5, "y": 3},
+ {"matrix": [8, 3], "x": 7.5, "y": 3},
+ {"matrix": [7, 3], "x": 8.5, "y": 3},
+ {"matrix": [6, 3], "x": 9.5, "y": 3},
+ {"matrix": [5, 3], "x": 10.5, "y": 3},
+ {"matrix": [5, 6], "x": 11.5, "y": 3},
+ {"matrix": [7, 6], "x": 12.5, "y": 3},
+ {"matrix": [9, 2], "x": 13.5, "y": 3, "w": 1.5},
+
+ {"matrix": [4, 5], "x": 15.5, "y": 3},
+ {"matrix": [1, 4], "x": 16.5, "y": 3},
+ {"matrix": [2, 4], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 3], "x": 19, "y": 3},
+ {"matrix": [3, 3], "x": 20, "y": 3},
+ {"matrix": [2, 3], "x": 21, "y": 3},
+ {"matrix": [1, 3], "x": 22, "y": 3, "h": 2},
+
+ {"matrix": [12, 6], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [13, 2], "x": 1.75, "y": 4},
+ {"matrix": [12, 2], "x": 2.75, "y": 4},
+ {"matrix": [11, 2], "x": 3.75, "y": 4},
+ {"matrix": [10, 2], "x": 4.75, "y": 4},
+ {"matrix": [10, 7], "x": 5.75, "y": 4},
+ {"matrix": [8, 7], "x": 6.75, "y": 4},
+ {"matrix": [8, 2], "x": 7.75, "y": 4},
+ {"matrix": [7, 2], "x": 8.75, "y": 4},
+ {"matrix": [6, 2], "x": 9.75, "y": 4},
+ {"matrix": [5, 2], "x": 10.75, "y": 4},
+ {"matrix": [5, 7], "x": 11.75, "y": 4},
+ {"matrix": [5, 1], "x": 12.75, "y": 4},
+ {"matrix": [9, 1], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 6], "x": 19, "y": 4},
+ {"matrix": [3, 6], "x": 20, "y": 4},
+ {"matrix": [2, 6], "x": 21, "y": 4},
+
+ {"matrix": [14, 6], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [12, 7], "x": 1.25, "y": 5},
+ {"matrix": [13, 1], "x": 2.25, "y": 5},
+ {"matrix": [12, 1], "x": 3.25, "y": 5},
+ {"matrix": [11, 1], "x": 4.25, "y": 5},
+ {"matrix": [10, 1], "x": 5.25, "y": 5},
+ {"matrix": [10, 0], "x": 6.25, "y": 5},
+ {"matrix": [8, 0], "x": 7.25, "y": 5},
+ {"matrix": [8, 1], "x": 8.25, "y": 5},
+ {"matrix": [7, 1], "x": 9.25, "y": 5},
+ {"matrix": [6, 1], "x": 10.25, "y": 5},
+ {"matrix": [5, 0], "x": 11.25, "y": 5},
+ {"matrix": [14, 1], "x": 12.25, "y": 5, "w": 2.75},
+
+ {"matrix": [1, 7], "x": 16.5, "y": 5},
+
+ {"matrix": [4, 2], "x": 19, "y": 5},
+ {"matrix": [3, 2], "x": 20, "y": 5},
+ {"matrix": [2, 2], "x": 21, "y": 5},
+ {"matrix": [1, 2], "x": 22, "y": 5, "h": 2},
+
+ {"matrix": [15, 5], "x": 0, "y": 6, "w": 1.5},
+ {"matrix": [0, 7], "x": 2.5, "y": 6, "w": 1.5},
+ {"matrix": [9, 0], "x": 4, "y": 6, "w": 7},
+ {"matrix": [0, 0], "x": 11, "y": 6, "w": 1.5},
+ {"matrix": [15, 1], "x": 13.5, "y": 6, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 15.5, "y": 6},
+ {"matrix": [4, 0], "x": 16.5, "y": 6},
+ {"matrix": [3, 0], "x": 17.5, "y": 6},
+
+ {"matrix": [3, 7], "x": 19, "y": 6, "w": 2},
+ {"matrix": [2, 7], "x": 21, "y": 6}
]
}
}
+
}
diff --git a/keyboards/mschwingen/modelm/led_ws2812/rules.mk b/keyboards/mschwingen/modelm/led_ws2812/rules.mk
index 424388fd8f..9a69649289 100644
--- a/keyboards/mschwingen/modelm/led_ws2812/rules.mk
+++ b/keyboards/mschwingen/modelm/led_ws2812/rules.mk
@@ -1,2 +1 @@
-# variant for WS2812 LEDs
-SRC += ws2812.c
+WS2812_DRIVER_REQUIRED = yes
diff --git a/keyboards/mschwingen/modelm/modelm.c b/keyboards/mschwingen/modelm/modelm.c
index 122dca3400..23d1b1484a 100644
--- a/keyboards/mschwingen/modelm/modelm.c
+++ b/keyboards/mschwingen/modelm/modelm.c
@@ -204,7 +204,7 @@ void update_layer_leds(void) {
#endif
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
isRecording++;
blink_cycle_timer = timer_read();
}
diff --git a/keyboards/mschwingen/modelm/modelm.h b/keyboards/mschwingen/modelm/modelm.h
index 04b6b61125..d842793ccd 100644
--- a/keyboards/mschwingen/modelm/modelm.h
+++ b/keyboards/mschwingen/modelm/modelm.h
@@ -20,39 +20,3 @@
extern void update_layer_leds(void);
#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- * The first section contains "names" for physical keys of the keyboard
- * and defines their position on the board.
- * The second section defines position of the keys on the switch matrix
- * (where COLUMNS and ROWS crosses). */
-
-/* universla layout for both 101 and 102-key versions */
-#define LAYOUT( \
- K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \
- \
- K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T, K4U, \
- K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, K3R, K3S, K3T, K3U, \
- K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, K2Q, \
- K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, K1P, K1Q, K1R, \
- K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J \
-) \
- {/* COL0 ............ COL7 */ \
- { K0D , KC_NO, KC_NO, K5O , K5N , KC_NO, KC_NO, K0B }, /* ROW0 */ \
- { K0F , K5P , K1R , K3U , K3P , K4P , KC_NO, K1N }, \
- { K4U , K4T , K1Q , K3T , K3Q , K4Q , K2Q , K0J }, \
- { K0H , K4S , K1P , K3S , K5M , K4O , K2P , K0I }, \
- { K0G , K4R , K1O , K3R , K5L , K3O , K2O , KC_NO }, \
- { K1L , K2M , K2K , K3K , K4K , K4L , K3L , K2L }, \
- { KC_NO, K1K , K2J , K3J , K4J , K5I , K5H , KC_NO }, \
- { KC_NO, K1J , K2I , K3I , K4I , K4M , K3M , K5G }, \
- { K1H , K1I , K2H , K3H , K4H , K4G , K3G , K2G }, \
- { K0C , K2N , K3N , KC_NO, K5K , K5J , K4N , K5F }, \
- { K1G , K1F , K2E , K3E , K4E , K4F , K3F , K2F }, \
- { KC_NO, K1E , K2D , K3D , K4D , K5C , K5D , K5E }, \
- { KC_NO, K1D , K2C , K3C , K4C , K5B , K2A , K1B }, \
- { KC_NO, K1C , K2B , K3B , K4B , K4A , K3A , K5A }, \
- { KC_NO, K1M , KC_NO, KC_NO, KC_NO, KC_NO, K1A , KC_NO }, \
- { KC_NO, K0E , KC_NO, KC_NO, KC_NO, K0A , KC_NO, KC_NO }, /* ROW15 */ \
-}
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 03:08:03 +0000