diff options
Diffstat (limited to 'keyboards/mechwild/sugarglider')
-rw-r--r-- | keyboards/mechwild/sugarglider/config.h | 3 | ||||
-rw-r--r-- | keyboards/mechwild/sugarglider/info.json | 117 | ||||
-rw-r--r-- | keyboards/mechwild/sugarglider/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/mechwild/sugarglider/keymaps/via/keymap.c | 2 |
4 files changed, 62 insertions, 62 deletions
diff --git a/keyboards/mechwild/sugarglider/config.h b/keyboards/mechwild/sugarglider/config.h index dc3a85a728..1512cc1528 100644 --- a/keyboards/mechwild/sugarglider/config.h +++ b/keyboards/mechwild/sugarglider/config.h @@ -36,6 +36,3 @@ #define SPI_MISO_PAL_MODE 5 #define CIRQUE_PINNACLE_SPI_DIVISOR 8 #define CIRQUE_PINNACLE_SPI_CS_PIN A3 - -/* Force NKRO */ -#define FORCE_NKRO diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json index 9d9ee27eb5..046776be49 100644 --- a/keyboards/mechwild/sugarglider/info.json +++ b/keyboards/mechwild/sugarglider/info.json @@ -19,12 +19,12 @@ "usb": { "vid": "0x6D77", "pid": "0x1710", - "device_version": "0.2.0" + "device_version": "0.2.0", + "force_nkro": true }, "diode_direction": "COL2ROW", "rgblight": { "led_count": 10, - "pin": "B5", "max_brightness": 255, "hue_steps": 8, "saturation_steps": 8, @@ -42,68 +42,71 @@ "twinkle": true } }, + "ws2812": { + "pin": "B5" + }, "encoder": { "rotary": [ - { "pin_a": "B0", "pin_b": "A2", "resolution": 4 }, - { "pin_a": "B3", "pin_b": "A15", "resolution": 4 }, - { "pin_a": "B9", "pin_b": "B8", "resolution": 4 }, - { "pin_a": "C15", "pin_b": "C14", "resolution": 4 } + {"pin_a": "B0", "pin_b": "A2", "resolution": 4}, + {"pin_a": "B3", "pin_b": "A15", "resolution": 4}, + {"pin_a": "B9", "pin_b": "B8", "resolution": 4}, + {"pin_a": "C15", "pin_b": "C14", "resolution": 4} ] }, "layouts": { "LAYOUT": { "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": [0, 4], "x":4, "y":0}, - { "matrix": [0, 5], "x":5, "y":0}, - { "matrix": [8, 0], "x":9, "y":0}, - { "matrix": [4, 0], "x":10.5, "y":0}, - { "matrix": [4, 1], "x":11.5, "y":0}, - { "matrix": [4, 2], "x":12.5, "y":0}, - { "matrix": [4, 3], "x":13.5, "y":0}, - { "matrix": [4, 4], "x":14.5, "y":0}, - { "matrix": [4, 5], "x":15.5, "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": [8, 5], "x":8, "y":1}, - { "matrix": [8, 1], "x":9, "y":1}, - { "matrix": [5, 0], "x":10.5, "y":1}, - { "matrix": [5, 1], "x":11.5, "y":1}, - { "matrix": [5, 2], "x":12.5, "y":1}, - { "matrix": [5, 3], "x":13.5, "y":1}, - { "matrix": [5, 4], "x":14.5, "y":1}, - { "matrix": [5, 5], "x":15.5, "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": [8, 2], "x":9, "y":2}, - { "matrix": [6, 0], "x":10.5, "y":2}, - { "matrix": [6, 1], "x":11.5, "y":2}, - { "matrix": [6, 2], "x":12.5, "y":2}, - { "matrix": [6, 3], "x":13.5, "y":2}, - { "matrix": [6, 4], "x":14.5, "y":2}, - { "matrix": [6, 5], "x":15.5, "y":2}, - { "matrix": [3, 0], "x":2.25, "y":3.5}, - { "matrix": [3, 1], "x":3.5, "y":3.5, "h":1.5}, - { "matrix": [3, 2], "x":4.5, "y":3.5, "h":1.5}, - { "matrix": [3, 3], "x":5.5, "y":3.5, "h":1.5}, - { "matrix": [3, 4], "x":6.75, "y":3.5}, - { "matrix": [7, 0], "x":7.75, "y":3.5}, - { "matrix": [7, 1], "x":8.75, "y":3.5}, - { "matrix": [7, 2], "x":10, "y":3.5, "h":1.5}, - { "matrix": [7, 3], "x":11, "y":3.5, "h":1.5}, - { "matrix": [7, 4], "x":12, "y":3.5, "h":1.5}, - { "matrix": [7, 5], "x":13.25, "y":3.5} + {"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": [8, 0], "x": 9, "y": 0}, + {"matrix": [4, 0], "x": 10.5, "y": 0}, + {"matrix": [4, 1], "x": 11.5, "y": 0}, + {"matrix": [4, 2], "x": 12.5, "y": 0}, + {"matrix": [4, 3], "x": 13.5, "y": 0}, + {"matrix": [4, 4], "x": 14.5, "y": 0}, + {"matrix": [4, 5], "x": 15.5, "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": [8, 5], "x": 8, "y": 1}, + {"matrix": [8, 1], "x": 9, "y": 1}, + {"matrix": [5, 0], "x": 10.5, "y": 1}, + {"matrix": [5, 1], "x": 11.5, "y": 1}, + {"matrix": [5, 2], "x": 12.5, "y": 1}, + {"matrix": [5, 3], "x": 13.5, "y": 1}, + {"matrix": [5, 4], "x": 14.5, "y": 1}, + {"matrix": [5, 5], "x": 15.5, "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": [8, 2], "x": 9, "y": 2}, + {"matrix": [6, 0], "x": 10.5, "y": 2}, + {"matrix": [6, 1], "x": 11.5, "y": 2}, + {"matrix": [6, 2], "x": 12.5, "y": 2}, + {"matrix": [6, 3], "x": 13.5, "y": 2}, + {"matrix": [6, 4], "x": 14.5, "y": 2}, + {"matrix": [6, 5], "x": 15.5, "y": 2}, + {"matrix": [3, 0], "x": 2.25, "y": 3.5}, + {"matrix": [3, 1], "x": 3.5, "y": 3.5, "h": 1.5}, + {"matrix": [3, 2], "x": 4.5, "y": 3.5, "h": 1.5}, + {"matrix": [3, 3], "x": 5.5, "y": 3.5, "h": 1.5}, + {"matrix": [3, 4], "x": 6.75, "y": 3.5}, + {"matrix": [7, 0], "x": 7.75, "y": 3.5}, + {"matrix": [7, 1], "x": 8.75, "y": 3.5}, + {"matrix": [7, 2], "x": 10, "y": 3.5, "h": 1.5}, + {"matrix": [7, 3], "x": 11, "y": 3.5, "h": 1.5}, + {"matrix": [7, 4], "x": 12, "y": 3.5, "h": 1.5}, + {"matrix": [7, 5], "x": 13.25, "y": 3.5} ] } } diff --git a/keyboards/mechwild/sugarglider/keymaps/default/keymap.c b/keyboards/mechwild/sugarglider/keymaps/default/keymap.c index 77541edf13..ad0470a139 100644 --- a/keyboards/mechwild/sugarglider/keymaps/default/keymap.c +++ b/keyboards/mechwild/sugarglider/keymaps/default/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][4][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) }, [_LOWER] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(DPI_UP, DPI_DN) }, [_RAISE] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_HOME, KC_END) }, diff --git a/keyboards/mechwild/sugarglider/keymaps/via/keymap.c b/keyboards/mechwild/sugarglider/keymaps/via/keymap.c index 999f4e55ec..bfa5ebfa23 100644 --- a/keyboards/mechwild/sugarglider/keymaps/via/keymap.c +++ b/keyboards/mechwild/sugarglider/keymaps/via/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][4][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) }, [_LOWER] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(DPI_UP, DPI_DN) }, [_RAISE] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_HOME, KC_END) }, |