diff options
author | Drashna Jaelre <drashna@live.com> | 2021-11-01 15:42:50 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-02 09:42:50 +1100 |
commit | 9d235d4fc5c34f372b0c393f41686b5ef4f8dc13 (patch) | |
tree | c155fae4cd6043c3c32aa185eb05c5d1a4a5700e /keyboards/halfcliff/halfcliff.c | |
parent | f775da96b17ceec66bac279434325b4da5cb9467 (diff) | |
download | qmk_firmware-9d235d4fc5c34f372b0c393f41686b5ef4f8dc13.tar.gz qmk_firmware-9d235d4fc5c34f372b0c393f41686b5ef4f8dc13.zip |
[Core] Change OLED task function to be boolean (#14864)
* [Core] Add kb level callbacks to OLED driver
* Update keyboards and keymaps
* Update docs
* Update userspace configs
* Add fix for my keymap ...
* update lefty
Diffstat (limited to 'keyboards/halfcliff/halfcliff.c')
-rw-r--r-- | keyboards/halfcliff/halfcliff.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/keyboards/halfcliff/halfcliff.c b/keyboards/halfcliff/halfcliff.c index 4e2910b84..9e3f64d28 100644 --- a/keyboards/halfcliff/halfcliff.c +++ b/keyboards/halfcliff/halfcliff.c | |||
@@ -27,14 +27,18 @@ enum layer_names { | |||
27 | /* _FN */ | 27 | /* _FN */ |
28 | }; | 28 | }; |
29 | 29 | ||
30 | __attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 30 | oled_rotation_t oled_init_kb(oled_rotation_t rotation) { |
31 | if (!is_keyboard_master()) { | 31 | if (!is_keyboard_master()) { |
32 | return OLED_ROTATION_180; // flips the display 180 degrees if offhand | 32 | return OLED_ROTATION_180; // flips the display 180 degrees if offhand |
33 | } | 33 | } |
34 | return rotation; | 34 | return rotation; |
35 | } | 35 | } |
36 | oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_180; } | ||
36 | 37 | ||
37 | __attribute__((weak)) void oled_task_user(void) { | 38 | bool oled_task_kb(void) { |
39 | if (!oled_task_user()) { | ||
40 | return false; | ||
41 | } | ||
38 | if (!is_keyboard_master()) { | 42 | if (!is_keyboard_master()) { |
39 | static const char PROGMEM qmk_logo[] = { | 43 | static const char PROGMEM qmk_logo[] = { |
40 | 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, | 44 | 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, |
@@ -68,6 +72,7 @@ __attribute__((weak)) void oled_task_user(void) { | |||
68 | oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false); | 72 | oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false); |
69 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK\n") : PSTR(" \n"), false); | 73 | oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK\n") : PSTR(" \n"), false); |
70 | } | 74 | } |
75 | return false; | ||
71 | } | 76 | } |
72 | #endif | 77 | #endif |
73 | 78 | ||