From 0831a3181a51cf190aabcea504c1be2752bbc2be Mon Sep 17 00:00:00 2001 From: MakotoKurauchi Date: Tue, 15 Dec 2020 20:14:14 +0900 Subject: [Keymap] Helix default keymap oled update (#11152) * update keyboards/helix/rev2/local_features.mk - Improved parsing of the `HELIX =` option * add 'is_mac_mode()' into keyboards/helix/rev2/rev2.c * update helix/rev2/keymaps/default/keymap.c: use rgblight query functions * Makes the OLED driver used by the helix:default keymap switchable. * use TOP/drivers/oled/oled_driver.c `make helix:default` or `make OLED_SELECT=core helix:default` * use helix/local_drivers/ssd1306.c `make OLED_SELECT=local helix:default` * Separated the OLED related code from keymap.c and moved it to oled_display.c. * Change the 'led_test' keymap to follow the changes in the 'default' keymap. * update helix/rev2/keymaps/default/oled_display.c * add '#define OLED_UPDATE_INTERVAL 50' into keyboards/helix/rev2/config.h * Support for OLED_UPDATE_INTERVAL, even for older types of OLED tasks * add readme.md for helix/rev2 * Apply drashna's suggestions to rev2.c. * Apply drashna's suggestions to rev3_4rows.c, rev3_5rows.c. Co-authored-by: mtei <2170248+mtei@users.noreply.github.com> --- keyboards/helix/rev3_5rows/rev3_5rows.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'keyboards/helix/rev3_5rows') diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c index cf183366d6..c034c83381 100644 --- a/keyboards/helix/rev3_5rows/rev3_5rows.c +++ b/keyboards/helix/rev3_5rows/rev3_5rows.c @@ -21,15 +21,13 @@ bool is_mac_mode(void) { } void set_mac_mode(bool macmode) { - if (macmode) { - /* The result is the same as pressing the AG_NORM(=MAGIC_UNSWAP_ALT_GUI) key. */ - /* https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L123-L124 */ - keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false; - } else { - /* The result is the same as pressing the AG_SWAP(=MAGIC_SWAP_ALT_GUI) key. */ - /* https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81 */ - keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true; - } + /* The result is the same as pressing the AG_NORM(=MAGIC_UNSWAP_ALT_GUI)/AG_SWAP(=MAGIC_SWAP_ALT_GUI) keys. + * see + * https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L123-L124 + * https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81 + */ + keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = !macmode; + eeconfig_update_keymap(keymap_config.raw); } void dip_switch_update_kb(uint8_t index, bool active) { -- cgit v1.2.3