diff --git a/keyboards/protokeeb/keymaps/default/keymap.c b/keyboards/protokeeb/keymaps/default/keymap.c index 3d1f8698cf6..01a0b4e0f4f 100644 --- a/keyboards/protokeeb/keymaps/default/keymap.c +++ b/keyboards/protokeeb/keymaps/default/keymap.c @@ -28,14 +28,14 @@ enum protokeeb_keymap_layers { #define LOWER LT(LAYER_LOWER, KC_KP_0) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [LAYER_BASE] = LAYOUT( /* Base */ + [LAYER_BASE] = LAYOUT_ortho_4x4( /* Base */ KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_SLASH, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ASTERISK, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_MINUS, LOWER, KC_KP_DOT, KC_KP_ENTER, KC_KP_PLUS ), - [LAYER_LOWER] = LAYOUT( /* RGB Control */ + [LAYER_LOWER] = LAYOUT_ortho_4x4( /* RGB Control */ RGB_MODE_PLAIN, RGB_MODE_FORWARD, RGB_MODE_REVERSE, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, diff --git a/keyboards/protokeeb/keymaps/via/keymap.c b/keyboards/protokeeb/keymaps/via/keymap.c index 7f8b8d35f40..b1b7743bdc3 100644 --- a/keyboards/protokeeb/keymaps/via/keymap.c +++ b/keyboards/protokeeb/keymaps/via/keymap.c @@ -26,14 +26,13 @@ enum protokeeb_keymap_layers { }; #define LOWER LT(LAYER_LOWER, KC_KP_0) -#define RAISE LT(DYNAMIC_LAYER1, KC_KP_ENTER) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [LAYER_BASE] = LAYOUT_ortho_4x4( /* Base */ KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_SLASH, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ASTERISK, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_MINUS, - LOWER, KC_KP_DOT, RAISE, KC_KP_PLUS + LOWER, KC_KP_DOT, KC_KP_ENTER, KC_KP_PLUS ), [LAYER_LOWER] = LAYOUT_ortho_4x4( /* RGB Control */ diff --git a/keyboards/protokeeb/rev1/keyboard.json b/keyboards/protokeeb/rev1/keyboard.json index 6a401d1c1f8..86af5d1076b 100644 --- a/keyboards/protokeeb/rev1/keyboard.json +++ b/keyboards/protokeeb/rev1/keyboard.json @@ -1,485 +1,183 @@ { - "usb": { - "pid": "0x1717", - "device_version": "1.0.0" + "audio": { + "default": { + "clicky": false, + "on": false + }, + "macro_beep": false, + "pins": ["GP22"], + "voices": false }, "board": "GENERIC_RP_RP2040", "bootloader": "rp2040", - "processor": "RP2040", + "bootmagic": { + "enabled": true, + "matrix": [0, 0] + }, + "debounce": 20, + "diode_direction": "COL2ROW", + "dip_switch": { + "enabled": true, + "pins": ["GP14"] + }, + "encoder": { + "rotary": [{ "pin_a": "GP12", "pin_b": "GP13", "resolution": 2 }] + }, "features": { "bootmagic": true, - "rgblight": true, + "encoder": true, "extrakey": true, "nkro": true, - "encoder": true + "rgblight": true }, "matrix_pins": { "cols": ["GP6", "GP7", "GP8", "GP9"], "rows": ["GP2", "GP3", "GP4", "GP5"] }, - "diode_direction": "COL2ROW", - "debounce": 20, - "layouts": { - "LAYOUT": { - "layout": [ - { - "label": "7", - "matrix": [0, 0], - "x": 0, - "y": 0, - "w": 1, - "h": 1 - }, - { - "label": "8", - "matrix": [0, 1], - "x": 1, - "y": 0, - "w": 1, - "h": 1 - }, - { - "label": "9", - "matrix": [0, 2], - "x": 2, - "y": 0, - "w": 1, - "h": 1 - }, - { - "label": "/", - "matrix": [0, 3], - "x": 3, - "y": 0, - "w": 1, - "h": 1 - }, - { - "label": "4", - "matrix": [1, 0], - "x": 0, - "y": 1, - "w": 1, - "h": 1 - }, - { - "label": "5", - "matrix": [1, 1], - "x": 1, - "y": 1, - "w": 1, - "h": 1 - }, - { - "label": "6", - "matrix": [1, 2], - "x": 2, - "y": 1, - "w": 1, - "h": 1 - }, - { - "label": "*", - "matrix": [1, 3], - "x": 3, - "y": 1, - "w": 1, - "h": 1 - }, - { - "label": "1", - "matrix": [2, 0], - "x": 0, - "y": 2, - "w": 1, - "h": 1 - }, - { - "label": "2", - "matrix": [2, 1], - "x": 1, - "y": 2, - "w": 1, - "h": 1 - }, - { - "label": "3", - "matrix": [2, 2], - "x": 2, - "y": 2, - "w": 1, - "h": 1 - }, - { - "label": "-", - "matrix": [2, 3], - "x": 3, - "y": 2, - "w": 1, - "h": 1 - }, - { - "label": "0", - "matrix": [3, 0], - "x": 0, - "y": 3, - "w": 1, - "h": 1 - }, - { - "label": ".", - "matrix": [3, 1], - "x": 1, - "y": 3, - "w": 1, - "h": 1 - }, - { - "label": "ENTER", - "matrix": [3, 2], - "x": 2, - "y": 3, - "w": 1, - "h": 1 - }, - { - "label": "+", - "matrix": [3, 3], - "x": 3, - "y": 3, - "w": 1, - "h": 1 - } - ] + "processor": "RP2040", + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true }, + "brightness_steps": 15, + "default": { + "animation": "static_light", + "hue": 0, + "on": true, + "sat": 255, + "speed": 0, + "val": 50 + }, + "driver": "ws2812", + "hue_steps": 15, + "layers": { + "blink": false, + "enabled": false, + "max": 4 + }, + "led_count": 4, + "led_map": [3, 2, 1, 0], + "max_brightness": 127, + "saturation_steps": 15, + "sleep": true + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x1717" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP10" + }, + "layouts": { "LAYOUT_ortho_4x4": { "layout": [ { "label": "7", "matrix": [0, 0], "x": 0, - "y": 0, - "w": 1, - "h": 1 + "y": 0 }, { "label": "8", "matrix": [0, 1], "x": 1, - "y": 0, - "w": 1, - "h": 1 + "y": 0 }, { "label": "9", "matrix": [0, 2], "x": 2, - "y": 0, - "w": 1, - "h": 1 + "y": 0 }, { "label": "/", "matrix": [0, 3], "x": 3, - "y": 0, - "w": 1, - "h": 1 + "y": 0 }, { "label": "4", "matrix": [1, 0], "x": 0, - "y": 1, - "w": 1, - "h": 1 + "y": 1 }, { "label": "5", "matrix": [1, 1], "x": 1, - "y": 1, - "w": 1, - "h": 1 + "y": 1 }, { "label": "6", "matrix": [1, 2], "x": 2, - "y": 1, - "w": 1, - "h": 1 + "y": 1 }, { "label": "*", "matrix": [1, 3], "x": 3, - "y": 1, - "w": 1, - "h": 1 + "y": 1 }, { "label": "1", "matrix": [2, 0], "x": 0, - "y": 2, - "w": 1, - "h": 1 + "y": 2 }, { "label": "2", "matrix": [2, 1], "x": 1, - "y": 2, - "w": 1, - "h": 1 + "y": 2 }, { "label": "3", "matrix": [2, 2], "x": 2, - "y": 2, - "w": 1, - "h": 1 + "y": 2 }, { "label": "-", "matrix": [2, 3], "x": 3, - "y": 2, - "w": 1, - "h": 1 + "y": 2 }, { "label": "0", "matrix": [3, 0], "x": 0, - "y": 3, - "w": 1, - "h": 1 + "y": 3 }, { "label": ".", "matrix": [3, 1], "x": 1, - "y": 3, - "w": 1, - "h": 1 + "y": 3 }, { "label": "ENTER", "matrix": [3, 2], "x": 2, - "y": 3, - "w": 1, - "h": 1 + "y": 3 }, { "label": "+", "matrix": [3, 3], "x": 3, - "y": 3, - "w": 1, - "h": 1 - } - ] - }, - "LAYOUT_midi": { - "layout": [ - { - "label": "MI_C", - "matrix": [0, 0], - "x": 0, - "y": 0, - "w": 1, - "h": 1 - }, - { - "label": "MI_Cs", - "matrix": [0, 1], - "x": 1, - "y": 0, - "w": 1, - "h": 1 - }, - { - "label": "MI_D", - "matrix": [0, 2], - "x": 2, - "y": 0, - "w": 1, - "h": 1 - }, - { - "label": "MI_Ds", - "matrix": [0, 3], - "x": 3, - "y": 0, - "w": 1, - "h": 1 - }, - { - "label": "MI_E", - "matrix": [1, 0], - "x": 0, - "y": 1, - "w": 1, - "h": 1 - }, - { - "label": "MI_F", - "matrix": [1, 1], - "x": 1, - "y": 1, - "w": 1, - "h": 1 - }, - { - "label": "MI_Fs", - "matrix": [1, 2], - "x": 2, - "y": 1, - "w": 1, - "h": 1 - }, - { - "label": "MI_G", - "matrix": [1, 3], - "x": 3, - "y": 1, - "w": 1, - "h": 1 - }, - { - "label": "MI_Gs", - "matrix": [2, 0], - "x": 0, - "y": 2, - "w": 1, - "h": 1 - }, - { - "label": "MI_A", - "matrix": [2, 1], - "x": 1, - "y": 2, - "w": 1, - "h": 1 - }, - { - "label": "MI_As", - "matrix": [2, 2], - "x": 2, - "y": 2, - "w": 1, - "h": 1 - }, - { - "label": "MI_B", - "matrix": [2, 3], - "x": 3, - "y": 2, - "w": 1, - "h": 1 - }, - { - "label": "MO(3)", - "matrix": [3, 0], - "x": 0, - "y": 3, - "w": 1, - "h": 1 - }, - { - "label": "TG(1)", - "matrix": [3, 1], - "x": 1, - "y": 3, - "w": 1, - "h": 1 - }, - { - "label": "TG(2)", - "matrix": [3, 2], - "x": 2, - "y": 3, - "w": 1, - "h": 1 - }, - { - "label": "MI_TOGG", - "matrix": [3, 3], - "x": 3, - "y": 3, - "w": 1, - "h": 1 + "y": 3 } ] } - }, - "audio": { - "default": { - "on": false, - "clicky": false - }, - "macro_beep": false, - "pins": ["GP22"], - "voices": false - }, - "bootmagic": { - "enabled": true, - "matrix": [0, 0] - }, - "dip_switch": { - "enabled": true, - "pins": ["GP14"] - }, - "encoder": { - "rotary": [ - { - "pin_a": "GP12", - "pin_b": "GP13", - "resolution": 2 - } - ] - }, - "rgblight": { - "led_count": 4, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - }, - "hue_steps": 15, - "saturation_steps": 15, - "brightness_steps": 15, - "default": { - "animation": "static_light", - "on": true, - "hue": 0, - "sat": 255, - "val": 50, - "speed": 0 - }, - "driver": "ws2812", - "layers": { - "blink": false, - "enabled": false, - "max": 4 - }, - "led_map": [3, 2, 1, 0], - "max_brightness": 127, - "sleep": true - }, - "ws2812": { - "driver": "vendor", - "pin": "GP10" } }