diff options
Diffstat (limited to 'keyboards/1upkeyboards/sweet16v2')
7 files changed, 88 insertions, 96 deletions
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h index 9d62be3bb7..88687335de 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h @@ -18,7 +18,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 10 -#define RGB_DI_PIN GP6 #define RGB_MATRIX_LED_COUNT 20 #define RGBLED_NUM 20 #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index 91fa580354..b8705866c8 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -24,47 +24,45 @@ "rgb_matrix": true, "rgblight": false }, + "ws2812": { + "pin": "GP6", + "driver": "vendor" + }, "matrix_pins": { - "cols": ["GP2", "GP9", "GP8", "GP7"], + "cols": ["GP2", "GP9", "GP8", "GP7"], "rows": ["GP26", "GP1", "GP18", "GP5"] }, "diode_direction": "COL2ROW", "encoder": { "enabled": true, "rotary": [ - { - "pin_a": "GP27", - "pin_b": "GP28" - }, - { - "pin_a": "GP4", - "pin_b": "GP3" - } + {"pin_a": "GP27", "pin_b": "GP28"}, + {"pin_a": "GP4", "pin_b": "GP3"} ] }, "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 4, "matrix": [0, 0], "x": 28, "y": 12 }, - { "flags": 4, "matrix": [0, 1], "x": 84, "y": 12 }, - { "flags": 4, "matrix": [0, 2], "x": 140, "y": 12 }, - { "flags": 4, "matrix": [0, 3], "x": 196, "y": 12 }, - { "flags": 2, "x": 196, "y": 17 }, - { "flags": 4, "matrix": [1, 3], "x": 196, "y": 28 }, - { "flags": 4, "matrix": [1, 2], "x": 140, "y": 28 }, - { "flags": 4, "matrix": [1, 1], "x": 84, "y": 28 }, - { "flags": 2, "x": 28, "y": 17 }, - { "flags": 4, "matrix": [1, 0], "x": 28, "y": 28 }, - { "flags": 4, "matrix": [2, 0], "x": 28, "y": 44 }, - { "flags": 4, "matrix": [2, 1], "x": 84, "y": 44 }, - { "flags": 4, "matrix": [2, 2], "x": 140, "y": 44 }, - { "flags": 4, "matrix": [2, 3], "x": 196, "y": 44 }, - { "flags": 2, "x": 196, "y": 47 }, - { "flags": 4, "matrix": [3, 3], "x": 196, "y": 60 }, - { "flags": 4, "matrix": [3, 2], "x": 140, "y": 60 }, - { "flags": 4, "matrix": [3, 1], "x": 84, "y": 60 }, - { "flags": 2, "x": 28, "y": 47 }, - { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 } + {"flags": 4, "matrix": [0, 0], "x": 28, "y": 12}, + {"flags": 4, "matrix": [0, 1], "x": 84, "y": 12}, + {"flags": 4, "matrix": [0, 2], "x": 140, "y": 12}, + {"flags": 4, "matrix": [0, 3], "x": 196, "y": 12}, + {"flags": 2, "x": 196, "y": 17}, + {"flags": 4, "matrix": [1, 3], "x": 196, "y": 28}, + {"flags": 4, "matrix": [1, 2], "x": 140, "y": 28}, + {"flags": 4, "matrix": [1, 1], "x": 84, "y": 28}, + {"flags": 2, "x": 28, "y": 17}, + {"flags": 4, "matrix": [1, 0], "x": 28, "y": 28}, + {"flags": 4, "matrix": [2, 0], "x": 28, "y": 44}, + {"flags": 4, "matrix": [2, 1], "x": 84, "y": 44}, + {"flags": 4, "matrix": [2, 2], "x": 140, "y": 44}, + {"flags": 4, "matrix": [2, 3], "x": 196, "y": 44}, + {"flags": 2, "x": 196, "y": 47}, + {"flags": 4, "matrix": [3, 3], "x": 196, "y": 60}, + {"flags": 4, "matrix": [3, 2], "x": 140, "y": 60}, + {"flags": 4, "matrix": [3, 1], "x": 84, "y": 60}, + {"flags": 2, "x": 28, "y": 47}, + {"flags": 4, "matrix": [3, 0], "x": 28, "y": 60} ] }, "community_layouts": [ @@ -73,23 +71,23 @@ "layouts": { "LAYOUT_ortho_4x4": { "layout": [ - { "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": [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": [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": [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": [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": [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": [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": [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} ] } } -}
\ No newline at end of file +} diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk index 997fce7e65..e69de29bb2 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk @@ -1 +0,0 @@ -WS2812_DRIVER = vendor diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c index 1994a5bde1..14168ee700 100644 --- a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c @@ -34,7 +34,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] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c b/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c index 8bb0368d09..b77ed6e256 100644 --- a/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c @@ -90,7 +90,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] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h index 2f8c72447e..f773468d8f 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h @@ -19,7 +19,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 10 -#define RGB_DI_PIN D7 #define RGB_MATRIX_LED_COUNT 20 #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json index efdb94cd74..fa98b70fbc 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -23,6 +23,9 @@ "rgb_matrix": true, "rgblight": false }, + "ws2812": { + "pin": "D7" + }, "matrix_pins": { "cols": ["F7", "D2", "B1", "C6"], "rows": ["D1", "B5", "B4", "E6"] @@ -31,39 +34,33 @@ "encoder": { "enabled": true, "rotary": [ - { - "pin_a": "F6", - "pin_b": "F5" - }, - { - "pin_a": "D4", - "pin_b": "D0" - } + {"pin_a": "F6", "pin_b": "F5"}, + {"pin_a": "D4", "pin_b": "D0"} ] }, "rgb_matrix": { "driver": "WS2812", "layout": [ - { "flags": 4, "matrix": [0, 0], "x": 28, "y": 12 }, - { "flags": 4, "matrix": [0, 1], "x": 84, "y": 12 }, - { "flags": 4, "matrix": [0, 2], "x": 140, "y": 12 }, - { "flags": 4, "matrix": [0, 3], "x": 196, "y": 12 }, - { "flags": 2, "x": 196, "y": 17 }, - { "flags": 4, "matrix": [1, 3], "x": 196, "y": 28 }, - { "flags": 4, "matrix": [1, 2], "x": 140, "y": 28 }, - { "flags": 4, "matrix": [1, 1], "x": 84, "y": 28 }, - { "flags": 2, "x": 28, "y": 17 }, - { "flags": 4, "matrix": [1, 0], "x": 28, "y": 28 }, - { "flags": 4, "matrix": [2, 0], "x": 28, "y": 44 }, - { "flags": 4, "matrix": [2, 1], "x": 84, "y": 44 }, - { "flags": 4, "matrix": [2, 2], "x": 140, "y": 44 }, - { "flags": 4, "matrix": [2, 3], "x": 196, "y": 44 }, - { "flags": 2, "x": 196, "y": 47 }, - { "flags": 4, "matrix": [3, 3], "x": 196, "y": 60 }, - { "flags": 4, "matrix": [3, 2], "x": 140, "y": 60 }, - { "flags": 4, "matrix": [3, 1], "x": 84, "y": 60 }, - { "flags": 2, "x": 28, "y": 47 }, - { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 } + {"flags": 4, "matrix": [0, 0], "x": 28, "y": 12}, + {"flags": 4, "matrix": [0, 1], "x": 84, "y": 12}, + {"flags": 4, "matrix": [0, 2], "x": 140, "y": 12}, + {"flags": 4, "matrix": [0, 3], "x": 196, "y": 12}, + {"flags": 2, "x": 196, "y": 17}, + {"flags": 4, "matrix": [1, 3], "x": 196, "y": 28}, + {"flags": 4, "matrix": [1, 2], "x": 140, "y": 28}, + {"flags": 4, "matrix": [1, 1], "x": 84, "y": 28}, + {"flags": 2, "x": 28, "y": 17}, + {"flags": 4, "matrix": [1, 0], "x": 28, "y": 28}, + {"flags": 4, "matrix": [2, 0], "x": 28, "y": 44}, + {"flags": 4, "matrix": [2, 1], "x": 84, "y": 44}, + {"flags": 4, "matrix": [2, 2], "x": 140, "y": 44}, + {"flags": 4, "matrix": [2, 3], "x": 196, "y": 44}, + {"flags": 2, "x": 196, "y": 47}, + {"flags": 4, "matrix": [3, 3], "x": 196, "y": 60}, + {"flags": 4, "matrix": [3, 2], "x": 140, "y": 60}, + {"flags": 4, "matrix": [3, 1], "x": 84, "y": 60}, + {"flags": 2, "x": 28, "y": 47}, + {"flags": 4, "matrix": [3, 0], "x": 28, "y": 60} ] }, "community_layouts": [ @@ -72,23 +69,23 @@ "layouts": { "LAYOUT_ortho_4x4": { "layout": [ - { "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": [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": [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": [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": [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": [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": [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": [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} ] } } -}
\ No newline at end of file +} |