diff options
| author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2020-12-23 11:50:12 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 11:50:12 +0900 |
| commit | dc7081a8233e5d709d09cc09adafdc42efd9c8a0 (patch) | |
| tree | b32d8291f21d8142dffa848e1aa45dc2b917acf9 /keyboards/helix | |
| parent | fd177582adbd6847bbe620ae1a6ffd7a85370f2d (diff) | |
| download | qmk_firmware-dc7081a8233e5d709d09cc09adafdc42efd9c8a0.tar.gz qmk_firmware-dc7081a8233e5d709d09cc09adafdc42efd9c8a0.zip | |
[Keymap] fix and update helix/rev3_5rows:five_rows (#11191)
* [Keymap] fix and update helix/rev3_5rows:five_rows
* fix rgblight animation selection
* use `DEBUG_MATRIX_SCAN_RATE_ENABLE` insted of keyboard_post_init_user_scan.c
* Change the initial value of the ENCODER_ENABLE to 'no' in 'keymaps/five_rows/rules.mk'
* Add 'HELIX=debug/no-debug' option into 'rev3_5rows/keymaps/five_rows/rules.mk'
* Add '#define OLED_UPDATE_INTERVAL 100' 'rev3_5rows/keymaps/five_rows/config.h'
* add LED_ANIMATIONS_LEVEL macro into rev3_5rows/keymaps/five_rows/
* Change OLED_UPDATE_INTERVAL value in rev3_5rows/keymaps/five_rows/config.h
Diffstat (limited to 'keyboards/helix')
3 files changed, 76 insertions, 12 deletions
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h b/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h index 416e8fd7c..205867e5b 100644 --- a/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h +++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h | |||
| @@ -22,6 +22,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 22 | #ifndef CONFIG_USER_H | 22 | #ifndef CONFIG_USER_H |
| 23 | #define CONFIG_USER_H | 23 | #define CONFIG_USER_H |
| 24 | 24 | ||
| 25 | #undef OLED_UPDATE_INTERVAL | ||
| 26 | #define OLED_UPDATE_INTERVAL 50 | ||
| 27 | |||
| 25 | #undef TAPPING_TERM | 28 | #undef TAPPING_TERM |
| 26 | #define TAPPING_TERM 300 | 29 | #define TAPPING_TERM 300 |
| 27 | #define PERMISSIVE_HOLD | 30 | #define PERMISSIVE_HOLD |
| @@ -33,7 +36,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 33 | // If you need more program area, try select and reduce rgblight modes to use. | 36 | // If you need more program area, try select and reduce rgblight modes to use. |
| 34 | 37 | ||
| 35 | // Selection of RGBLIGHT MODE to use. | 38 | // Selection of RGBLIGHT MODE to use. |
| 39 | #undef RGBLIGHT_ANIMATIONS | ||
| 40 | #undef RGBLIGHT_EFFECT_BREATHING | ||
| 41 | #undef RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
| 42 | #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
| 43 | #undef RGBLIGHT_EFFECT_SNAKE | ||
| 44 | #undef RGBLIGHT_EFFECT_KNIGHT | ||
| 45 | #undef RGBLIGHT_EFFECT_CHRISTMAS | ||
| 46 | #undef RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
| 47 | #undef RGBLIGHT_EFFECT_RGB_TEST | ||
| 48 | #undef RGBLIGHT_EFFECT_ALTERNATING | ||
| 49 | |||
| 36 | #if defined(LED_ANIMATIONS) | 50 | #if defined(LED_ANIMATIONS) |
| 51 | # if LED_ANIMATIONS_LEVEL > 1 | ||
| 37 | #define RGBLIGHT_EFFECT_BREATHING | 52 | #define RGBLIGHT_EFFECT_BREATHING |
| 38 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | 53 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD |
| 39 | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | 54 | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL |
| @@ -43,6 +58,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 43 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | 58 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT |
| 44 | //#define RGBLIGHT_EFFECT_RGB_TEST | 59 | //#define RGBLIGHT_EFFECT_RGB_TEST |
| 45 | //#define RGBLIGHT_EFFECT_ALTERNATING | 60 | //#define RGBLIGHT_EFFECT_ALTERNATING |
| 61 | # else | ||
| 62 | #define RGBLIGHT_EFFECT_BREATHING | ||
| 63 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||
| 64 | //#define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||
| 65 | //#define RGBLIGHT_EFFECT_SNAKE | ||
| 66 | //#define RGBLIGHT_EFFECT_KNIGHT | ||
| 67 | //#define RGBLIGHT_EFFECT_CHRISTMAS | ||
| 68 | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||
| 69 | //#define RGBLIGHT_EFFECT_RGB_TEST | ||
| 70 | //#define RGBLIGHT_EFFECT_ALTERNATING | ||
| 71 | # endif | ||
| 46 | #endif | 72 | #endif |
| 47 | 73 | ||
| 48 | #endif /* CONFIG_USER_H */ | 74 | #endif /* CONFIG_USER_H */ |
| 75 | |||
| 76 | #ifdef DEBUG_CONFIG | ||
| 77 | # include "debug_config.h" | ||
| 78 | #endif | ||
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/keyboard_post_init_user_scan.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/keyboard_post_init_user_scan.c deleted file mode 100644 index 7c84e1ed8..000000000 --- a/keyboards/helix/rev3_5rows/keymaps/five_rows/keyboard_post_init_user_scan.c +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | |||
| 3 | void keyboard_post_init_user(void) { | ||
| 4 | #if defined(DEBUG_MATRIX_SCAN_RATE) | ||
| 5 | debug_enable = true; | ||
| 6 | #endif | ||
| 7 | } | ||
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk b/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk index 21261fa20..734479764 100644 --- a/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk +++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk | |||
| @@ -10,12 +10,14 @@ | |||
| 10 | # yes, no +1500 | 10 | # yes, no +1500 |
| 11 | # yes, yes +3200 | 11 | # yes, yes +3200 |
| 12 | # no, yes +400 | 12 | # no, yes +400 |
| 13 | ENCODER_ENABLE = no | ||
| 13 | LTO_ENABLE = no # if firmware size over limit, try this option | 14 | LTO_ENABLE = no # if firmware size over limit, try this option |
| 15 | LED_ANIMATIONS = yes | ||
| 14 | 16 | ||
| 15 | ifneq ($(strip $(HELIX)),) | 17 | ifneq ($(strip $(HELIX)),) |
| 16 | define KEYMAP_OPTION_PARSE | 18 | define KEYMAP_OPTION_PARSE |
| 17 | # $xinfo .$1.x #debug | 19 | # parse 'dispoff', 'consle', 'back', 'oled', 'no-ani', 'mini-ani', 'lto', 'no-lto', 'no-enc', 'scan' |
| 18 | # parse 'dispoff', 'consle', 'back', 'oled' | 20 | $(if $(SHOW_PARCE),$(info parse .$1.)) #debug |
| 19 | ifeq ($(strip $1),dispoff) | 21 | ifeq ($(strip $1),dispoff) |
| 20 | OLED_DRIVER_ENABLE = no | 22 | OLED_DRIVER_ENABLE = no |
| 21 | RGBLIGHT_ENABLE = no | 23 | RGBLIGHT_ENABLE = no |
| @@ -23,18 +25,43 @@ ifneq ($(strip $(HELIX)),) | |||
| 23 | ifeq ($(strip $1),console) | 25 | ifeq ($(strip $1),console) |
| 24 | CONSOLE_ENABLE = yes | 26 | CONSOLE_ENABLE = yes |
| 25 | endif | 27 | endif |
| 28 | ifeq ($(strip $1),debug) | ||
| 29 | DEBUG_CONFIG = yes | ||
| 30 | endif | ||
| 31 | ifneq ($(filter nodebug no-debug no_debug,$(strip $1)),) | ||
| 32 | DEBUG_CONFIG = no | ||
| 33 | endif | ||
| 34 | ifneq ($(filter enc,$(strip $1)),) | ||
| 35 | ENCODER_ENABLE = yes | ||
| 36 | endif | ||
| 37 | ifneq ($(filter noenc no-enc no_enc,$(strip $1)),) | ||
| 38 | ENCODER_ENABLE = no | ||
| 39 | endif | ||
| 26 | ifeq ($(strip $1),oled) | 40 | ifeq ($(strip $1),oled) |
| 27 | OLED_DRIVER_ENABLE = yes | 41 | OLED_DRIVER_ENABLE = yes |
| 28 | endif | 42 | endif |
| 29 | ifeq ($(strip $1),back) | 43 | ifeq ($(strip $1),back) |
| 30 | RGBLIGHT_ENABLE = yes | 44 | RGBLIGHT_ENABLE = yes |
| 31 | endif | 45 | endif |
| 46 | ifneq ($(filter na no_ani no-ani,$(strip $1)),) | ||
| 47 | LED_ANIMATIONS = no | ||
| 48 | endif | ||
| 49 | ifneq ($(filter mini-ani mini_ani,$(strip $1)),) | ||
| 50 | LED_ANIMATIONS = mini | ||
| 51 | endif | ||
| 52 | ifneq ($(filter ani animation,$(strip $1)),) | ||
| 53 | LED_ANIMATIONS = yes | ||
| 54 | endif | ||
| 55 | ifeq ($(strip $1),lto) | ||
| 56 | LTO_ENABLE = yes | ||
| 57 | endif | ||
| 58 | ifneq ($(filter nolto no-lto no_lto,$(strip $1)),) | ||
| 59 | LTO_ENABLE = no | ||
| 60 | endif | ||
| 32 | ifeq ($(strip $1),scan) | 61 | ifeq ($(strip $1),scan) |
| 33 | # use DEBUG_MATRIX_SCAN_RATE | 62 | # use DEBUG_MATRIX_SCAN_RATE |
| 34 | # see docs/newbs_testing_debugging.md | 63 | # see docs/newbs_testing_debugging.md |
| 35 | OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE | 64 | DEBUG_MATRIX_SCAN_RATE_ENABLE = yes |
| 36 | CONSOLE_ENABLE = yes | ||
| 37 | SRC += keyboard_post_init_user_scan.c | ||
| 38 | endif | 65 | endif |
| 39 | endef # end of KEYMAP_OPTION_PARSE | 66 | endef # end of KEYMAP_OPTION_PARSE |
| 40 | 67 | ||
| @@ -42,3 +69,17 @@ ifneq ($(strip $(HELIX)),) | |||
| 42 | $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(HELIX)), \ | 69 | $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(HELIX)), \ |
| 43 | $(call KEYMAP_OPTION_PARSE,$(A_OPTION_NAME)))) | 70 | $(call KEYMAP_OPTION_PARSE,$(A_OPTION_NAME)))) |
| 44 | endif | 71 | endif |
| 72 | |||
| 73 | ifeq ($(strip $(LED_ANIMATIONS)), yes) | ||
| 74 | OPT_DEFS += -DLED_ANIMATIONS | ||
| 75 | OPT_DEFS += -DLED_ANIMATIONS_LEVEL=2 | ||
| 76 | endif | ||
| 77 | |||
| 78 | ifeq ($(strip $(LED_ANIMATIONS)), mini) | ||
| 79 | OPT_DEFS += -DLED_ANIMATIONS | ||
| 80 | OPT_DEFS += -DLED_ANIMATIONS_LEVEL=1 | ||
| 81 | endif | ||
| 82 | |||
| 83 | ifeq ($(strip $(DEBUG_CONFIG)), yes) | ||
| 84 | OPT_DEFS += -DDEBUG_CONFIG | ||
| 85 | endif | ||
