diff options
71 files changed, 1598 insertions, 2204 deletions
diff --git a/keyboards/adafruit/macropad/keymaps/drashna/config.h b/keyboards/adafruit/macropad/keymaps/drashna/config.h new file mode 100644 index 0000000000..4d85f039be --- /dev/null +++ b/keyboards/adafruit/macropad/keymaps/drashna/config.h @@ -0,0 +1,7 @@ +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 +#define TAPPING_TERM 499 diff --git a/keyboards/adafruit/macropad/keymaps/drashna/keymap.c b/keyboards/adafruit/macropad/keymaps/drashna/keymap.c new file mode 100644 index 0000000000..d87e4afd66 --- /dev/null +++ b/keyboards/adafruit/macropad/keymaps/drashna/keymap.c @@ -0,0 +1,100 @@ +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "drashna.h" + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + LT(1,KC_MUTE), + KC_ENT, KC_0, KC_BSPC, + KC_7, KC_8, KC_9, + KC_4, KC_5, KC_6, + KC_1, KC_2, KC_3 + ), + [1] = LAYOUT( + _______, + CK_TOGG, AU_TOGG, _______, + _______, _______, _______, + _______, _______, _______, + _______, _______, _______ + ), +}; +// clang-format on + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = {ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)}, +}; +#endif + +void render_oled_title(bool side) { + oled_write_P(PSTR(" Macropad "), true); +} + +void render_rgb_mode(uint8_t col, uint8_t line); + +void l_render_keylock_status(led_t led_usb_state, uint8_t col, uint8_t line) { + oled_set_cursor(col, line); +#ifdef CAPS_WORD_ENABLE + led_usb_state.caps_lock |= is_caps_word_on(); +#endif + oled_write_P(PSTR(OLED_RENDER_LOCK_NUML), led_usb_state.num_lock); + oled_write_P(PSTR(" "), false); + oled_write_P(PSTR(OLED_RENDER_LOCK_CAPS), led_usb_state.caps_lock); + oled_write_P(PSTR(" "), false); + oled_write_P(PSTR(OLED_RENDER_LOCK_SCLK), led_usb_state.scroll_lock); +} + +bool oled_task_keymap(void) { + oled_write_raw_P(header_image, sizeof(header_image)); + oled_set_cursor(0, 1); + oled_write_raw_P(row_2_image, sizeof(row_2_image)); + oled_set_cursor(4, 0); + render_oled_title(false); + + render_kitty(0, 2); + render_matrix_scan_rate(1, 7, 2); + +#ifdef AUDIO_ENABLE + oled_set_cursor(7, 4); + bool l_is_audio_on = is_audio_on(); + + static const char PROGMEM audio_status[2][3] = {{0xE0, 0xE1, 0}, {0xE2, 0xE3, 0}}; + oled_write_P(audio_status[l_is_audio_on], false); + +# ifdef AUDIO_CLICKY + bool l_is_clicky_on = is_clicky_on(); + static const char PROGMEM audio_clicky_status[2][3] = {{0xF4, 0xF5, 0}, {0xF6, 0xF7, 0}}; + oled_write_P(audio_clicky_status[l_is_clicky_on && l_is_audio_on], false); +# endif +#endif + + static const char PROGMEM cat_mode[3] = {0xF8, 0xF9, 0}; + oled_write_P(cat_mode, get_keyboard_lock()); + +#ifdef RGB_MATIRX_ENABLE + static const char PROGMEM rgb_layer_status[2][3] = {{0xEE, 0xEF, 0}, {0xF0, 0xF1, 0}}; + oled_write_P(rgb_layer_status[rgb_matrix_is_enabled()], false); +#endif + +#ifdef HAPTIC_ENABLE + static const char PROGMEM nukem_good[2] = {0xFA, 0}; + oled_write_P(haptic_get_enable() ? nukem_good : PSTR(" "), false); +#endif + + l_render_keylock_status(host_keyboard_led_state(), 7, 5); + render_rgb_mode(1, 6); + + for (uint8_t i = 1; i < 7; i++) { + oled_set_cursor(0, i); + oled_write_raw_P(display_border, sizeof(display_border)); + oled_set_cursor(21, i); + oled_write_raw_P(display_border, sizeof(display_border)); + } + oled_set_cursor(0, 7); + oled_write_raw_P(footer_image, sizeof(footer_image)); + + return false; +} diff --git a/keyboards/adafruit/macropad/keymaps/drashna/rules.mk b/keyboards/adafruit/macropad/keymaps/drashna/rules.mk new file mode 100644 index 0000000000..ea090a5756 --- /dev/null +++ b/keyboards/adafruit/macropad/keymaps/drashna/rules.mk @@ -0,0 +1,3 @@ +ENCODER_MAP_ENABLE = yes +DEBUG_MATRIX_SCAN_RATE_ENABLE = api +WPM_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c index 02cb89fe65..e458a84373 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c @@ -82,29 +82,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { EE_CLR, KC_NUKE, _______, _______, QK_BOOT ), }; - -#if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill) -void keyboard_pre_init_keymap(void) { - setPinInputHigh(A0); -} - -void housekeeping_task_keymap(void) { - if (!readPin(A0)) { - reset_keyboard(); - } -} - -# ifdef USB_VBUS_PIN -bool usb_vbus_state(void) { - setPinInputLow(USB_VBUS_PIN); - wait_us(5); - return readPin(USB_VBUS_PIN); -} -# endif - -void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { - for (int32_t i = 0; i < 40; i++) { - __asm__ volatile("nop" ::: "memory"); - } -} -#endif diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk index ff4ede45ca..029b4a498b 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk @@ -40,6 +40,4 @@ ifeq ($(strip $(OVERLOAD_FEATURES)), yes) CUSTOM_UNICODE_ENABLE = yes CUSTOM_POINTING_DEVICE = yes CUSTOM_SPLIT_TRANSPORT_SYNC = yes - - DEBOUNCE_TYPE = asym_eager_defer_pk endif diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h index 07c4bfc008..7fa9826125 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h @@ -65,3 +65,5 @@ #define BOOTMAGIC_LITE_EEPROM_COLUMN 0 #define BOOTMAGIC_LITE_EEPROM_ROW_RIGHT 1 #define BOOTMAGIC_LITE_EEPROM_COLUMN_RIGHT 0 + +#define DEBOUNCE 15 diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c index 85bb2bc77f..31d1e92a7f 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { SFT_T(KC_SPACE), ALT_T(KC_Q), _______ ), [_MOUSE] = LAYOUT_charybdis_4x6( - _______, _______, _______, _______, _______, _______, _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, _______, + _______, _______, _______, _______, _______, _______, _______, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, PD_JIGGLER, _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, DRGSCRL, _______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING, _______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______, @@ -130,28 +130,6 @@ void keyboard_post_init_keymap(void) { void keyboard_pre_init_keymap(void) { setPinInputHigh(A0); } - -void housekeeping_task_keymap(void) { - if (!readPin(A0)) { - reset_keyboard(); - } -} -#endif - -#ifdef USB_VBUS_PIN -bool usb_vbus_state(void) { - setPinInputLow(USB_VBUS_PIN); - wait_us(5); - return readPin(USB_VBUS_PIN); -} -#endif - -#if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill) -void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { - for (int32_t i = 0; i < 40; i++) { - __asm__ volatile("nop" ::: "memory"); - } -} #endif #ifdef SWAP_HANDS_ENABLE diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk index 0b7759f156..ef6b7cd24b 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk @@ -1,6 +1,7 @@ CUSTOM_UNICODE_ENABLE = no CUSTOM_POINTING_DEVICE = no CUSTOM_SPLIT_TRANSPORT_SYNC = no +PER_KEY_TAPPING = yes ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill) # MCU name @@ -16,16 +17,13 @@ ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill) OVERLOAD_FEATURES = yes endif -ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/stemcell) - OVERLOAD_FEATURES = yes -endif -ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/splinky) - OVERLOAD_FEATURES = yes -endif ifeq ($(strip $(MCU)), atmega32u4) LTO_ENABLE = yes BOOTLOADER = qmk-hid BOOTLOADER_SIZE = 512 + EXTRAKEY_ENABLE = no +else + OVERLOAD_FEATURES = yes endif ifeq ($(strip $(OVERLOAD_FEATURES)), yes) @@ -43,7 +41,6 @@ ifeq ($(strip $(OVERLOAD_FEATURES)), yes) CAPS_WORD_ENABLE = yes SWAP_HANDS_ENABLE = yes TAP_DANCE_ENABLE = yes - DEBOUNCE_TYPE = asym_eager_defer_pk WPM_ENABLE = yes LTO_ENABLE = no # OPT = 3 diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h index d7b1351d89..7c46c83310 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h @@ -6,3 +6,5 @@ #define CIRQUE_PINNACLE_TAP_ENABLE #define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE #define POINTING_DEVICE_GESTURES_SCROLL_ENABLE + +#define OLED_DISPLAY_128X128 diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c index d80d006796..bf75e97841 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c @@ -84,14 +84,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { - for (int32_t i = 0; i < 40; i++) { - __asm__ volatile("nop" ::: "memory"); - } -} - - #if defined(OLED_ENABLE) && defined(OLED_DISPLAY_128X128) # ifdef UNICODE_COMMON_ENABLE # include "process_unicode_common.h" @@ -100,8 +92,6 @@ void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { extern const char PROGMEM display_border[3]; - -extern uint32_t oled_timer; extern bool is_oled_enabled; diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk index 41d73bc49a..a1be9cb8fd 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk @@ -5,4 +5,3 @@ CONSOLE_ENABLE = yes KEYLOGGER_ENABLE = no WPM_ENABLE = yes OLED_ENABLE = yes -OLED_DRIVER = custom diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk index 7fef013a38..d2d2a9b874 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk +++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/rules.mk @@ -6,4 +6,3 @@ TAP_DANCE_ENABLE = yes UNICODE_ENABLE = yes OLED_ENABLE = yes WPM_ENABLE = yes -# DEBOUNCE_TYPE = sym_eager_pk diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 2ab49de9fa..73ea40fb76 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -32,10 +32,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_TARGET_PERIOD 800000 -#define RGBLED_NUM 52 +#define RGBLED_NUM 57 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT \ - { 26, 26 } + { 26, 31 } #define DEBUG_LED_PIN C13 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h deleted file mode 100644 index 0e33129e1a..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#ifndef RGBLIGHT_LIMIT_VAL -# if defined(OLED_ENABLE) -# define RGBLIGHT_LIMIT_VAL 100 -# else -# define RGBLIGHT_LIMIT_VAL 150 -# endif -#endif - -#ifndef OLED_BRIGHTNESS -# ifdef RGBLIGHT_ENABLE -# define OLED_BRIGHTNESS 80 -# else -# define OLED_BRIGHTNESS 150 -# endif -#endif diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h index f159a69174..a449a126d6 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h @@ -16,21 +16,21 @@ #pragma once -#define DEBOUNCE 45 - -#ifdef OLED_DRIVER_SH1107 -# undef OLED_DISPLAY_128X64 -#endif +#undef OLED_DISPLAY_128X64 +#define OLED_DISPLAY_128X128 +#define OLED_BRIGHTNESS 200 #define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200 #define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200 #define CHARYBDIS_MINIMUM_SNIPING_DPI 400 #define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 200 -#define ENCODER_DEFAULT_POS 0x3 - - #define BOOTMAGIC_LITE_EEPROM_ROW |