Merge remote-tracking branch 'upstream/master' into develop

2021-08-02 13:55:36 +10:00
parent 26b62f7a6c 4b630c46fe
commit ee3c138385
40 changed files with 2099 additions and 328 deletions
--- a/keyboards/helix/rev3_4rows/rev3_4rows.c
+++ b/keyboards/helix/rev3_4rows/rev3_4rows.c
@@ -30,6 +30,7 @@ void set_mac_mode(bool macmode) {
    eeconfig_update_keymap(keymap_config.raw);
 }

+#ifdef DIP_SWITCH_ENABLE
 bool dip_switch_update_kb(uint8_t index, bool active) {
    switch (index) {
    case 0:
@@ -45,3 +46,4 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
    }
    return true;
 }
+#endif
--- a/keyboards/helix/rev3_4rows/rules.mk
+++ b/keyboards/helix/rev3_4rows/rules.mk
@@ -5,7 +5,7 @@ RGB_MATRIX_ENABLE = no
 RGB_MATRIX_DRIVER = WS2812
 OLED_DRIVER_ENABLE = yes
 ENCODER_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
+DIP_SWITCH_ENABLE = no
 LTO_ENABLE = yes

 SRC += oled_display.c