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/angel64 | |
| 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/angel64')
| -rw-r--r-- | keyboards/angel64/alpha/keymaps/default/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/angel64/rev1/keymaps/default/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/angel64/rev1/keymaps/kakunpc/keymap.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/keyboards/angel64/alpha/keymaps/default/keymap.c b/keyboards/angel64/alpha/keymaps/default/keymap.c index 802ff138b..0f2a8dada 100644 --- a/keyboards/angel64/alpha/keymaps/default/keymap.c +++ b/keyboards/angel64/alpha/keymaps/default/keymap.c | |||
| @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | #ifdef OLED_ENABLE | 40 | #ifdef OLED_ENABLE |
| 41 | void oled_task_user(void) { | 41 | bool oled_task_user(void) { |
| 42 | oled_write_P(PSTR("Layer: "), false); | 42 | oled_write_P(PSTR("Layer: "), false); |
| 43 | switch (biton32(layer_state)) { | 43 | switch (biton32(layer_state)) { |
| 44 | case BASE: | 44 | case BASE: |
| @@ -56,5 +56,6 @@ void oled_task_user(void) { | |||
| 56 | oled_write_P(IS_HOST_LED_ON(USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false); | 56 | oled_write_P(IS_HOST_LED_ON(USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false); |
| 57 | oled_write_P(IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false); | 57 | oled_write_P(IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false); |
| 58 | oled_write_P(IS_HOST_LED_ON(USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); | 58 | oled_write_P(IS_HOST_LED_ON(USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); |
| 59 | return false; | ||
| 59 | } | 60 | } |
| 60 | #endif | 61 | #endif |
diff --git a/keyboards/angel64/rev1/keymaps/default/keymap.c b/keyboards/angel64/rev1/keymaps/default/keymap.c index ff06e418c..7ad3964e2 100644 --- a/keyboards/angel64/rev1/keymaps/default/keymap.c +++ b/keyboards/angel64/rev1/keymaps/default/keymap.c | |||
| @@ -25,10 +25,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | #ifdef OLED_ENABLE | 27 | #ifdef OLED_ENABLE |
| 28 | void oled_task_user(void) { | 28 | bool oled_task_user(void) { |
| 29 | // Host Keyboard LED Status | 29 | // Host Keyboard LED Status |
| 30 | oled_write_P(IS_HOST_LED_ON(USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false); | 30 | oled_write_P(IS_HOST_LED_ON(USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false); |
| 31 | oled_write_P(IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false); | 31 | oled_write_P(IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false); |
| 32 | oled_write_P(IS_HOST_LED_ON(USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); | 32 | oled_write_P(IS_HOST_LED_ON(USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); |
| 33 | return false; | ||
| 33 | } | 34 | } |
| 34 | #endif | 35 | #endif |
diff --git a/keyboards/angel64/rev1/keymaps/kakunpc/keymap.c b/keyboards/angel64/rev1/keymaps/kakunpc/keymap.c index 3780c5e74..6c5184c1b 100644 --- a/keyboards/angel64/rev1/keymaps/kakunpc/keymap.c +++ b/keyboards/angel64/rev1/keymaps/kakunpc/keymap.c | |||
| @@ -173,7 +173,7 @@ void matrix_scan_user(void) { | |||
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | #ifdef OLED_ENABLE | 175 | #ifdef OLED_ENABLE |
| 176 | void oled_task_user(void) { | 176 | bool oled_task_user(void) { |
| 177 | oled_write_P(PSTR("Layer: "), false); | 177 | oled_write_P(PSTR("Layer: "), false); |
| 178 | switch (biton32(layer_state)) { | 178 | switch (biton32(layer_state)) { |
| 179 | case BASE: | 179 | case BASE: |
| @@ -191,5 +191,6 @@ void oled_task_user(void) { | |||
| 191 | oled_write_P(IS_HOST_LED_ON(USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false); | 191 | oled_write_P(IS_HOST_LED_ON(USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false); |
| 192 | oled_write_P(IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false); | 192 | oled_write_P(IS_HOST_LED_ON(USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false); |
| 193 | oled_write_P(IS_HOST_LED_ON(USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); | 193 | oled_write_P(IS_HOST_LED_ON(USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false); |
| 194 | return false; | ||
| 194 | } | 195 | } |
| 195 | #endif | 196 | #endif |
