From 73f7778a2590e30954948cea2fc24c6f3ceae09b Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Mon, 17 Apr 2023 06:07:50 -0600 Subject: Fixup dymium65 RGB Pin (#20473) --- keyboards/dotmod/dymium65/config.h | 2 -- keyboards/dotmod/dymium65/info.json | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'keyboards/dotmod') diff --git a/keyboards/dotmod/dymium65/config.h b/keyboards/dotmod/dymium65/config.h index 46d442fc87..45853902b7 100644 --- a/keyboards/dotmod/dymium65/config.h +++ b/keyboards/dotmod/dymium65/config.h @@ -24,8 +24,6 @@ #define FORCE_NKRO -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN D7 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 66 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dotmod/dymium65/info.json b/keyboards/dotmod/dymium65/info.json index 31f516507f..7c0674a86d 100644 --- a/keyboards/dotmod/dymium65/info.json +++ b/keyboards/dotmod/dymium65/info.json @@ -33,6 +33,9 @@ {"pin_a": "C7", "pin_b": "D1"} ] }, + "ws2812": { + "pin": "D7" + }, "rgb_matrix": { "driver": "WS2812", "animations": { -- cgit v1.2.3 From 12d42cedd2624db0d5cfe6f538211f9dfcd19822 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 May 2023 13:33:10 +1000 Subject: Move `FORCE_NKRO` to data driven (#20604) --- keyboards/dotmod/dymium65/config.h | 2 -- keyboards/dotmod/dymium65/info.json | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'keyboards/dotmod') diff --git a/keyboards/dotmod/dymium65/config.h b/keyboards/dotmod/dymium65/config.h index 45853902b7..fa5999ca48 100644 --- a/keyboards/dotmod/dymium65/config.h +++ b/keyboards/dotmod/dymium65/config.h @@ -22,8 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define FORCE_NKRO - // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 66 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dotmod/dymium65/info.json b/keyboards/dotmod/dymium65/info.json index 7c0674a86d..c9dd368f4f 100644 --- a/keyboards/dotmod/dymium65/info.json +++ b/keyboards/dotmod/dymium65/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x5678", "pid": "0x5058", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "diode_direction": "ROW2COL", "matrix_pins": { -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/dotmod/dymium65/info.json | 108 ++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'keyboards/dotmod') diff --git a/keyboards/dotmod/dymium65/info.json b/keyboards/dotmod/dymium65/info.json index c9dd368f4f..5149dd897f 100644 --- a/keyboards/dotmod/dymium65/info.json +++ b/keyboards/dotmod/dymium65/info.json @@ -11,19 +11,19 @@ }, "diode_direction": "ROW2COL", "matrix_pins": { - "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "C6", "B4", "B5", "B6","E2"], - "rows": ["F7", "F6", "F5", "F4", "F1","F0"] + "cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "C6", "B4", "B5", "B6", "E2"], + "rows": ["F7", "F6", "F5", "F4", "F1", "F0"] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "features": { - "bootmagic": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true, - "mousekey": true, - "rgb_matrix": true + "bootmagic": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "mousekey": true, + "rgb_matrix": true }, "build": { "lto": true @@ -60,76 +60,76 @@ "solid_reactive_nexus": true, "splash": true } - }, + }, "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 0 ], "x": 0, "y": 0}, - {"matrix": [1, 1 ], "x": 1, "y": 0}, - {"matrix": [1, 2 ], "x": 2, "y": 0}, - {"matrix": [1, 3 ], "x": 3, "y": 0}, - {"matrix": [1, 4 ], "x": 4, "y": 0}, - {"matrix": [1, 5 ], "x": 5, "y": 0}, - {"matrix": [1, 6 ], "x": 6, "y": 0}, - {"matrix": [1, 7 ], "x": 7, "y": 0}, - {"matrix": [1, 8 ], "x": 8, "y": 0}, - {"matrix": [1, 9 ], "x": 9, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 1], "x": 1, "y": 0}, + {"matrix": [1, 2], "x": 2, "y": 0}, + {"matrix": [1, 3], "x": 3, "y": 0}, + {"matrix": [1, 4], "x": 4, "y": 0}, + {"matrix": [1, 5], "x": 5, "y": 0}, + {"matrix": [1, 6], "x": 6, "y": 0}, + {"matrix": [1, 7], "x": 7, "y": 0}, + {"matrix": [1, 8], "x": 8, "y": 0}, + {"matrix": [1, 9], "x": 9, "y": 0}, {"matrix": [1, 10], "x": 10, "y": 0}, {"matrix": [1, 11], "x": 11, "y": 0}, {"matrix": [1, 12], "x": 12, "y": 0}, {"matrix": [1, 13], "w": 2, "x": 13, "y": 0}, {"matrix": [4, 15], "x": 16, "y": 0}, - {"matrix": [2, 0 ], "w": 1.5, "x": 0, "y": 1}, - {"matrix": [2, 1 ], "x": 1.5, "y": 1}, - {"matrix": [2, 2 ], "x": 2.5, "y": 1}, - {"matrix": [2, 3 ], "x": 3.5, "y": 1}, - {"matrix": [2, 4 ], "x": 4.5, "y": 1}, - {"matrix": [2, 5 ], "x": 5.5, "y": 1}, - {"matrix": [2, 6 ], "x": 6.5, "y": 1}, - {"matrix": [2, 7 ], "x": 7.5, "y": 1}, - {"matrix": [2, 8 ], "x": 8.5, "y": 1}, - {"matrix": [2, 9 ], "x": 9.5, "y": 1}, + {"matrix": [2, 0], "w": 1.5, "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1.5, "y": 1}, + {"matrix": [2, 2], "x": 2.5, "y": 1}, + {"matrix": [2, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 4], "x": 4.5, "y": 1}, + {"matrix": [2, 5], "x": 5.5, "y": 1}, + {"matrix": [2, 6], "x": 6.5, "y": 1}, + {"matrix": [2, 7], "x": 7.5, "y": 1}, + {"matrix": [2, 8], "x": 8.5, "y": 1}, + {"matrix": [2, 9], "x": 9.5, "y": 1}, {"matrix": [2, 10], "x": 10.5, "y": 1}, {"matrix": [2, 11], "x": 11.5, "y": 1}, {"matrix": [2, 12], "x": 12.5, "y": 1}, {"matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 1}, {"matrix": [3, 14], "x": 16, "y": 1}, - {"matrix": [3, 0 ], "w": 1.75, "x": 0, "y": 2}, - {"matrix": [3, 1 ], "x": 1.75, "y": 2}, - {"matrix": [3, 2 ], "x": 2.75, "y": 2}, - {"matrix": [3, 3 ], "x": 3.75, "y": 2}, - {"matrix": [3, 4 ], "x": 4.75, "y": 2}, - {"matrix": [3, 5 ], "x": 5.75, "y": 2}, - {"matrix": [3, 6 ], "x": 6.75, "y": 2}, - {"matrix": [3, 7 ], "x": 7.75, "y": 2}, - {"matrix": [3, 8 ], "x": 8.75, "y": 2}, - {"matrix": [3, 9 ], "x": 9.75, "y": 2}, + {"matrix": [3, 0], "w": 1.75, "x": 0, "y": 2}, + {"matrix": [3, 1], "x": 1.75, "y": 2}, + {"matrix": [3, 2], "x": 2.75, "y": 2}, + {"matrix": [3, 3], "x": 3.75, "y": 2}, + {"matrix": [3, 4], "x": 4.75, "y": 2}, + {"matrix": [3, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 6], "x": 6.75, "y": 2}, + {"matrix": [3, 7], "x": 7.75, "y": 2}, + {"matrix": [3, 8], "x": 8.75, "y": 2}, + {"matrix": [3, 9], "x": 9.75, "y": 2}, {"matrix": [3, 10], "x": 10.75, "y": 2}, {"matrix": [3, 11], "x": 11.75, "y": 2}, {"matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 2}, {"matrix": [3, 15], "x": 16, "y": 2}, - {"matrix": [4, 0 ], "w": 2.25, "x": 0, "y": 3}, - {"matrix": [4, 2 ], "x": 2.25, "y": 3}, - {"matrix": [4, 3 ], "x": 3.25, "y": 3}, - {"matrix": [4, 4 ], "x": 4.25, "y": 3}, - {"matrix": [4, 5 ], "x": 5.25, "y": 3}, - {"matrix": [4, 6 ], "x": 6.25, "y": 3}, - {"matrix": [4, 7 ], "x": 7.25, "y": 3}, - {"matrix": [4, 8 ], "x": 8.25, "y": 3}, - {"matrix": [4, 9 ], "x": 9.25, "y": 3}, + {"matrix": [4, 0], "w": 2.25, "x": 0, "y": 3}, + {"matrix": [4, 2], "x": 2.25, "y": 3}, + {"matrix": [4, 3], "x": 3.25, "y": 3}, + {"matrix": [4, 4], "x": 4.25, "y": 3}, + {"matrix": [4, 5], "x": 5.25, "y": 3}, + {"matrix": [4, 6], "x": 6.25, "y": 3}, + {"matrix": [4, 7], "x": 7.25, "y": 3}, + {"matrix": [4, 8], "x": 8.25, "y": 3}, + {"matrix": [4, 9], "x": 9.25, "y": 3}, {"matrix": [4, 10], "x": 10.25, "y": 3}, {"matrix": [4, 11], "x": 11.25, "y": 3}, {"matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 3}, {"matrix": [4, 14], "x": 15.25, "y": 3}, - {"matrix": [5, 0 ], "w": 1.25, "x": 0, "y": 4}, - {"matrix": [5, 1 ], "w": 1.25, "x": 1.25, "y": 4}, - {"matrix": [5, 2 ], "w": 1.25, "x": 2.5, "y": 4}, - {"matrix": [5, 6 ], "w": 6.25, "x": 3.75, "y": 4}, - {"matrix": [5, 9 ], "x": 10, "y": 4}, + {"matrix": [5, 0], "w": 1.25, "x": 0, "y": 4}, + {"matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 4}, + {"matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 4}, + {"matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 4}, + {"matrix": [5, 9], "x": 10, "y": 4}, {"matrix": [5, 10], "x": 11, "y": 4}, {"matrix": [5, 12], "x": 12, "y": 4}, {"matrix": [5, 13], "x": 14.25, "y": 4}, -- cgit v1.2.3 From 4ae45ca995b1f01b8e7ab3d115efe241c9adfee3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 10 May 2023 22:55:49 +0100 Subject: Tidy up encoder_map directions (#20847) --- keyboards/dotmod/dymium65/keymaps/default/keymap.c | 2 +- keyboards/dotmod/dymium65/keymaps/via/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/dotmod') diff --git a/keyboards/dotmod/dymium65/keymaps/default/keymap.c b/keyboards/dotmod/dymium65/keymaps/default/keymap.c index 483746b53f..e18c3b5b23 100644 --- a/keyboards/dotmod/dymium65/keymaps/default/keymap.c +++ b/keyboards/dotmod/dymium65/keymaps/default/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP) }, [_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [_LN] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, diff --git a/keyboards/dotmod/dymium65/keymaps/via/keymap.c b/keyboards/dotmod/dymium65/keymaps/via/keymap.c index 483746b53f..e18c3b5b23 100644 --- a/keyboards/dotmod/dymium65/keymaps/via/keymap.c +++ b/keyboards/dotmod/dymium65/keymaps/via/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP) }, [_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [_LN] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, -- cgit v1.2.3