From 4a87af0e9af046d5fc00d930476920c0c34a57a7 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 29 Nov 2022 11:43:42 -0800 Subject: [Keymap] Drashna updates for 0.19 (#19175) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix up bastardkb boards since blackpill support is officially added. * Check for blackpill version, not elite c. * Add checks in chibiOS config since multiple ARM controllers supported. * Rework rules.mk for keymaps to better handle arm vs avr support * Start moving away from `matrix_*_*` functions. * `housekeeping_task_*` instead of `matrix_scan_*` * `keyboard_(pre|post)_init_*` instead of `matrix_init_*` * Add ℂℴmⅈℂ unicode input method. * Clean up unicode code to be more compact and flexible. * Remove/move Pro Micro LED commands to userspace and better filter them * Fixup OLED code * Use newer quantum keycode functions/preprocessors rather than manual bit manipulation * Make unicode mode render much more compact/simple. * Make qmk secrets more self contained * Remove custom implementation of split watchdog --- keyboards/keebio/iris/keymaps/drashna/config.h | 8 ++++++-- keyboards/keebio/iris/keymaps/drashna/keymap.c | 10 ---------- keyboards/keebio/iris/keymaps/drashna/rules.mk | 4 ---- 3 files changed, 6 insertions(+), 16 deletions(-) (limited to 'keyboards/keebio/iris/keymaps') diff --git a/keyboards/keebio/iris/keymaps/drashna/config.h b/keyboards/keebio/iris/keymaps/drashna/config.h index 0569f30744..a4d2def67c 100644 --- a/keyboards/keebio/iris/keymaps/drashna/config.h +++ b/keyboards/keebio/iris/keymaps/drashna/config.h @@ -30,7 +30,9 @@ # define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2 # define RGBLIGHT_EFFECT_SNAKE_LENGTH 2 -# define RGBLIGHT_LIMIT_VAL 225 +# ifndef RGBLIGHT_LIMIT_VAL +# define RGBLIGHT_LIMIT_VAL 225 +# endif #endif // RGBLIGHT_ENABLE #ifdef AUDIO_ENABLE @@ -49,12 +51,14 @@ # define QMK_SPEAKER C6 #endif -#undef PRODUCT #if defined(KEYBOARD_keebio_iris_rev2) +# undef PRODUCT # define PRODUCT "Drashna Hacked Iris Rev 2" #elif defined(KEYBOARD_keebio_iris_rev3) +# undef PRODUCT # define PRODUCT "Drashna Hacked Iris Rev 3" #elif defined(KEYBOARD_keebio_iris_rev4) +# undef PRODUCT # define PRODUCT "Drashna Hacked Iris Rev 4" #endif diff --git a/keyboards/keebio/iris/keymaps/drashna/keymap.c b/keyboards/keebio/iris/keymaps/drashna/keymap.c index a6199f1efe..02d0011f5c 100644 --- a/keyboards/keebio/iris/keymaps/drashna/keymap.c +++ b/keyboards/keebio/iris/keymaps/drashna/keymap.c @@ -101,16 +101,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // clang-format on -void matrix_init_keymap(void) { -#ifndef CONVERT_TO_PROTON_C - setPinOutput(D5); - writePinHigh(D5); - - setPinOutput(B0); - writePinHigh(B0); -#endif -} - void keyboard_post_init_keymap(void) { #if BACKLIGHT_ENABLE backlight_enable(); diff --git a/keyboards/keebio/iris/keymaps/drashna/rules.mk b/keyboards/keebio/iris/keymaps/drashna/rules.mk index 51b9a105d2..f531c74a56 100644 --- a/keyboards/keebio/iris/keymaps/drashna/rules.mk +++ b/keyboards/keebio/iris/keymaps/drashna/rules.mk @@ -14,7 +14,3 @@ INDICATOR_LIGHTS = no RGBLIGHT_STARTUP_ANIMATION = no CUSTOM_UNICODE_ENABLE = no CUSTOM_SPLIT_TRANSPORT_SYNC = no - -ifneq ($(strip $(KEYBOARD)), keebio/iris/rev6) - RGBLIGHT_ENABLE = yes -endif -- cgit v1.2.3