diff options
Diffstat (limited to 'keyboards/bastardkb')
103 files changed, 146 insertions, 355 deletions
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json index c2ff6d458a..cbe8ac12e7 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "Charybdis Nano (3x5) Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk index a21fd9e7ff..5196e2f5e9 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # @@ -25,7 +18,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_3 POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h index 0849d5968a..e25064a197 100644 --- a/keyboards/bastardkb/charybdis/3x5/config.h +++ b/keyboards/bastardkb/charybdis/3x5/config.h @@ -24,9 +24,6 @@ #define DIODE_DIRECTION ROW2COL -/* Set 0 if debouncing isn't needed. */ -#define DEBOUNCE 5 - /* Trackball angle adjustment. */ #define ROTATIONAL_TRANSFORM_ANGLE -25 diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json index 0c47d1a3ad..a09ef236ba 100644 --- a/keyboards/bastardkb/charybdis/3x5/info.json +++ b/keyboards/bastardkb/charybdis/3x5/info.json @@ -5,6 +5,7 @@ "pid": "0x1832", "vid": "0xA8F8" }, + "community_layouts": ["split_3x5_3"], "layout_aliases": { "LAYOUT_charybdis_3x5": "LAYOUT" }, diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h index 3ab7e56ebd..0a2db20561 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h @@ -43,7 +43,7 @@ * * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 /* * Tap-or-Hold decision modes. diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json index b83dc6c3f8..9e25f2efe7 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "Charybdis Nano (3x5) Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk index 22bd22652a..1176b482ae 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -26,7 +20,6 @@ RGB_MATRIX_DRIVER = WS2812 # Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on # the trackball side). SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_3 # Support community layout, in particular Manna-Harbour's Miryoku layout POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json index 78453c44ff..536d622c0d 100644 --- a/ |