From f1d0be72696cc21b0e3739182f4c661db7df4d25 Mon Sep 17 00:00:00 2001 From: Thomas Haukland Date: Thu, 20 Jun 2024 10:24:11 +0200 Subject: [PATCH] Update blacktyl_lars --- keyboards/bastardkb/blacktyl_lars/config.h | 3 +- .../blacktyl_lars/keymaps/lars/config.h | 14 +- .../blacktyl_lars/keymaps/lars/keymap.json | 218 +++++++++--------- keyboards/bastardkb/blacktyl_lars/rules.mk | 4 +- 4 files changed, 120 insertions(+), 119 deletions(-) diff --git a/keyboards/bastardkb/blacktyl_lars/config.h b/keyboards/bastardkb/blacktyl_lars/config.h index 396efa80046..f6403af30b7 100644 --- a/keyboards/bastardkb/blacktyl_lars/config.h +++ b/keyboards/bastardkb/blacktyl_lars/config.h @@ -16,6 +16,7 @@ /* RGB CONFIG - WS2812 DRIVER */ +/* #define WS2812_DI_PIN A1 #define RGB_MATRIX_LED_COUNT 36 #define RGBLED_SPLIT \ @@ -28,7 +29,7 @@ #define WS2812_DMA_STREAM STM32_DMA1_STREAM1 // Without the following configurations the WS2812 would not light up #define WS2812_PWM_TARGET_PERIOD 800000 - +*/ /* CRC DRIVER #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/blacktyl_lars/keymaps/lars/config.h b/keyboards/bastardkb/blacktyl_lars/keymaps/lars/config.h index 38e8f2ec169..b8c7f7d0e2d 100644 --- a/keyboards/bastardkb/blacktyl_lars/keymaps/lars/config.h +++ b/keyboards/bastardkb/blacktyl_lars/keymaps/lars/config.h @@ -35,16 +35,16 @@ along with this program. If not, see . // Pick good defaults for enabling homerow modifiers #define TAPPING_TERM 200 // #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT +//#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_FORCE_HOLD //#define RETRO_TAPPING // Underglow configuration -#ifdef RGBLIGHT_ENABLE - #define RGBLIGHT_ANIMATIONS - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 -#endif +//#ifdef RGBLIGHT_ENABLE +// #define RGBLIGHT_ANIMATIONS +// #define RGBLIGHT_HUE_STEP 8 +// #define RGBLIGHT_SAT_STEP 8 +// #define RGBLIGHT_VAL_STEP 8 +//#endif //#define UNICODE_SELECTED_MODES UC_MAC diff --git a/keyboards/bastardkb/blacktyl_lars/keymaps/lars/keymap.json b/keyboards/bastardkb/blacktyl_lars/keymaps/lars/keymap.json index 98fd8002dad..b086182c52e 100644 --- a/keyboards/bastardkb/blacktyl_lars/keymaps/lars/keymap.json +++ b/keyboards/bastardkb/blacktyl_lars/keymaps/lars/keymap.json @@ -2,124 +2,124 @@ "version": 1, "notes": "My awesome keymap", "documentation": "\"This file is a QMK Configurator export. You can import this at . It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: \n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n", - "keyboard": "bastardkb/skeletyl", - "keymap": "default", + "keyboard": "bastardkb/skeletyl/blackpill", + "keymap": "bastardkb_skeletyl_blackpill_default", "layout": "LAYOUT_split_3x5_3", "layers": [ [ "KC_Q", - "KC_W", - "KC_F", - "KC_P", - "KC_B", - "KC_J", - "KC_L", - "KC_U", - "KC_Y", - "KC_SCLN", - "KC_A", - "KC_R", - "KC_S", - "KC_T", - "KC_G", - "KC_M", - "KC_N", - "KC_E", - "KC_I", - "KC_O", - "LSFT_T(KC_Z)", - "LCTL_T(KC_X)", - "RALT_T(KC_C)", - "KC_D", - "KC_V", - "KC_K", - "KC_H", - "RALT_T(KC_COMM)", - "LCTL_T(KC_DOT)", - "LSFT_T(KC_SLSH)", - "TO(1)", - "KC_BSPC", + "KC_W", + "KC_F", + "KC_P", + "KC_B", + "KC_J", + "KC_L", + "KC_U", + "KC_Y", + "KC_SCLN", + "KC_A", + "KC_R", + "KC_S", + "KC_T", + "KC_G", + "KC_M", + "KC_N", + "KC_E", + "KC_I", + "KC_O", + "LSFT_T(KC_Z)", + "LCTL_T(KC_X)", + "RALT_T(KC_C)", + "KC_D", + "KC_V", + "KC_K", + "KC_H", + "RALT_T(KC_COMM)", + "LCTL_T(KC_DOT)", + "LSFT_T(KC_SLSH)", + "TO(1)", + "KC_BSPC", "KC_TAB", - "KC_DEL", - "KC_SPC", - "KC_ENT" - ], - [ - "KC_TRNS", - "KC_7", - "KC_8", - "KC_9", - "KC_TRNS", - "KC_QUOT", - "KC_MINS", - "KC_EQL", - "KC_ASTR", - "KC_CIRC", - "KC_TRNS", - "KC_4", - "KC_5", - "KC_6", - "KC_0", - "KC_TAB", - "KC_LPRN", - "KC_RPRN", - "KC_LBRC", - "KC_RBRC", - "KC_LSFT", - "KC_1", - "KC_2", - "KC_3", - "KC_TRNS", - "KC_PIPE", - "KC_GRV", - "KC_LALT", - "KC_LCTL", - "KC_RSFT", - "TO(2)", - "KC_BSPC", - "KC_TAB", - "KC_DEL", - "TO(0)", - "KC_ENT" + "OSM(MOD_LGUI)", + "KC_SPC", + "KC_ENT" ], [ "KC_TRNS", - "KC_TRNS", - "KC_PGUP", - "KC_TRNS", - "KC_TRNS", - "ANY(UC(0xE6))", - "ANY(UC(0xF8))", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_LEFT", - "KC_UP", - "KC_DOWN", - "KC_RGHT", - "KC_TRNS", - "KC_TRNS", - "KC_LGUI", - "ANY(UC(0xE5))", - "LCTL(KC_LALT)", - "LCA(KC_LSFT)", - "KC_TRNS", - "KC_HOME", - "KC_PGDN", - "KC_END", - "KC_TRNS", - "KC_TRNS", - "KC_RBRC", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", + "KC_7", + "KC_8", + "KC_9", + "KC_TRNS", + "KC_QUOT", + "KC_MINS", + "KC_EQL", + "KC_ASTR", + "KC_CIRC", + "KC_TRNS", + "KC_4", + "KC_5", + "KC_6", + "KC_0", + "KC_BSLS", + "KC_LPRN", + "KC_RPRN", + "KC_LBRC", + "KC_RBRC", + "KC_LSFT", + "KC_1", + "KC_2", + "KC_3", + "KC_TRNS", + "KC_PIPE", + "KC_GRV", + "KC_LALT", + "KC_LCTL", + "KC_RSFT", + "TO(2)", + "KC_BSPC", "KC_TAB", "KC_DEL", - "TO(0)", - "KC_TRNS" - ] + "TO(0)", + "KC_ENT" + ], + [ + "KC_TRNS", + "KC_TRNS", + "KC_PGUP", + "KC_TRNS", + "KC_TRNS", + "ANY(UC(0xE6))", + "ANY(UC(0xF8))", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_LEFT", + "KC_UP", + "KC_DOWN", + "KC_RGHT", + "KC_TRNS", + "KC_TRNS", + "KC_LGUI", + "ANY(UC(0xE5))", + "LCTL(KC_LALT)", + "LCA(KC_LSFT)", + "KC_TRNS", + "KC_HOME", + "KC_PGDN", + "KC_END", + "KC_TRNS", + "KC_TRNS", + "KC_RBRC", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TAB", + "KC_DEL", + "TO(0)", + "KC_TRNS" + ] ], "author": "thomas.haukland@gmail.com" -} +} \ No newline at end of file diff --git a/keyboards/bastardkb/blacktyl_lars/rules.mk b/keyboards/bastardkb/blacktyl_lars/rules.mk index 4a20d4ebc59..383340f8366 100644 --- a/keyboards/bastardkb/blacktyl_lars/rules.mk +++ b/keyboards/bastardkb/blacktyl_lars/rules.mk @@ -28,8 +28,8 @@ 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 +# RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality +# RGB_MATRIX_DRIVER = ws2812 SPLIT_KEYBOARD = yes