aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMakotoKurauchi <pluis@me.com>2018-05-01 00:15:49 +0900
committerDrashna Jaelre <drashna@live.com>2018-04-30 08:15:49 -0700
commit1ff7473ce4fa53f1ea28edfa16ae68ea5cc74d47 (patch)
tree93cff3adbfb8606ff71d5bb489407cf9b1f58af6
parentde97c560f5b731f45f70b92d82509cc3ba97b9e9 (diff)
downloadfirmware-1ff7473ce4fa53f1ea28edfa16ae68ea5cc74d47.tar.gz
firmware-1ff7473ce4fa53f1ea28edfa16ae68ea5cc74d47.tar.bz2
firmware-1ff7473ce4fa53f1ea28edfa16ae68ea5cc74d47.zip
Add LOCAL_GLCDFONT option (#2854)
* add some comment about Helix customize and auto-setup RGBLIGHT_LIMIT_VAL * add define USB_MAX_POWER_CONSUMPTION * Helix keyboard OLED, RGBLIGHT enable/disable control integrate into rules.mk rules.mk: add 4 Variables for compile control. # Helix keyboard customize # you can edit follows 4 Variables # jp: 以下の4つの変数を必要に応じて編集します。 OLED_ENABLE = no # OLED_ENABLE LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.) LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) LED_ANIMATIONS = yes # LED animations config.h: auto set RGBLED_NUM by HELIX_ROWS and rules.mk's define * HELIX_ROWS define move from config.h to rules.mk * add readme.md * rename readme.md to readme_jp.md * add readme.md and modify readme_jp.md * change helix/ssd1306.c for select glcdfont.c position * add variable LOCAL_GLCDFONT into each keymaps rules.mk
-rw-r--r--keyboards/helix/rev2/keymaps/default/rules.mk9
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows/rules.mk9
-rw-r--r--keyboards/helix/ssd1306.c4
3 files changed, 18 insertions, 4 deletions
diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk
index 976529ef9..d407dfb5e 100644
--- a/keyboards/helix/rev2/keymaps/default/rules.mk
+++ b/keyboards/helix/rev2/keymaps/default/rules.mk
@@ -26,10 +26,11 @@ define HELIX_CUSTOMISE_MSG
endef
# Helix keyboard customize
-# you can edit follows 5 Variables
-# jp: 以下の5つの変数を必要に応じて編集します。
+# you can edit follows 6 Variables
+# jp: 以下の6つの変数を必要に応じて編集します。
HELIX_ROWS = 5 # Helix Rows is 4 or 5
OLED_ENABLE = no # OLED_ENABLE
+LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
LED_ANIMATIONS = yes # LED animations
@@ -70,6 +71,10 @@ ifeq ($(strip $(OLED_ENABLE)), yes)
OPT_DEFS += -DOLED_ENABLE
endif
+ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
+ OPT_DEFS += -DLOCAL_GLCDFONT
+endif
+
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
index 67344f94f..53a581ec2 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@@ -27,9 +27,10 @@ define HELIX_CUSTOMISE_MSG
endef
# Helix keyboard customize
-# you can edit follows 5 Variables
-# jp: 以下の5つの変数を必要に応じて編集します。
+# you can edit follows 6 Variables
+# jp: 以下の6つの変数を必要に応じて編集します。
OLED_ENABLE = no # OLED_ENABLE
+LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
LED_ANIMATIONS = yes # LED animations
@@ -97,6 +98,10 @@ ifeq ($(strip $(OLED_ENABLE)), yes)
OPT_DEFS += -DOLED_ENABLE
endif
+ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
+ OPT_DEFS += -DLOCAL_GLCDFONT
+endif
+
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
diff --git a/keyboards/helix/ssd1306.c b/keyboards/helix/ssd1306.c
index 80efc3d16..b13060ef7 100644
--- a/keyboards/helix/ssd1306.c
+++ b/keyboards/helix/ssd1306.c
@@ -4,7 +4,11 @@
#include "i2c.h"
#include <string.h>
#include "print.h"
+#ifndef LOCAL_GLCDFONT
#include "common/glcdfont.c"
+#else
+#include <helixfont.h>
+#endif
#ifdef ADAFRUIT_BLE_ENABLE
#include "adafruit_ble.h"
#endif