diff options
author | Drashna Jaelre <drashna@live.com> | 2022-11-29 11:43:42 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-29 11:43:42 -0800 |
commit | 4a87af0e9af046d5fc00d930476920c0c34a57a7 (patch) | |
tree | cb2da20c670a49b9fcada84822a7bdb2bd144d60 /keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c | |
parent | 8a8000b4ec379448848f561f57bbe2c781376357 (diff) |
[Keymap] Drashna updates for 0.19 (#19175)
* 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
Diffstat (limited to 'keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c')
-rw-r--r-- | keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c index a96630842d..afcc9b0a7a 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c @@ -132,6 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; +#ifdef ENCODER_ENABLE #ifdef ENCODER_MAP_ENABLE const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_DEFAULT_LAYER_1] = { { KC_VOLD, KC_VOLU }, { KC_WH_D, KC_WH_U } }, @@ -185,6 +186,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { return false; } #endif +#endif #ifdef OLED_ENABLE # include "keyrecords/unicode.h" @@ -209,36 +211,7 @@ void oled_render_large_display(bool side) { // clang-format on oled_write_P(logo, false); -# ifdef CUSTOM_UNICODE_ENABLE - oled_set_cursor(1, 14); - oled_write_ln_P(PSTR("Unicode:"), false); - switch (typing_mode) { - case UCTM_WIDE: - oled_write_P(PSTR(" Wide"), false); - break; - case UCTM_SCRIPT: - oled_write_P(PSTR(" Script"), false); - break; - case UCTM_BLOCKS: - oled_write_P(PSTR(" Blocks"), false); - break; - case UCTM_REGIONAL: - oled_write_P(PSTR(" Regional"), false); - break; - case UCTM_AUSSIE: - oled_write_P(PSTR(" Aussie"), false); - break; - case UCTM_ZALGO: - oled_write_P(PSTR(" Zalgo"), false); - break; - case UCTM_NO_MODE: - oled_write_P(PSTR(" Normal"), false); - break; - default: - oled_write_P(PSTR(" Unknown"), false); - break; - } -# endif + render_unicode_mode(1, 14); } } #endif |