diff options
Diffstat (limited to 'keyboards/keebio')
133 files changed, 586 insertions, 770 deletions
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h index 6fd93072f5..46fd4d7316 100644 --- a/keyboards/keebio/bamfk1/config.h +++ b/keyboards/keebio/bamfk1/config.h @@ -8,25 +8,3 @@ # define STARTUP_SONG SONG(STARTUP_SOUND) #endif -#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2) - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json deleted file mode 100644 index 4fa563f0e8..0000000000 --- a/keyboards/keebio/bamfk1/info.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "keyboard_name": "BAMFK-1", - "manufacturer": "Keebio", - "url": "https://keeb.io", - "maintainer": "nooges", - "usb": { - "vid": "0xCB10", - "pid": "0x1111", - "device_version": "0.0.1" - }, - "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, - "led_count": 16, - "sleep": true, - "animations": { - "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true - } - }, - "ws2812": { - "pin": "D3" - }, - "encoder": { - "rotary": [ - {"pin_a": "C7", "pin_b": "B5"}, - {"pin_a": "D7", "pin_b": "D4"} - ] - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "matrix_pins": { - "direct": [ - ["E6", "B6", "D6"] - ] - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"x": 1, "y": 0, "h": 2, "w": 2, "matrix": [0, 0]}, - {"x": 0, "y": 2.25, "matrix": [0, 1]}, - {"x": 3, "y": 2.25, "matrix": [0, 2]} - ] - } - } -} diff --git a/keyboards/keebio/bamfk1/keyboard.json b/keyboards/keebio/bamfk1/keyboard.json new file mode 100644 index 0000000000..09e7edbd18 --- /dev/null +++ b/keyboards/keebio/bamfk1/keyboard.json @@ -0,0 +1,113 @@ +{ + "manufacturer": "Keebio", + "keyboard_name": "BAMFK-1", + "maintainer": "nooges", + "bootloader": "atmel-dfu", + "encoder": { + "rotary": [ + {"pin_a": "C7", "pin_b": "B5"}, + {"pin_a": "D7", "pin_b": "D4"} + ] + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true + }, + "matrix_pins": { + "direct": [ + ["E6", "B6", "D6"] + ] + }, + "processor": "atmega32u4", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "default": { + "animation": "cycle_pinwheel", + "speed": 48 + }, + "driver": "ws2812", + "layout": [ + {"x": 56, "y": 0, "flags": 4}, + {"x": 168, "y": 0, "flags": 4}, + {"x": 224, "y": 16, "flags": 4}, + {"x": 224, "y": 48, "flags": 4}, + {"matrix": [0, 2], "x": 168, "y": 64, "flags": 4}, + {"matrix": [0, 1], "x": 56, "y": 64, "flags": 4}, + {"x": 0, "y": 48, "flags": 4}, + {"x": 0, "y": 16, "flags": 4}, + {"x": 0, "y": 0, "flags": 2}, + {"x": 112, "y": 0, "flags": 2}, + {"x": 224, "y": 0, "flags": 2}, + {"x": 224, "y": 32, "flags": 2}, + {"x": 224, "y": 64, "flags": 2}, + {"x": 112, "y": 64, "flags": 2}, + {"x": 224, "y": 64, "flags": 2}, + {"matrix": [0, 0], "x": 112, "y": 32, "flags": 2} + ], + "sleep": true + }, + "url": "https://keeb.io", + "usb": { + "device_version": "0.0.1", + "pid": "0x1211", + "vid": "0xCB10" + }, + "ws2812": { + "pin": "D3" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0, "w": 2, "h": 2}, + {"matrix": [0, 1], "x": 0, "y": 2.25}, + {"matrix": [0, 2], "x": 3, "y": 2.25} + ] + } + } +} diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk deleted file mode 100644 index 21df40039e..0000000000 --- a/keyboards/keebio/bamfk1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/keebio/bamfk4/info.json b/keyboards/keebio/bamfk4/keyboard.json index 769f288c51..a132a4bd46 100644 --- a/keyboards/keebio/bamfk4/info.json +++ b/keyboards/keebio/bamfk4/keyboard.json @@ -75,6 +75,18 @@ "val": 120 } }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "D5", "B6", "B7"], "rows": ["F0"] diff --git a/keyboards/keebio/bamfk4/rules.mk b/keyboards/keebio/bamfk4/rules.mk deleted file mode 100644 index 73f76344df..0000000000 --- a/keyboards/keebio/bamfk4/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/keyboard.json index 0167052f6d..9ab64e25d6 100644 --- a/keyboards/keebio/bdn9/rev1/info.json +++ b/keyboards/keebio/bdn9/rev1/keyboard.json @@ -38,6 +38,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "direct": [ ["D2", "D4", "F4"], diff --git a/keyboards/keebio/bdn9/rev1/rules.mk b/keyboards/keebio/bdn9/rev1/rules.mk deleted file mode 100644 index b0fc1d94e5..0000000000 --- a/keyboards/keebio/bdn9/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/keyboard.json index 74d6dac85b..174c5c826a 100644 --- a/keyboards/keebio/bdn9/rev2/info.json +++ b/keyboards/keebio/bdn9/rev2/keyboard.json @@ -85,6 +85,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true, + "rgb_matrix": true + }, "matrix_pins": { "direct": [ ["B12", "B5", "B6"], diff --git a/keyboards/keebio/bdn9/rev2/rules.mk b/keyboards/keebio/bdn9/rev2/rules.mk deleted file mode 100644 index e407769147..0000000000 --- a/keyboards/keebio/bdn9/rev2/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes - diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/keyboard.json index 5738ac6953..86fd59a598 100644 --- a/keyboards/keebio/bfo9000/info.json +++ b/keyboards/keebio/bfo9000/keyboard.json @@ -8,13 +8,22 @@ "pid": "0x1169", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D4", "C6", "D7", "E6"] }, "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "enabled": true, + "soft_serial_pin": "D0" }, "rgblight": { "led_count": 20, diff --git a/keyboards/keebio/bfo9000/rules.mk b/keyboards/keebio/bfo9000/rules.mk deleted file mode 100644 index 743a54659e..0000000000 --- a/keyboards/keebio/bfo9000/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/bigswitchseat/info.json b/keyboards/keebio/bigswitchseat/keyboard.json index f2fe9771ed..b1acf6c1b3 100644 --- a/keyboards/keebio/bigswitchseat/info.json +++ b/keyboards/keebio/bigswitchseat/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1011", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F0"], "rows": ["E6"] diff --git a/keyboards/keebio/bigswitchseat/rules.mk b/keyboards/keebio/bigswitchseat/rules.mk deleted file mode 100644 index 3f6eff7f55..0000000000 --- a/keyboards/keebio/bigswitchseat/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebio/cepstrum/rev1/info.json b/keyboards/keebio/cepstrum/rev1/keyboard.json index 0b53d12792..0b53d12792 100644 --- a/keyboards/keebio/cepstrum/rev1/info.json +++ b/keyboards/keebio/cepstrum/rev1/keyboard.json diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/keyboard.json index b5f50cc486..0315a9f3dc 100644 --- a/keyboards/keebio/choconum/info.json +++ b/keyboards/keebio/choconum/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "direct": [ ["B2", "B10", "B3", "B4"], diff --git a/keyboards/keebio/choconum/rules.mk b/keyboards/keebio/choconum/rules.mk deleted file mode 100644 index 67d4dee2c7..0000000000 --- a/keyboards/keebio/choconum/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/keebio/chocopad/rev1/info.json b/keyboards/keebio/chocopad/rev1/keyboard.json index fafea9dce0..fafea9dce0 100644 --- a/keyboards/keebio/chocopad/rev1/info.json +++ b/keyboards/keebio/chocopad/rev1/keyboard.json diff --git a/keyboards/keebio/chocopad/rev1/rules.mk b/keyboards/keebio/chocopad/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keebio/chocopad/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/chocopad/rev2/info.json b/keyboards/keebio/chocopad/rev2/keyboard.json index 7cc5ef518f..7cc5ef518f 100644 --- a/keyboards/keebio/chocopad/rev2/info.json +++ b/keyboards/keebio/chocopad/rev2/keyboard.json diff --git a/keyboards/keebio/chocopad/rev2/rules.mk b/keyboards/keebio/chocopad/rev2/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keebio/chocopad/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/convolution/info.json b/keyboards/keebio/convolution/info.json index 5e05d70ace..9ea761c1a9 100644 --- a/keyboards/keebio/convolution/info.json +++ b/keyboards/keebio/convolution/info.json @@ -10,9 +10,7 @@ "console": true, "extrakey": true, "mousekey": false, - "nkro": false, - "unicode": false, - "backlight": false + "nkro": false }, "layout_aliases": {"LAYOUT": "LAYOUT_all"} } diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/keyboard.json index 5ff7c1f8f0..68ac532620 100644 --- a/keyboards/keebio/convolution/rev1/info.json +++ b/keyboards/keebio/convolution/rev1/keyboard.json @@ -9,8 +9,6 @@ "diode_direction": "COL2ROW", "features": { "console": true, - "rgblight": false, - "backlight": false, "rgb_matrix": true }, "matrix_pins": { diff --git a/keyboards/keebio/convolution/rev1/rules.mk b/keyboards/keebio/convolution/rev1/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/keebio/convolution/rev1/rules.mk +++ /dev/null diff --git a/keyboards/keebio/dilly/info.json b/keyboards/keebio/dilly/keyboard.json index b229ca021f..4566594054 100644 --- a/keyboards/keebio/dilly/info.json +++ b/keyboards/keebio/dilly/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x113A", "device_version": "1.0.0" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "D4", "C6", "F6", "F5"], "rows": ["D7", "E6", "B4", "B1", "B3", "B2"] diff --git a/keyboards/keebio/dilly/keymaps/default/keymap.c b/keyboards/keebio/dilly/keymaps/default/keymap.c index 9eaec582f1..a8ca4f6020 100644 --- a/keyboards/keebio/dilly/keymaps/default/keymap.c +++ b/keyboards/keebio/dilly/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN5] = LAYOUT_ortho_3x10( - RGB_TOG, RGB_MOD, _______, QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, + RGB_TOG, RGB_MOD, _______, QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, DB_TOGG, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, BL_STEP, _______, KC_GUIC, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/keebio/dilly/rules.mk b/keyboards/keebio/dilly/rules.mk deleted file mode 100644 index 32e82925cc..0000000000 --- a/keyboards/keebio/dilly/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes diff --git a/keyboards/keebio/dsp40/keymaps/default/keymap.c b/keyboards/keebio/dsp40/keymaps/default/keymap.c index 24296484f2..f3da9b8942 100755 --- a/keyboards/keebio/dsp40/keymaps/default/keymap.c +++ b/keyboards/keebio/dsp40/keymaps/default/keymap.c @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ADJUST] = LAYOUT( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/keebio/dsp40/keymaps/via/keymap.c b/keyboards/keebio/dsp40/keymaps/via/keymap.c index c4dd6bd3bd..4987a9c01c 100755 --- a/keyboards/keebio/dsp40/keymaps/via/keymap.c +++ b/keyboards/keebio/dsp40/keymaps/via/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN3] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/keyboard.json index cc8fa692cd..2011a23b7e 100644 --- a/keyboards/keebio/dsp40/rev1/info.json +++ b/keyboards/keebio/dsp40/rev1/keyboard.json @@ -48,6 +48,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "backlight": true, + "encoder": true + }, "layout_aliases": { "LAYOUT_40_staggered": "LAYOUT" }, diff --git a/keyboards/keebio/dsp40/rev1/rules.mk b/keyboards/keebio/dsp40/rev1/rules.mk deleted file mode 100644 index 8c70082a37..0000000000 --- a/keyboards/keebio/dsp40/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/keyboard.json index 94c94193ed..1305a4359f 100644 --- a/keyboards/keebio/ergodicity/info.json +++ b/keyboards/keebio/ergodicity/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x125F", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B3"], "rows": ["B0", "B1", "C7", "B6", "B4"] diff --git a/keyboards/keebio/ergodicity/rules.mk b/keyboards/keebio/ergodicity/rules.mk deleted file mode 100644 index c358b798e4..0000000000 --- a/keyboards/keebio/ergodicity/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebio/foldkb/keymaps/default/keymap.c b/keyboards/keebio/foldkb/keymaps/default/keymap.c index d8a841f4e4..60499fa794 100644 --- a/keyboards/keebio/foldkb/keymaps/default/keymap.c +++ b/keyboards/keebio/foldkb/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL ), [1] = LAYOUT( - KC_MUTE, QK_BOOT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + KC_MUTE, QK_BOOT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, BL_STEP, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, _______, RGB_MOD, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, diff --git a/keyboards/keebio/foldkb/keymaps/via/keymap.c b/keyboards/keebio/foldkb/keymaps/via/keymap.c index adbf936936..665b4a3b1d 100644 --- a/keyboards/keebio/foldkb/keymaps/via/keymap.c +++ b/keyboards/keebio/foldkb/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL ), [1] = LAYOUT( - KC_MUTE, QK_BOOT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + KC_MUTE, QK_BOOT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, BL_STEP, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, KC_7, KC_8, KC_9, _______, _______, _______, _______, RGB_MOD, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, _______, _______, diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/keyboard.json index e826f34e32..891e2ce74b 100644 --- a/keyboards/keebio/foldkb/rev1/info.json +++ b/keyboards/keebio/foldkb/rev1/keyboard.json @@ -22,6 +22,7 @@ "pin": "B5" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -46,6 +47,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/foldkb/rev1/rules.mk b/keyboards/keebio/foldkb/rev1/rules.mk deleted file mode 100644 index 32e7881599..0000000000 --- a/keyboards/keebio/foldkb/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/foldkb/rules.mk b/keyboards/keebio/foldkb/rules.mk index 744acea63f..6a0522a902 100644 --- a/keyboards/keebio/foldkb/rules.mk +++ b/keyboards/keebio/foldkb/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/foldkb/rev1 diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/keyboard.json index 8631fd5841..a1dab05c56 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1247", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["F4", "D7", "E6", "B4"] @@ -20,6 +29,7 @@ "speaker": "C6" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/fourier/keymaps/default/keymap.c b/keyboards/keebio/fourier/keymaps/default/keymap.c index f98d94a9b6..8ae8e533e3 100644 --- a/keyboards/keebio/fourier/keymaps/default/keymap.c +++ b/keyboards/keebio/fourier/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, + QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_UP, _______, RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, KC_LEFT, KC_DOWN, KC_RGHT ), diff --git a/keyboards/keebio/fourier/keymaps/via/keymap.c b/keyboards/keebio/fourier/keymaps/via/keymap.c index 899d866008..9f1490a237 100644 --- a/keyboards/keebio/fourier/keymaps/via/keymap.c +++ b/keyboards/keebio/fourier/keymaps/via/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, + QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_UP, _______, RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, KC_LEFT, KC_DOWN, KC_RGHT ), diff --git a/keyboards/keebio/fourier/rules.mk b/keyboards/keebio/fourier/rules.mk deleted file mode 100644 index ff93a33914..0000000000 --- a/keyboards/keebio/fourier/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/iris/keymaps/default/keymap.c b/keyboards/keebio/iris/keymaps/default/keymap.c deleted file mode 100644 index e1e050ab1d..0000000000 --- a/keyboards/keebio/iris/keymaps/default/keymap.c +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright 2023 Danny Nguyen (@nooges) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -#define _QWERTY 0 -#define _LOWER 1 -#define _RAISE 2 -#define _ADJUST 3 - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, - RAISE, - ADJUST, -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_QWERTY] = LAYOUT( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_HOME, KC_END, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_RALT - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ), - - [_LOWER] = LAYOUT( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_DEL, _______, KC_LEFT, KC_RGHT, KC_UP, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - BL_STEP, _______, _______, _______, KC_DOWN, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_MINS, _______, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - _______, _______, KC_DEL, KC_DEL, _______, KC_P0 - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ), - - [_RAISE] = LAYOUT( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - RGB_TOG, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS, KC_EQL, KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN, _______, KC_PLUS, KC_END, RGB_HUD, RGB_SAD, RGB_VAD, _______, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - _______, _______, _______, _______, _______, _______ - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ), - - [_ADJUST] = LAYOUT( - //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - _______, _______, _______, _______, _______, _______ - // └────────┴────────┴────────┘ └────────┴────────┴────────┘ - ) -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case RAISE: - if (record->event.pressed) { - layer_on(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - return false; - break; - } - return true; -} diff --git a/keyboards/keebio/iris/keymaps/default/keymap.json b/keyboards/keebio/iris/keymaps/default/keymap.json new file mode 100644 index 0000000000..8b141d992f --- /dev/null +++ b/keyboards/keebio/iris/keymaps/default/keymap.json @@ -0,0 +1,29 @@ +{ + "config": { "features": {"tri_layer": true} }, + "keyboard": "keebio/iris", + "keymap": "default", + "layout": "LAYOUT", + "layers": [ + [ + "QK_GESC", "KC_1" , "KC_2" , "KC_3" , "KC_4" , "KC_5" , "KC_6" , "KC_7" , "KC_8" , "KC_9" , "KC_0" , "KC_BSPC", + "KC_TAB" , "KC_Q" , "KC_W" , "KC_E" , "KC_R" , "KC_T" , "KC_Y" , "KC_U" , "KC_I" , "KC_O" , "KC_P" , "KC_DEL" , + "KC_LCTL", "KC_A" , "KC_S" , "KC_D" , "KC_F" , "KC_G" , "KC_H" , "KC_J" , "KC_K" , "KC_L" , "KC_SCLN", "KC_QUOT", + "KC_LSFT", "KC_Z" , "KC_X" , "KC_C" , "KC_V" , "KC_B" , "KC_HOME", "KC_END" , "KC_N" , "KC_M" , "KC_COMM", "KC_DOT" , "KC_SLSH", "KC_RSFT", + "KC_LGUI", "TL_LOWR", "KC_ENT" , "KC_SPC" , "TL_UPPR", "KC_RALT" + ], + [ + "KC_TILD", "KC_EXLM", "KC_AT" , "KC_HASH", "KC_DLR" , "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "KC_PGUP", + "KC_GRV" , "_______", "KC_UP" , "_______", "QK_BOOT", "_______", "_______", "KC_P7" , "KC_P8" , "KC_P9" , "KC_P0" , "KC_PGDN", + "KC_DEL" , "KC_LEFT", "KC_DOWN", "KC_RGHT", "_______", "KC_LBRC", "KC_RBRC", "KC_P4" , "KC_P5" , "KC_P6" , "KC_PLUS", "KC_PIPE", + "RGB_MOD", "EE_CLR" , "_______", "_______", "_______", "KC_LCBR", "KC_LPRN", "KC_RPRN", "KC_RCBR", "KC_P1" , "KC_P2" , "KC_P3" , "KC_MINS", "_______", + "_______", "_______", "KC_DEL" , "KC_DEL" , "_______", "KC_P0" + ], + [ + "KC_F12" , "KC_F1" , "KC_F2" , "KC_F3" , "KC_F4" , "KC_F5" , "KC_F6" , "KC_F7" , "KC_F8" , "KC_F9" , "KC_F10" , "KC_F11" , + "RGB_TOG", "KC_EXLM", "KC_AT" , "KC_HASH", "KC_DLR" , "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "QK_BOOT", + "RGB_MOD", "KC_MPRV", "KC_MNXT", "KC_VOLU", "KC_PGUP", "KC_UNDS", "KC_EQL" , "KC_HOME", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_BSLS", + "KC_MUTE", "KC_MSTP", "KC_MPLY", "KC_VOLD", "KC_PGDN", "KC_MINS", "KC_LPRN", "_______", "KC_PLUS", "KC_END" , "RGB_HUD", "RGB_SAD", "RGB_VAD", "EE_CLR" , + "_______", "_______", "_______", "_______", "_______", "_______" + ] + ] +} diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c index c2753da2a4..c99809b397 100644 --- a/keyboards/keebio/iris/keymaps/via/keymap.c +++ b/keyboards/keebio/iris/keymaps/via/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MAIN] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ @@ -28,13 +28,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT( //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PGUP, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, + KC_GRV, _______, KC_UP, _______, QK_BOOT, _______, _______, KC_P7, KC_P8, KC_P9, KC_P0, KC_PGDN, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_DEL, _______, KC_LEFT, KC_RGHT, KC_UP, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE, + KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, _______, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - BL_STEP, _______, _______, _______, KC_DOWN, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_MINS, _______, + RGB_MOD, EE_CLR, _______, _______, _______, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_MINS, _______, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ _______, _______, KC_DEL, KC_DEL, _______, KC_P0 // └────────┴────────┴────────┘ └────────┴────────┴────────┘ @@ -44,11 +44,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - RGB_TOG, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, + RGB_TOG, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, QK_BOOT, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ RGB_MOD, KC_MPRV, KC_MNXT, KC_VOLU, KC_PGUP, KC_UNDS, KC_EQL, KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_BSLS, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN, _______, KC_PLUS, KC_END, RGB_HUD, RGB_SAD, RGB_VAD, _______, + KC_MUTE, KC_MSTP, KC_MPLY, KC_VOLD, KC_PGDN, KC_MINS, KC_LPRN, _______, KC_PLUS, KC_END, RGB_HUD, RGB_SAD, RGB_VAD, EE_CLR, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ _______, _______, _______, _______, _______, _______ // └────────┴────────┴────────┘ └────────┴────────┴────────┘ diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/keyboard.json index f5efce863a..c6b69c3677 100644 --- a/keyboards/keebio/iris/rev1/info.json +++ b/keyboards/keebio/iris/rev1/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x1256", "device_version": "1.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "E6", "B4", "B5", "D4"] @@ -15,6 +25,7 @@ "levels": 5 }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/iris/rev1/rules.mk b/keyboards/keebio/iris/rev1/rules.mk deleted file mode 100644 index 12e5a0674b..0000000000 --- a/keyboards/keebio/iris/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/keyboard.json index fb5db92913..70500da27e 100644 --- a/keyboards/keebio/iris/rev1_led/info.json +++ b/keyboards/keebio/iris/rev1_led/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x1256", "device_version": "1.1.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "F4"], "rows": ["D7", "E6", "B4", "B5", "D4"] @@ -14,6 +24,7 @@ "levels": 5 }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/iris/rev1_led/rules.mk b/keyboards/keebio/iris/rev1_led/rules.mk deleted file mode 100644 index 12e5a0674b..0000000000 --- a/keyboards/keebio/iris/rev1_led/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/keyboard.json index aa41d0ebff..fafa9ba924 100644 --- a/keyboards/keebio/iris/rev2/info.json +++ b/keyboards/keebio/iris/rev2/keyboard.json @@ -14,6 +14,7 @@ "levels": 5 }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { @@ -37,6 +38,17 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "backlight": true, + "rgblight": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev2/rules.mk b/keyboards/keebio/iris/rev2/rules.mk deleted file mode 100644 index 286733cc50..0000000000 --- a/keyboards/keebio/iris/rev2/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - -LTO_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/keyboard.json index 39bf9dcfb5..8ce5ed8979 100644 --- a/keyboards/keebio/iris/rev3/info.json +++ b/keyboards/keebio/iris/rev3/keyboard.json @@ -44,10 +44,22 @@ "speaker": "C6" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev3/rules.mk b/keyboards/keebio/iris/rev3/rules.mk deleted file mode 100644 index 44c1c1fac3..0000000000 --- a/keyboards/keebio/iris/rev3/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/keyboard.json index cc01dab3ec..88856e0030 100644 --- a/keyboards/keebio/iris/rev4/info.json +++ b/keyboards/keebio/iris/rev4/keyboard.json @@ -44,6 +44,7 @@ "speaker": "C6" }, "split": { + "enabled": true, "soft_serial_pin": "D0", "encoder": { "right": { @@ -61,6 +62,17 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev4/rules.mk b/keyboards/keebio/iris/rev4/rules.mk deleted file mode 100644 index 02da189f9e..0000000000 --- a/keyboards/keebio/iris/rev4/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes -ENCODER_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/keyboard.json index 4bb4554f7c..a1f97a7831 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/keyboards/keebio/iris/rev5/keyboard.json @@ -4,6 +4,17 @@ "pid": "0x5356", "device_version": "5.1.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "D3", "D2", "B7", "D4"], "rows": ["B1", "F0", "F5", "F6", "F7"] @@ -50,6 +61,7 @@ "speaker": "C6" }, "split": { + "enabled": true, "soft_serial_pin": "D0", "encoder": { "right": { diff --git a/keyboards/keebio/iris/rev5/rules.mk b/keyboards/keebio/iris/rev5/rules.mk deleted file mode 100644 index 8859d8f69c..0000000000 --- a/keyboards/keebio/iris/rev5/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/keyboard.json index 8563ba64ab..7bbaabe277 100644 --- a/keyboards/keebio/iris/rev6/info.json +++ b/keyboards/keebio/iris/rev6/keyboard.json @@ -84,6 +84,7 @@ } }, "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { @@ -94,6 +95,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "rgb_matrix": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev6/rules.mk b/keyboards/keebio/iris/rev6/rules.mk deleted file mode 100644 index 5cdaba9bce..0000000000 --- a/keyboards/keebio/iris/rev6/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/keyboard.json index a7b81f9224..decb81a18e 100644 --- a/keyboards/keebio/iris/rev7/info.json +++ b/keyboards/keebio/iris/rev7/keyboard.json @@ -83,6 +83,7 @@ } }, "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { @@ -93,6 +94,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "rgb_matrix": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/iris/rev7/rules.mk b/keyboards/keebio/iris/rev7/rules.mk deleted file mode 100644 index 5cdaba9bce..0000000000 --- a/keyboards/keebio/iris/rev7/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/keebio/iris/rev8/info.json b/keyboards/keebio/iris/rev8/keyboard.json index 85676067c0..85676067c0 100644 --- a/keyboards/keebio/iris/rev8/info.json +++ b/keyboards/keebio/iris/rev8/keyboard.json diff --git a/keyboards/keebio/iris_ce/rev1/info.json b/keyboards/keebio/iris_ce/rev1/keyboard.json index c9fc160001..c9fc160001 100644 --- a/keyboards/keebio/iris_ce/rev1/info.json +++ b/keyboards/keebio/iris_ce/rev1/keyboard.json diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/keyboard.json index da7fbfb40f..7733f06efc 100644 --- a/keyboards/keebio/kbo5000/rev1/info.json +++ b/keyboards/keebio/kbo5000/rev1/keyboard.json @@ -42,6 +42,7 @@ "pin": "E6" }, "split": { + "enabled": true, "soft_serial_pin": "D0", "encoder": { "right": { @@ -60,6 +61,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/keebio/kbo5000/rev1/rev1.c b/keyboards/keebio/kbo5000/rev1/rev1.c index 45443becbe..8aa227deba 100644 --- a/keyboards/keebio/kbo5000/rev1/rev1.c +++ b/keyboards/keebio/kbo5000/rev1/rev1.c @@ -2,14 +2,14 @@ #include "split_util.h" void matrix_init_kb(void) { - setPinOutput(CAPS_LOCK_LED_PIN); + gpio_set_pin_output(CAPS_LOCK_LED_PIN); matrix_init_user(); } bool led_update_kb(led_t led_state) { // Only update if left half if (isLeftHand && led_update_user(led_state)) { - writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); + gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); } return true; } diff --git a/keyboards/keebio/kbo5000/rev1/rules.mk b/keyboards/keebio/kbo5000/rev1/rules.mk deleted file mode 100644 index 32e7881599..0000000000 --- a/keyboards/keebio/kbo5000/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/kbo5000/rules.mk b/keyboards/keebio/kbo5000/rules.mk index 68661bd7dc..06d2f2f412 100644 --- a/keyboards/keebio/kbo5000/rules.mk +++ b/keyboards/keebio/kbo5000/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -LTO_ENABLE = yes -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/kbo5000/rev1 diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/keyboard.json index 6a81a6e899..22cced0ee3 100644 --- a/keyboards/keebio/laplace/info.json +++ b/keyboards/keebio/laplace/keyboard.json @@ -26,6 +26,15 @@ "ws2812": { "pin": "D4" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "F4", "D2", "F5", "D7", "B4", "C6", "E6"] diff --git a/keyboards/keebio/laplace/keymaps/default/keymap.c b/keyboards/keebio/laplace/keymaps/default/keymap.c index d728f65938..e3866b01b6 100644 --- a/keyboards/keebio/laplace/keymaps/default/keymap.c +++ b/keyboards/keebio/laplace/keymaps/default/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN1] = LAYOUT( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, - QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, + QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_UP, _______, RGB_TOG, _______, _______, _______, _______, KC_DEL, KC_0, KC_LEFT, KC_DOWN, KC_RGHT ), diff --git a/keyboards/keebio/laplace/rules.mk b/keyboards/keebio/laplace/rules.mk deleted file mode 100644 index fb930c2a92..0000000000 --- a/keyboards/keebio/laplace/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json index d7cbab9f45..29ae8be8cb 100644 --- a/keyboards/keebio/levinson/info.json +++ b/keyboards/keebio/levinson/info.json @@ -6,6 +6,9 @@ "usb": { "vid": "0xCB10" }, + "split": { + "enabled": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"] diff --git a/keyboards/keebio/levinson/keymaps/default/keymap.c b/keyboards/keebio/levinson/keymaps/default/keymap.c index 72da4addc3..20be1edd39 100644 --- a/keyboards/keebio/levinson/keymaps/default/keymap.c +++ b/keyboards/keebio/levinson/keymaps/default/keymap.c @@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ @@ -142,11 +142,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -154,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -163,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -172,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/keyboard.json index 0a98e032d4..1ed976b4a9 100644 --- a/keyboards/keebio/levinson/rev1/info.json +++ b/keyboards/keebio/levinson/rev1/keyboard.json @@ -23,6 +23,12 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/keebio/levinson/rev1/rules.mk b/keyboards/keebio/levinson/rev1/rules.mk deleted file mode 100644 index bd518d8f27..0000000000 --- a/keyboards/keebio/levinson/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/keyboard.json index 962f555e12..73969388d1 100644 --- a/keyboards/keebio/levinson/rev2/info.json +++ b/keyboards/keebio/levinson/rev2/keyboard.json @@ -23,6 +23,12 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/keebio/levinson/rev2/rules.mk b/keyboards/keebio/levinson/rev2/rules.mk deleted file mode 100644 index bd518d8f27..0000000000 --- a/keyboards/keebio/levinson/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/keyboard.json index cac1c3ac35..5f38fe9874 100644 --- a/keyboards/keebio/levinson/rev3/info.json +++ b/keyboards/keebio/levinson/rev3/keyboard.json @@ -29,6 +29,12 @@ "ws2812": { "pin": "D7" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/keebio/levinson/rev3/rules.mk b/keyboards/keebio/levinson/rev3/rules.mk index 176c9b97df..09057bea54 100644 --- a/keyboards/keebio/levinson/rev3/rules.mk +++ b/keyboards/keebio/levinson/rev3/rules.mk @@ -1,5 +1,3 @@ -BACKLIGHT_ENABLE = yes - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/keebio/levinson/rules.mk b/keyboards/keebio/levinson/rules.mk index 249f887881..44cdce9d12 100644 --- a/keyboards/keebio/levinson/rules.mk +++ b/keyboards/keebio/levinson/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/levinson/rev2 diff --git a/keyboards/keebio/nyquist/keymaps/default/keymap.c b/keyboards/keebio/nyquist/keymaps/default/keymap.c index 8bf16240fb..df399d355f 100644 --- a/keyboards/keebio/nyquist/keymaps/default/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/default/keymap.c @@ -162,11 +162,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -174,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -183,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -192,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/nyquist/keymaps/tester/keymap.c b/keyboards/keebio/nyquist/keymaps/tester/keymap.c index 6109661ffd..7ed85044ca 100644 --- a/keyboards/keebio/nyquist/keymaps/tester/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/tester/keymap.c @@ -11,7 +11,7 @@ extern keymap_config_t keymap_config; #define _DVORAK 2 #define _LOWER 3 #define _RAISE 4 -#define _ADJUST 16 +#define _ADJUST 5 enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -159,11 +159,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -171,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -180,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -189,7 +184,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/keyboard.json index cd729aa87b..717b49e971 100644 --- a/keyboards/keebio/nyquist/rev1/info.json +++ b/keyboards/keebio/nyquist/rev1/keyboard.json @@ -4,12 +4,21 @@ "pid": "0x1156", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/nyquist/rev1/rules.mk b/keyboards/keebio/nyquist/rev1/rules.mk deleted file mode 100644 index 714a247e2b..0000000000 --- a/keyboards/keebio/nyquist/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/keyboard.json index f6b80cb946..435cdd189f 100644 --- a/keyboards/keebio/nyquist/rev2/info.json +++ b/keyboards/keebio/nyquist/rev2/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x2156", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "D7", "E6", "B4", "B5"] @@ -21,6 +31,7 @@ "pin": "D3" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", diff --git a/keyboards/keebio/nyquist/rev2/rules.mk b/keyboards/keebio/nyquist/rev2/rules.mk deleted file mode 100644 index 83432f0b5e..0000000000 --- a/keyboards/keebio/nyquist/rev2/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/keyboard.json index 9b3cc6d15a..80e5a10a17 100644 --- a/keyboards/keebio/nyquist/rev3/info.json +++ b/keyboards/keebio/nyquist/rev3/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x3156", "device_version": "3.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "B7", "D2", "D3", "D4"], "rows": ["F0", "F5", "D7", "F6", "F7"] @@ -14,6 +24,7 @@ "levels": 7 }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "rgblight": { diff --git a/keyboards/keebio/nyquist/rev3/rules.mk b/keyboards/keebio/nyquist/rev3/rules.mk deleted file mode 100644 index 83432f0b5e..0000000000 --- a/keyboards/keebio/nyquist/rev3/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes diff --git a/keyboards/keebio/nyquist/rev4/info.json b/keyboards/keebio/nyquist/rev4/keyboard.json index 804d1aa5d4..804d1aa5d4 100644 --- a/keyboards/keebio/nyquist/rev4/info.json +++ b/keyboards/keebio/nyquist/rev4/keyboard.json diff --git a/keyboards/keebio/nyquistpad/info.json b/keyboards/keebio/nyquistpad/keyboard.json index 1999e9eaa8..1999e9eaa8 100644 --- a/keyboards/keebio/nyquistpad/info.json +++ b/keyboards/keebio/nyquistpad/keyboard.json diff --git a/keyboards/keebio/nyquistpad/rules.mk b/keyboards/keebio/nyquistpad/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keebio/nyquistpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/quefrency/info.json b/keyboards/keebio/quefrency/info.json new file mode 100644 index 0000000000..2b9790e84e --- /dev/null +++ b/keyboards/keebio/quefrency/info.json @@ -0,0 +1,5 @@ +{ + "split": { + "enabled": true + } +} diff --git a/keyboards/keebio/quefrency/rev1/info.json b/keyboards/keebio/quefrency/rev1/keyboard.json index 0bce37ad78..6bca115e66 100644 --- a/keyboards/keebio/quefrency/rev1/info.json +++ b/keyboards/keebio/quefrency/rev1/keyboard.json @@ -43,6 +43,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/quefrency/rev1/rules.mk b/keyboards/keebio/quefrency/rev1/rules.mk deleted file mode 100644 index b771d431ad..0000000000 --- a/keyboards/keebio/quefrency/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -MOUSEKEY_ENABLE = yes # Mouse keys diff --git a/keyboards/keebio/quefrency/rev2/info.json b/keyboards/keebio/quefrency/rev2/keyboard.json index 26df29e3f0..0529fa13a6 100644 --- a/keyboards/keebio/quefrency/rev2/info.json +++ b/keyboards/keebio/quefrency/rev2/keyboard.json @@ -59,6 +59,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev2/rev2.c b/keyboards/keebio/quefrency/rev2/rev2.c index a3bc2ca1ef..f0320597f7 100644 --- a/keyboards/keebio/quefrency/rev2/rev2.c +++ b/keyboards/keebio/quefrency/rev2/rev2.c @@ -2,14 +2,14 @@ #include "split_util.h" void matrix_init_kb(void) { - setPinOutput(CAPS_LOCK_LED_PIN); + gpio_set_pin_output(CAPS_LOCK_LED_PIN); matrix_init_user(); } bool led_update_kb(led_t led_state) { // Only update if left half if (isLeftHand && led_update_user(led_state)) { - writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); + gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); } return true; } diff --git a/keyboards/keebio/quefrency/rev2/rules.mk b/keyboards/keebio/quefrency/rev2/rules.mk deleted file mode 100644 index 32e7881599..0000000000 --- a/keyboards/keebio/quefrency/rev2/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rev3/info.json b/keyboards/keebio/quefrency/rev3/keyboard.json index dac80973ae..bd8d86f884 100644 --- a/keyboards/keebio/quefrency/rev3/info.json +++ b/keyboards/keebio/quefrency/rev3/keyboard.json @@ -59,6 +59,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev3/rev3.c b/keyboards/keebio/quefrency/rev3/rev3.c index d3ada3076f..74d68723f5 100644 --- a/keyboards/keebio/quefrency/rev3/rev3.c +++ b/keyboards/keebio/quefrency/rev3/rev3.c @@ -18,14 +18,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "split_util.h" void matrix_init_kb(void) { - setPinOutput(CAPS_LOCK_LED_PIN); + gpio_set_pin_output(CAPS_LOCK_LED_PIN); matrix_init_user(); } bool led_update_kb(led_t led_state) { // Only update if left half if (led_update_user(led_state) && isLeftHand) { - writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); + gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock); } return true; } diff --git a/keyboards/keebio/quefrency/rev3/rules.mk b/keyboards/keebio/quefrency/rev3/rules.mk deleted file mode 100644 index 32e7881599..0000000000 --- a/keyboards/keebio/quefrency/rev3/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/keyboard.json index 4eb4275f7a..936502fdcf 100644 --- a/keyboards/keebio/quefrency/rev4/info.json +++ b/keyboards/keebio/quefrency/rev4/keyboard.json @@ -56,6 +56,16 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev4/rules.mk b/keyboards/keebio/quefrency/rev4/rules.mk deleted file mode 100644 index ab97bd78f3..0000000000 --- a/keyboards/keebio/quefrency/rev4/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/keyboard.json index 94d77ec8dd..e0fd984772 100644 --- a/keyboards/keebio/quefrency/rev5/info.json +++ b/keyboards/keebio/quefrency/rev5/keyboard.json @@ -56,6 +56,16 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "rgblight": true, + "encoder": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_60" }, diff --git a/keyboards/keebio/quefrency/rev5/rules.mk b/keyboards/keebio/quefrency/rev5/rules.mk deleted file mode 100644 index ab97bd78f3..0000000000 --- a/keyboards/keebio/quefrency/rev5/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/quefrency/rules.mk b/keyboards/keebio/quefrency/rules.mk index cd165afef2..fb40fc8a56 100644 --- a/keyboards/keebio/quefrency/rules.mk +++ b/keyboards/keebio/quefrency/rules.mk @@ -1,14 +1 @@ -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/quefrency/rev1 -LTO_ENABLE = yes diff --git a/keyboards/keebio/rorschach/keymaps/default/keymap.c b/keyboards/keebio/rorschach/keymaps/default/keymap.c index c1efce8f2b..6c07719d8a 100644 --- a/keyboards/keebio/rorschach/keymaps/default/keymap.c +++ b/keyboards/keebio/rorschach/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT( BL_STEP, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_PLUS, KC_PIPE, - QK_BOOT, _______, RGB_HUD, RGB_SAD, RGB_VAD, KC_LCBR, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, + QK_BOOT, _______, RGB_HUD, RGB_SAD, RGB_VAD, KC_LCBR, KC_RCBR, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, KC_GRV, _______, _______, _______, _______, KC_DEL, _______, _______, KC_P0, KC_PDOT, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/keyboard.json index 55fcae8387..f7ea8fccc2 100644 --- a/keyboards/keebio/rorschach/rev1/info.json +++ b/keyboards/keebio/rorschach/rev1/keyboard.json @@ -38,10 +38,19 @@ "pin": "D3" }, "split": { + "enabled": true, "soft_serial_pin": "D0" }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keebio/rorschach/rev1/rules.mk b/keyboards/keebio/rorschach/rev1/rules.mk deleted file mode 100644 index bd518d8f27..0000000000 --- a/keyboards/keebio/rorschach/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes diff --git a/keyboards/keebio/rorschach/rules.mk b/keyboards/keebio/rorschach/rules.mk index baf3beba14..6cdac68a4e 100644 --- a/keyboards/keebio/rorschach/rules.mk +++ b/keyboards/keebio/rorschach/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/rorschach/rev1 diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json index a55f42649e..aa1e08f39d 100644 --- a/keyboards/keebio/sinc/info.json +++ b/keyboards/keebio/sinc/info.json @@ -6,14 +6,12 @@ "vid": "0xCB10" }, "features": { - "audio": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": false, - "nkro": false, - "unicode": false + "nkro": false }, "split": { "enabled": true diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/keyboard.json index b7774fa0ed..b7774fa0ed 100644 --- a/keyboards/keebio/sinc/rev1/info.json +++ b/keyboards/keebio/sinc/rev1/keyboard.json diff --git a/keyboards/keebio/sinc/rev1/rules.mk b/keyboards/keebio/sinc/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keebio/sinc/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/keyboard.json index ff5ef2667a..ff5ef2667a 100644 --- a/keyboards/keebio/sinc/rev2/info.json +++ b/keyboards/keebio/sinc/rev2/keyboard.json diff --git a/keyboards/keebio/sinc/rev2/rules.mk b/keyboards/keebio/sinc/rev2/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keebio/sinc/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/keyboard.json index e20cd24f19..da828dbb35 100644 --- a/keyboards/keebio/sinc/rev3/info.json +++ b/keyboards/keebio/sinc/rev3/keyboard.json @@ -9,8 +9,6 @@ "diode_direction": "COL2ROW", "features": { "console": true, - "rgblight": false, - "backlight": false, "rgb_matrix": true }, "split": { diff --git a/keyboards/keebio/sinc/rev4/info.json b/keyboards/keebio/sinc/rev4/keyboard.json index 15b28fb012..15b28fb012 100644 --- a/keyboards/keebio/sinc/rev4/info.json +++ b/keyboards/keebio/sinc/rev4/keyboard.json diff --git a/keyboards/keebio/sinc/sinc.c b/keyboards/keebio/sinc/sinc.c index d50eb82019..c1ebd1a206 100644 --- a/keyboards/keebio/sinc/sinc.c +++ b/keyboards/keebio/sinc/sinc.c @@ -22,7 +22,7 @@ bool led_update_kb(led_t led_state) { if (!led_update_user(led_state)) { return false; } // Only update if left half if (isLeftHand && led_update_user(led_state)) { - writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); + gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock); } return true; } diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/keyboard.json index b24d4d6430..2e2b3539ab 100644 --- a/keyboards/keebio/stick/info.json +++ b/keyboards/keebio/stick/keyboard.json @@ -85,6 +85,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "direct": [ ["F4", "B6", "B5", "B4", "E6", "D7", "F6", "F7", "B1", "B3", "B2", "F5"] diff --git a/keyboards/keebio/stick/rules.mk b/keyboards/keebio/stick/rules.mk deleted file mode 100644 index 0f932779f5..0000000000 --- a/keyboards/keebio/stick/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/keebio/tragicforce68/info.json b/keyboards/keebio/tragicforce68/keyboard.json index 07d292728b..49ada60863 100644 --- a/keyboards/keebio/tragicforce68/info.json +++ b/keyboards/keebio/tragicforce68/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0510", "device_version": "1.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "B4", "E6", "C6", "D7", "D4"] diff --git a/keyboards/keebio/tragicforce68/rules.mk b/keyboards/keebio/tragicforce68/rules.mk deleted file mode 100644 index 86bb2554d8..0000000000 --- a/keyboards/keebio/tragicforce68/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/keyboard.json index 9df46b0c1e..5d8bd37a28 100644 --- a/keyboards/keebio/tukey/info.json +++ b/keyboards/keebio/tukey/keyboard.json @@ -30,6 +30,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "direct": [ ["D4", "F6"] diff --git a/keyboards/keebio/tukey/rules.mk b/keyboards/keebio/tukey/rules.mk deleted file mode 100644 index 4465ace172..0000000000 --- a/keyboards/keebio/tukey/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json index 1fadcce126..8b1063ea98 100644 --- a/keyboards/keebio/viterbi/info.json +++ b/keyboards/keebio/viterbi/info.json @@ -5,6 +5,9 @@ "usb": { "vid": "0xCB10" }, + "split": { + "enabled": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x14"] diff --git a/keyboards/keebio/viterbi/rev1/info.json b/keyboards/keebio/viterbi/rev1/keyboard.json index a003331f25..ebea539248 100644 --- a/keyboards/keebio/viterbi/rev1/info.json +++ b/keyboards/keebio/viterbi/rev1/keyboard.json @@ -19,6 +19,11 @@ "rows": ["D4", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_5x14" }, diff --git a/keyboards/keebio/viterbi/rev1/rules.mk b/keyboards/keebio/viterbi/rev1/rules.mk deleted file mode 100644 index 7b30c0beff..0000000000 --- a/keyboards/keebio/viterbi/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no diff --git a/keyboards/keebio/viterbi/rev2/info.json b/keyboards/keebio/viterbi/rev2/keyboard.json index 88ab2cd137..36570e7c7a 100644 --- a/keyboards/keebio/viterbi/rev2/info.json +++ b/keyboards/keebio/viterbi/rev2/keyboard.json @@ -23,6 +23,15 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "backlight": true + }, + "build": { + "lto": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_5x14" }, diff --git a/keyboards/keebio/viterbi/rev2/rules.mk b/keyboards/keebio/viterbi/rev2/rules.mk deleted file mode 100644 index 674318183b..0000000000 --- a/keyboards/keebio/viterbi/rev2/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes - -LTO_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk index 2008e63b00..ecf6a3fa87 100644 --- a/keyboards/keebio/viterbi/rules.mk +++ b/keyboards/keebio/viterbi/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keebio/viterbi/rev2 diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/keyboard.json index 3b88fcdd77..7c87bcf476 100644 --- a/keyboards/keebio/wavelet/info.json +++ b/keyboards/keebio/wavelet/keyboard.json @@ -25,6 +25,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["ortho_4x12"], "layout_aliases": { "LAYOUT_ortho_4x12": "LAYOUT" diff --git a/keyboards/keebio/wavelet/keymaps/default/keymap.c b/keyboards/keebio/wavelet/keymaps/default/keymap.c index 72da4addc3..20be1edd39 100644 --- a/keyboards/keebio/wavelet/keymaps/default/keymap.c +++ b/keyboards/keebio/wavelet/keymaps/default/keymap.c @@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ @@ -142,11 +142,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -154,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -163,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -172,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/wavelet/rules.mk b/keyboards/keebio/wavelet/rules.mk index 74f0e0d566..271780b75e 100644 --- a/keyboards/keebio/wavelet/rules.mk +++ b/keyboards/keebio/wavelet/rules.mk @@ -1,15 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - # Disable unsupported hardware AUDIO_SUPPORTED = no diff --git a/keyboards/keebio/wtf60/info.json b/keyboards/keebio/wtf60/keyboard.json index 1542c478b2..5ce22cc42e 100644 --- a/keyboards/keebio/wtf60/info.json +++ b/keyboards/keebio/wtf60/keyboard.json @@ -29,6 +29,17 @@ "ws2812": { "pin": "E6" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B4", "B5", "B6", "C7", "F7", "B1", "B2", "B3", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["F0", "F1", "F4", "F5", "F6"] diff --git a/keyboards/keebio/wtf60/rules.mk b/keyboards/keebio/wtf60/rules.mk deleted file mode 100644 index d34a5e4685..0000000000 --- a/keyboards/keebio/wtf60/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes |