glguy/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Updated blacktyls to latest qmk

Browse Source
This commit is contained in:
Thomas Haukland 2024-04-17 10:27:43 +02:00
parent b73321c6b3
commit c7a71b0b94
No known key found for this signature in database
GPG Key ID: 152EC8110B0DF631
18 changed files with 207 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
keyboards/bastardkb/blacktyl/blacktyl.c
View File

@ -26,3 +26,51 @@ void housekeeping_task_user(void) {
dprintf("Fresh from eeprom %d\n", (uint8_t)eeconfig_read_debug());
}
}
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
/* Key Matrix to LED index. */
// Left split.
{ 2, 3, 8, 9, 12 }, // Top row
{ 1, 4, 7, 10, 13 }, // Middle row
{ 0, 5, 6, 11, 14 }, // Bottom row
{ 17, NO_LED, 15, 16, NO_LED }, // Thumb cluster
// Right split.
{ 20, 21, 26, 27, 30 }, // Top row
{ 19, 22, 25, 28, 31 }, // Middle row
{ 18, 23, 24, 29, 32 }, // Bottom row
{ 35, NO_LED, 33, 34, NO_LED }, // Thumb cluster
}, {
/* LED index to physical position. */
// Left split.
/* index=0 */ { 0, 42 }, { 0, 21 }, { 0, 0 }, // col 1 (left most)
/* index=3 */ { 18, 0 }, { 18, 21 }, { 18, 42 }, // col 2
/* index=6 */ { 36, 42 }, { 36, 21 }, { 36, 0 },
/* index=9 */ { 54, 0 }, { 54, 21 }, { 54, 42 },
/* index=12 */ { 72, 0 }, { 72, 21 }, { 72, 42 },
/* index=15 */ { 72, 64 }, { 90, 64 }, { 108, 64 }, // Thumb cluster
// Right split.
/* index=18 */ { 224, 42 }, { 224, 21 }, { 224, 0 }, // col 10 (right most)
/* index=21 */ { 206, 0 }, { 206, 21 }, { 206, 42 }, // col 9
/* index=24 */ { 188, 42 }, { 188, 21 }, { 188, 0 },
/* index=27 */ { 170, 0 }, { 170, 21 }, { 170, 42 },
/* index=30 */ { 152, 0 }, { 152, 21 }, { 152, 42 },
/* index=33 */ { 152, 64 }, { 134, 64 }, { 116, 64 }, // Thumb cluster
}, {
/* LED index to flag. */
// Left split.
/* index=0 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 1
/* index=3 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 2
/* index=6 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
/* index=9 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
/* index=12 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
/* index=15 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster
// Right split.
/* index=18 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 10
/* index=21 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 9
/* index=24 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
/* index=27 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
/* index=30 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
/* index=33 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster
} };
#endif

42
keyboards/bastardkb/blacktyl/config.h
View File

@ -1,10 +1,8 @@
#pragma once
#include "config_common.h"
/* USB DEVICE DESCRIPTOR */
#define PRODUCT The Bastard Keyboards Blackpill
#define MANUFACTURER Bastard Keyboards x KarlK90
// #define PRODUCT The Bastard Keyboards Blackpill
// #define MANUFACTURER Bastard Keyboards x KarlK90
#define VENDOR_ID 0xA8F8
#define PRODUCT_ID 0x1828
#define DEVICE_VER 0x0001
@ -27,8 +25,8 @@
//
/* RGB CONFIG - WS2812 DRIVER
#define RGB_DI_PIN A1
/* RGB CONFIG - WS2812 DRIVER */
#define WS2812_DI_PIN A1
#define WS2812_EXTERNAL_PULLUP
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 2
@ -37,7 +35,7 @@
#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
// Without the following configurations the WS2812 would not light up
#define WS2812_PWM_TARGET_PERIOD 800000
*/
#define RGB_MATRIX_LED_COUNT 36
/* CRC DRIVER
#define CRC8_USE_TABLE
@ -78,3 +76,33 @@
/* Top right key on right half */
#define BOOTMAGIC_LITE_ROW_RIGHT 4
#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
#define ENABLE_RGB_MATRIX_ALPHAS_MODS Enables RGB_MATRIX_ALPHAS_MODS
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_BREATHING
#define ENABLE_RGB_MATRIX_BAND_SAT
#define ENABLE_RGB_MATRIX_BAND_VAL
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
#define ENABLE_RGB_MATRIX_DUAL_BEACON
#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
#define ENABLE_RGB_MATRIX_RAINDROPS
#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
#define ENABLE_RGB_MATRIX_HUE_BREATHING
#define ENABLE_RGB_MATRIX_HUE_PENDULUM
#define ENABLE_RGB_MATRIX_HUE_WAVE
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
#define ENABLE_RGB_MATRIX_PIXEL_FLOW
#define ENABLE_RGB_MATRIX_PIXEL_RAIN

8
keyboards/bastardkb/blacktyl/halconf.h
View File

@ -3,9 +3,9 @@
#define HAL_USE_PWM TRUE
#define HAL_USE_SERIAL TRUE
//#define HAL_USE_I2C TRUE
#define HAL_USE_SPI TRUE
#define SPI_USE_WAIT TRUE
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#define HAL_USE_GPT TRUE
//#define HAL_USE_SPI TRUE
//#define SPI_USE_WAIT TRUE
//#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
//#define HAL_USE_GPT TRUE
#include_next <halconf.h>

17
keyboards/bastardkb/blacktyl/info.json
View File

@ -2,6 +2,23 @@
"keyboard_name": "Blacktyl",
"url": "https://www.bastardkb.com",
"maintainer": "Quentin Lebastard",
"rgb_matrix": {
"driver": "ws2812",
"max_brightness": 50,
"sleep": true,
"split_count": [18, 18]
},
"ws2812": {
"driver": "pwm",
"pin": "A1"
},
"split": {
"transport": {
"sync": {
"matrix_state": true
}
}
},
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [

4
keyboards/bastardkb/blacktyl/keymaps/tompi/config.h
View File

@ -33,9 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MOUSEKEY_WHEEL_TIME_TO_MAX 100
// Pick good defaults for enabling homerow modifiers
#define TAPPING_TERM 280
#define TAPPING_TERM 220
// #define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
//#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD
//#define RETRO_TAPPING

108
keyboards/bastardkb/blacktyl/keymaps/tompi/keymap.json
View File

@ -23,7 +23,7 @@
"LSFT_T(KC_T)",
"KC_G",
"KC_M",
"LSFT_T(KC_N)",
"RSFT_T(KC_N)",
"LCTL_T(KC_E)",
"LALT_T(KC_I)",
"LGUI_T(KC_O)",
@ -54,17 +54,17 @@
"KC_NO",
"KC_NO",
"KC_NO",
"QK_RBT",
"ANY(QK_RBT)",
"KC_MS_L",
"KC_BTN2",
"KC_BTN1",
"KC_MS_R",
"KC_MUTE",
"KC_NO",
"KC_BTN1",
"KC_BTN2",
"KC_BTN3",
"KC_NO",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_VOLD",
"KC_MNXT",
"KC_MS_D",
@ -83,40 +83,40 @@
"KC_NO"
],
[
"KC_NO",
"KC_PSCR",
"KC_HOME",
"KC_DEL",
"KC_PGUP",
"KC_PAUS",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_INS",
"KC_LEFT",
"KC_UP",
"KC_RGHT",
"KC_NO",
"KC_NUM",
"KC_NO",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_NO",
"KC_SCRL",
"KC_END",
"KC_DOWN",
"KC_PGDN",
"KC_BSPC",
"KC_NO",
"KC_BTN1",
"KC_BTN2",
"KC_BTN3",
"KC_BTN4",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_TRNS",
"KC_TRNS",
"KC_NO",
"TO(0)",
"KC_NO",
"KC_NO"
],
@ -125,27 +125,27 @@
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_WH_U",
"KC_AT",
"KC_UNDS",
"KC_PIPE",
"KC_QUOT",
"KC_ESC",
"KC_GRV",
"KC_PERC",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_NO",
"RGB_TOG",
"KC_HASH",
"KC_TAB",
"KC_EXLM",
"KC_DQUO",
"KC_DLR",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_BTN4",
"KC_BTN3",
"KC_BTN2",
"KC_BTN1",
"KC_WH_D",
"KC_TILD",
"KC_QUOT",
"KC_BSLS",
@ -159,11 +159,11 @@
"KC_NO"
],
[
"KC_PERC",
"KC_COLN",
"KC_GRV",
"KC_CIRC",
"KC_LT",
"KC_GT",
"KC_SCLN",
"KC_QUOT",
"KC_NO",
"KC_NO",
"KC_NO",
@ -173,12 +173,12 @@
"KC_RCBR",
"KC_LPRN",
"KC_RPRN",
"KC_AT",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_PSCR",
"KC_NO",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_MINS",
"KC_EXLM",
"KC_LBRC",
@ -197,7 +197,7 @@
"KC_NO"
],
[
"QK_RBT",
"ANY(QK_RBT)",
"KC_NO",
"KC_NO",
"KC_NO",
@ -207,10 +207,10 @@
"KC_F8",
"KC_F9",
"KC_F10",
"KC_NO",
"KC_BTN3",
"KC_BTN2",
"KC_BTN1",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_NO",
"KC_NO",
"KC_F4",
@ -235,11 +235,11 @@
"KC_TRNS"
],
[
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"RGB_SPI",
"RGB_VAI",
"RGB_SAI",
"RGB_HUI",
"RGB_MOD",
"KC_PPLS",
"KC_P7",
"KC_P8",
@ -249,18 +249,18 @@
"KC_TRNS",
"KC_TRNS",
"KC_TRNS",
"KC_NO",
"RGB_TOG",
"KC_PMNS",
"KC_P4",
"KC_P5",
"KC_P6",
"KC_PSLS",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_P0",
"RGB_SPD",
"RGB_VAD",
"RGB_SAD",
"RGB_HUD",
"RGB_RMOD",
"KC_PDOT",
"KC_P1",
"KC_P2",
"KC_P3",
@ -268,8 +268,8 @@
"KC_NO",
"KC_NO",
"KC_NO",
"KC_TRNS",
"KC_TRNS",
"KC_DOT",
"KC_COMM",
"KC_P0"
]
],

8
keyboards/bastardkb/blacktyl/mcuconf.h
View File

@ -2,8 +2,8 @@
#include_next "mcuconf.h"
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 FALSE
//#undef STM32_I2C_USE_I2C1
//#define STM32_I2C_USE_I2C1 FALSE
#undef STM32_ST_USE_TIMER
#define STM32_ST_USE_TIMER 5
@ -11,8 +11,8 @@
#undef STM32_PWM_USE_TIM2
#define STM32_PWM_USE_TIM2 TRUE
#undef STM32_SPI_USE_SPI1
#define STM32_SPI_USE_SPI1 TRUE
//#undef STM32_SPI_USE_SPI1
//#define STM32_SPI_USE_SPI1 TRUE
#undef STM32_SERIAL_USE_USART1
#define STM32_SERIAL_USE_USART1 TRUE

18
keyboards/bastardkb/blacktyl/rules.mk
View File

@ -1,5 +1,6 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401
# or
# MCU = STM32F411
# For newer blackpills
@ -9,11 +10,12 @@ LAYOUTS = split_3x5_3
# Bootloader selection
BOOTLOADER = stm32-dfu
# CONSOLE_ENABLE = yes
CONSOLE_ENABLE = yes
DEBOUNCE_TYPE = asym_eager_defer_pk
# EEPROM_DRIVER = spi
# KEYBOARD_SHARED_EP = yes
# POINTING_DEVICE_DRIVER = pmw3360
CAPS_WORD_ENABLE = yes
# POINTING_DEVICE_ENABLE = yes
# RGBLIGHT_DRIVER = WS2812
# RGBLIGHT_ENABLE = no
@ -21,6 +23,18 @@ DEBOUNCE_TYPE = asym_eager_defer_pk
SERIAL_DRIVER = usart
SPLIT_KEYBOARD = yes
# VIA_ENABLE = no
# WS2812_DRIVER = pwm
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = ws2812
SPLIT_KEYBOARD = yes
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes

8
keyboards/bastardkb/blacktyl_lars/blacktyl_lars.c
View File

@ -2,9 +2,9 @@
#include "blacktyl_lars.h"
void keyboard_post_init_user(void) {
debug_config.enable = true;
debug_config.matrix = true;
debug_config.keyboard = true;
//debug_config.enable = true;
//debug_config.matrix = true;
//debug_config.keyboard = true;
// debug_config.mouse = true;
if (is_keyboard_left()) {
@ -12,7 +12,7 @@ void keyboard_post_init_user(void) {
} else {
dprintln("I'm right!");
}
rgblight_set();
//rgblight_set();
}
/*

11
keyboards/bastardkb/blacktyl_lars/config.h
View File

@ -1,13 +1,6 @@
#pragma once
#include "config_common.h"
/* USB DEVICE DESCRIPTOR */
#define PRODUCT The Bastard Keyboards Blackpill
#define MANUFACTURER Bastard Keyboards x KarlK90
#define VENDOR_ID 0xA8F8
#define PRODUCT_ID 0x1828
#define DEVICE_VER 0x0001
/* MATRIX CONFIG */
#define MATRIX_COLS 5
@ -23,8 +16,8 @@
/* RGB CONFIG - WS2812 DRIVER */
#define RGB_DI_PIN A1
#define RGBLED_NUM 36
#define WS2812_DI_PIN A1
#define RGBLIGHT_LED_COUNT 36
#define RGBLED_SPLIT \
{ 18, 18 }
#define WS2812_EXTERNAL_PULLUP

4
keyboards/bastardkb/blacktyl_lars/info.json
View File

@ -1,5 +1,9 @@
{
"keyboard_name": "Blacktyl",
"usb": {
"pid": "0x1830",
"device_version": "1.0.0"
},
"url": "https://www.bastardkb.com",
"maintainer": "Quentin Lebastard",
"layouts": {

1
keyboards/bastardkb/blacktyl_lars/keymaps/tompi/config.h
View File

@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Pick good defaults for enabling homerow modifiers
#define TAPPING_TERM 200
// #define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD
#define RETRO_TAPPING

5
keyboards/bastardkb/blacktyl_lars/rules.mk
View File

@ -15,13 +15,10 @@ DEBOUNCE_TYPE = asym_eager_defer_pk
# KEYBOARD_SHARED_EP = yes
# POINTING_DEVICE_DRIVER = pmw3360
# POINTING_DEVICE_ENABLE = yes
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGBLIGHT_DRIVER = WS2812
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
RGB_MATRIX_DRIVER = ws2812 # RGB matrix driver support
WS2812_DRIVER = pwm
# SERIAL_DRIVER = bitbang
SERIAL_DRIVER = usart

7
keyboards/bastardkb/skeletyl/blackpill/info.json
View File

@ -3,9 +3,6 @@
"usb": {
"device_version": "1.0.0"
},
"eeprom": {
"driver": "spi"
},
"rgb_matrix": {
"driver": "ws2812"
},
@ -21,7 +18,7 @@
"rows": ["A2", "B8", "A8", "B9"]
},
"diode_direction": "ROW2COL",
"processor": "STM32F411",
"processor": "STM32F401",
"bootloader": "stm32-dfu",
"board": "BLACKPILL_STM32_F411"
"board": "BLACKPILL_STM32_F401"
}

4
keyboards/bastardkb/skeletyl/blackpill/rules.mk
View File

@ -1,6 +1,4 @@
# MCU name
MCU = STM32F401
BOARD = BLACKPILL_STM32_F401
# Bootloader selection
BOOTLOADER = stm32-dfu
@ -29,6 +27,4 @@ SPLIT_KEYBOARD = yes
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
#EEPROM_DRIVER = spi
WS2812_DRIVER = pwm
SERIAL_DRIVER = usart

1
keyboards/bastardkb/skeletyl/keymaps/lars/config.h
View File

@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Pick good defaults for enabling homerow modifiers
#define TAPPING_TERM 200
// #define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD
//#define RETRO_TAPPING

1
keyboards/bastardkb/skeletyl/keymaps/tompi/config.h
View File

@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Pick good defaults for enabling homerow modifiers
#define TAPPING_TERM 230
// #define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD
//#define RETRO_TAPPING
//

14
keyboards/bastardkb/skeletyl/skeletyl.c
View File

@ -17,6 +17,20 @@
#include "quantum.h"
void keyboard_post_init_user(void) {
// Customise these values to desired behaviour
//debug_enable=true;
//debug_matrix=true;
//debug_keyboard=true;
//debug_mouse=true;
if (is_keyboard_left()) {
dprintln("I'm left!");
} else {
dprintln("I'm right!");
}
}
/**
* LEDs index.
*