diff options
| author | QMK Bot <hello@qmk.fm> | 2022-11-29 19:44:26 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-11-29 19:44:26 +0000 |
| commit | d648eb42caa633ab411da93d2bbe9c3eacaa8172 (patch) | |
| tree | d534ed33cdfac430a19818c514dff90b337b1c8a /keyboards/keebio/iris/keymaps | |
| parent | c146563f4b12d8ef1446318a65c61dac1b197b23 (diff) | |
| parent | 4a87af0e9af046d5fc00d930476920c0c34a57a7 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/keebio/iris/keymaps')
| -rw-r--r-- | keyboards/keebio/iris/keymaps/drashna/config.h | 8 | ||||
| -rw-r--r-- | keyboards/keebio/iris/keymaps/drashna/keymap.c | 10 | ||||
| -rw-r--r-- | keyboards/keebio/iris/keymaps/drashna/rules.mk | 4 |
3 files changed, 6 insertions, 16 deletions
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 |