diff options
Diffstat (limited to 'keyboards/helix/rev3_5rows')
| -rw-r--r-- | keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c | 4 | ||||
| -rw-r--r-- | keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk | 4 | ||||
| -rw-r--r-- | keyboards/helix/rev3_5rows/oled_display.c | 2 | ||||
| -rw-r--r-- | keyboards/helix/rev3_5rows/rules.mk | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c index 689efe4c8..090e8aaec 100644 --- a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c +++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c | |||
| @@ -35,9 +35,9 @@ void init_helix_oled(void) { | |||
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | //SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h | 37 | //SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h |
| 38 | #if defined(SSD1306OLED) || defined(OLED_DRIVER_ENABLE) | 38 | #if defined(SSD1306OLED) || defined(OLED_ENABLE) |
| 39 | 39 | ||
| 40 | # if defined(OLED_DRIVER_ENABLE) | 40 | # if defined(OLED_ENABLE) |
| 41 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 41 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
| 42 | if (is_keyboard_master()) { | 42 | if (is_keyboard_master()) { |
| 43 | return OLED_ROTATION_0; | 43 | return OLED_ROTATION_0; |
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk b/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk index 734479764..d10972bbd 100644 --- a/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk +++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk | |||
| @@ -19,7 +19,7 @@ ifneq ($(strip $(HELIX)),) | |||
| 19 | # parse 'dispoff', 'consle', 'back', 'oled', 'no-ani', 'mini-ani', 'lto', 'no-lto', 'no-enc', 'scan' | 19 | # parse 'dispoff', 'consle', 'back', 'oled', 'no-ani', 'mini-ani', 'lto', 'no-lto', 'no-enc', 'scan' |
| 20 | $(if $(SHOW_PARCE),$(info parse .$1.)) #debug | 20 | $(if $(SHOW_PARCE),$(info parse .$1.)) #debug |
| 21 | ifeq ($(strip $1),dispoff) | 21 | ifeq ($(strip $1),dispoff) |
| 22 | OLED_DRIVER_ENABLE = no | 22 | OLED_ENABLE = no |
| 23 | RGBLIGHT_ENABLE = no | 23 | RGBLIGHT_ENABLE = no |
| 24 | endif | 24 | endif |
| 25 | ifeq ($(strip $1),console) | 25 | ifeq ($(strip $1),console) |
| @@ -38,7 +38,7 @@ ifneq ($(strip $(HELIX)),) | |||
| 38 | ENCODER_ENABLE = no | 38 | ENCODER_ENABLE = no |
| 39 | endif | 39 | endif |
| 40 | ifeq ($(strip $1),oled) | 40 | ifeq ($(strip $1),oled) |
| 41 | OLED_DRIVER_ENABLE = yes | 41 | OLED_ENABLE = yes |
| 42 | endif | 42 | endif |
| 43 | ifeq ($(strip $1),back) | 43 | ifeq ($(strip $1),back) |
| 44 | RGBLIGHT_ENABLE = yes | 44 | RGBLIGHT_ENABLE = yes |
diff --git a/keyboards/helix/rev3_5rows/oled_display.c b/keyboards/helix/rev3_5rows/oled_display.c index ffe8b594b..fbaa9bc56 100644 --- a/keyboards/helix/rev3_5rows/oled_display.c +++ b/keyboards/helix/rev3_5rows/oled_display.c | |||
| @@ -35,7 +35,7 @@ enum layer_names { | |||
| 35 | _ADJUST | 35 | _ADJUST |
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | #ifdef OLED_DRIVER_ENABLE | 38 | #ifdef OLED_ENABLE |
| 39 | 39 | ||
| 40 | void render_status(void) { | 40 | void render_status(void) { |
| 41 | 41 | ||
diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk index 530d1d750..f29deaf58 100644 --- a/keyboards/helix/rev3_5rows/rules.mk +++ b/keyboards/helix/rev3_5rows/rules.mk | |||
| @@ -3,7 +3,8 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | |||
| 3 | SPLIT_KEYBOARD = yes | 3 | SPLIT_KEYBOARD = yes |
| 4 | RGB_MATRIX_ENABLE = no | 4 | RGB_MATRIX_ENABLE = no |
| 5 | RGB_MATRIX_DRIVER = WS2812 | 5 | RGB_MATRIX_DRIVER = WS2812 |
| 6 | OLED_DRIVER_ENABLE = yes | 6 | OLED_ENABLE = yes |
| 7 | OLED_DRIVER = SSD1306 | ||
| 7 | ENCODER_ENABLE = yes | 8 | ENCODER_ENABLE = yes |
| 8 | DIP_SWITCH_ENABLE = no | 9 | DIP_SWITCH_ENABLE = no |
| 9 | LTO_ENABLE = yes | 10 | LTO_ENABLE = yes |
