summaryrefslogtreecommitdiffstats
path: root/keyboards/helix
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-08-02 13:55:36 +1000
committerNick Brassel <nick@tzarc.org>2021-08-02 13:55:36 +1000
commitee3c138385a2644b162807ef05261936858a7e25 (patch)
treef7036343619a43c28250b12499dfc404cdc31a50 /keyboards/helix
parent26b62f7a6c4e5dd98e9a1e7b60c7e3a927e00ec2 (diff)
parent4b630c46fed48f8a82641438029b628ec0dd5150 (diff)
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/helix')
-rw-r--r--keyboards/helix/rev3_4rows/rev3_4rows.c2
-rw-r--r--keyboards/helix/rev3_4rows/rules.mk2
-rw-r--r--keyboards/helix/rev3_5rows/rev3_5rows.c2
-rw-r--r--keyboards/helix/rev3_5rows/rules.mk2
4 files changed, 6 insertions, 2 deletions
diff --git a/keyboards/helix/rev3_4rows/rev3_4rows.c b/keyboards/helix/rev3_4rows/rev3_4rows.c
index 884c244e30..7b32941106 100644
--- 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
diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk
index a5916c114d..530d1d750e 100644
--- 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
diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c
index 884c244e30..7b32941106 100644
--- a/keyboards/helix/rev3_5rows/rev3_5rows.c
+++ b/keyboards/helix/rev3_5rows/rev3_5rows.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
diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk
index a5916c114d..530d1d750e 100644
--- a/keyboards/helix/rev3_5rows/rules.mk
+++ b/keyboards/helix/rev3_5rows/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