Fix The Helix keyboards oled options

qmk · Aug 18, 2021 · eb77eb9 · eb77eb9
1 parent da562a2
commit eb77eb9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/keyboards/helix/pico/local_features.mk b/keyboards/helix/pico/local_features.mk
@@ -138,11 +138,12 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
   $(eval $(call HELIX_CUSTOMISE_MSG))
   ifneq ($(strip $(SHOW_VERBOSE_INFO)),)
      $(info -- RGBLIGHT_ENABLE    = $(RGBLIGHT_ENABLE))
-     $(info -- OLED_ENABLE = $(OLED_ENABLE))
      $(info -- CONSOLE_ENABLE     = $(CONSOLE_ENABLE))
      $(info -- OPT_DEFS           = $(OPT_DEFS))
      $(info -- SPLIT_KEYBOARD     = $(SPLIT_KEYBOARD))
      $(info -- LTO_ENABLE         = $(LTO_ENABLE))
      $(info )
   endif
 endif
+
+OLED_ENABLE = no # disable OLED in TOP/common_features.mk
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
@@ -42,8 +42,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 // Helix keyboard OLED support
-//      see ./rules.mk: OLED_ENABLE=yes or no
-#ifdef OLED_ENABLE
+//      see ./local_features.mk: OLED_SELECT=local
+#ifdef OLED_LOCAL_ENABLE
   #define SSD1306OLED
 #endif
 

diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@@ -30,7 +30,6 @@ ifneq ($(strip $(HELIX)),)
     # parse  'dispoff', 'consloe', 'na', 'ani', 'mini-ani'
     $(if $(SHOW_PARCE),$(info parse -$1-))  #debug
     ifeq ($(strip $1),dispoff)
-        OLED_ENABLE = no
         OLED_ENABLE = no
         LED_BACK_ENABLE = no
         LED_UNDERGLOW_ENABLE = no

diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
@@ -157,17 +157,19 @@ endif
 ifeq ($(strip $(OLED_ENABLE)), yes)
     ifeq ($(strip $(OLED_SELECT)),core)
         OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
+        OLED_DRIVER = SSD1306
         ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
            OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\>
         else
            OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
         endif
     else
+        OLED_ENABLE = no # disable OLED in TOP/common_features.mk
+        OLED_LOCAL_ENABLE = yes
         SRC += local_drivers/i2c.c
         SRC += local_drivers/ssd1306.c
         KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers
-        OPT_DEFS += -DOLED_ENABLE
+        OPT_DEFS += -DOLED_LOCAL_ENABLE
         ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
             OPT_DEFS += -DLOCAL_GLCDFONT
         endif
@@ -178,7 +180,8 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
   $(eval $(call HELIX_CUSTOMISE_MSG))
   ifneq ($(strip $(SHOW_VERBOSE_INFO)),)
      $(info -- RGBLIGHT_ENABLE    = $(RGBLIGHT_ENABLE))
-     $(info -- OLED_ENABLE		  = $(OLED_ENABLE))
+     $(info -- OLED_DRIVER        = $(OLED_DRIVER))
+     $(info -- OLED_LOCAL_ENABLE  = $(OLED_LOCAL_ENABLE))
      $(info -- CONSOLE_ENABLE     = $(CONSOLE_ENABLE))
      $(info -- OPT_DEFS           = $(OPT_DEFS))
      $(info -- SPLIT_KEYBOARD     = $(SPLIT_KEYBOARD))

diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk b/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk
@@ -39,7 +39,6 @@ ifneq ($(strip $(HELIX)),)
     endif
     ifeq ($(strip $1),oled)
         OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
     endif
     ifeq ($(strip $1),back)
         RGBLIGHT_ENABLE = yes