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

qmk · Apr 3, 2021 · 8428ced · 8428ced
2 parents 9bedc63 + 49dc332
commit 8428ced
Show file tree

Hide file tree

Showing 6 changed files with 353 additions and 339 deletions.
diff --git a/keyboards/helix/rev2/keymaps/five_rows/config.h b/keyboards/helix/rev2/keymaps/five_rows/config.h
@@ -35,6 +35,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // If you need more program area, try select and reduce rgblight modes to use.
 
+#define DISABLE_SYNC_TIMER
+
 // Selection of RGBLIGHT MODE to use.
 #undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_BREATHING

diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@@ -35,6 +35,20 @@ ifneq ($(strip $(HELIX)),)
         LED_BACK_ENABLE = no
         LED_UNDERGLOW_ENABLE = no
     endif
+    ifneq ($(filter nooled no-oled,$(strip $1)),)
+        OLED_ENABLE = no
+    endif
+    ifeq ($(strip $1),oled)
+        OLED_ENABLE = yes
+    endif
+    ifneq ($(filter core-oled core_oled newoled new-oled olednew oled-new,$(strip $1)),)
+        OLED_ENABLE = yes
+        OLED_SELECT = core
+    endif
+    ifneq ($(filter local-oled local_oled oldoled old-oled oledold oled-old,$(strip $1)),)
+        OLED_ENABLE = yes
+        OLED_SELECT = local
+    endif
     ifeq ($(strip $1),console)
         CONSOLE_ENABLE = yes
     endif
@@ -79,10 +93,10 @@ ifeq ($(strip $(DEBUG_CONFIG)), yes)
     OPT_DEFS += -DDEBUG_CONFIG
 endif
 
-# convert Helix-specific options (that represent combinations of standard options)
-#   into QMK standard options.
-include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
-
 ifeq ($(strip $(OLED_ENABLE)), yes)
     SRC += oled_display.c
 endif
+
+# convert Helix-specific options (that represent combinations of standard options)
+#   into QMK standard options.
+include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h b/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
@@ -22,19 +22,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#undef OLED_UPDATE_INTERVAL
-#define OLED_UPDATE_INTERVAL 50
-
 #undef TAPPING_TERM
 #define TAPPING_TERM 300
 #define PERMISSIVE_HOLD
 /* when TAPPING_TERM >= 500 same effect PERMISSIVE_HOLD.
    see tmk_core/common/action_tapping.c */
 
+#undef OLED_UPDATE_INTERVAL
+#define OLED_UPDATE_INTERVAL 50
+
 // place overrides here
 
 // If you need more program area, try select and reduce rgblight modes to use.
 
+#define DISABLE_SYNC_TIMER
+
 // Selection of RGBLIGHT MODE to use.
 #undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_BREATHING