aboutsummaryrefslogtreecommitdiff
path: root/users/ninjonas
diff options
context:
space:
mode:
authorXelus22 <17491233+Xelus22@users.noreply.github.com>2021-08-24 16:28:26 +1000
committerGitHub <noreply@github.com>2021-08-24 16:28:26 +1000
commit4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0 (patch)
tree24ff5bdf570a6a9f5a77a517005bffbb35e46b22 /users/ninjonas
parent6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb (diff)
downloadqmk_firmware-4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0.tar.gz
qmk_firmware-4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0.zip
[Core] Refactor OLED to allow easy addition of other types (#13454)
* add docs * core changes * update keyboards to new OLED * updated users to new OLED * update layouts to new OLED * fixup docs * drashna's suggestion * fix up docs * new keyboards with oled * core split changes * remaining keyboard files * Fix The Helix keyboards oled options * reflect develop Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
Diffstat (limited to 'users/ninjonas')
-rw-r--r--users/ninjonas/oled.c20
-rw-r--r--users/ninjonas/process_records.c4
-rw-r--r--users/ninjonas/process_records.h2
3 files changed, 13 insertions, 13 deletions
diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c
index a3514f54f..1d88c3057 100644
--- a/users/ninjonas/oled.c
+++ b/users/ninjonas/oled.c
@@ -2,7 +2,7 @@
2#include <stdio.h> 2#include <stdio.h>
3#include "ninjonas.h" 3#include "ninjonas.h"
4 4
5#if defined(OLED_DRIVER_ENABLE) & !defined(KEYBOARD_kyria_rev1) 5#if defined(OLED_ENABLE) & !defined(KEYBOARD_kyria_rev1)
6 6
7static uint32_t oled_timer = 0; 7static uint32_t oled_timer = 0;
8 8
@@ -49,16 +49,16 @@ void render_layer_state(void) {
49 bool adjust = layer_state_is(_ADJUST); 49 bool adjust = layer_state_is(_ADJUST);
50 bool numpad = layer_state_is(_NUMPAD); 50 bool numpad = layer_state_is(_NUMPAD);
51 51
52 if(lower){ 52 if(lower){
53 oled_write_P(PSTR(" Lower "), true); 53 oled_write_P(PSTR(" Lower "), true);
54 } else if(raise){ 54 } else if(raise){
55 oled_write_P(PSTR(" Raise "), true); 55 oled_write_P(PSTR(" Raise "), true);
56 } else if(adjust){ 56 } else if(adjust){
57 oled_write_P(PSTR(" Adjust "), true); 57 oled_write_P(PSTR(" Adjust "), true);
58 } else if(numpad) { 58 } else if(numpad) {
59 oled_write_P(PSTR(" Numpad "), true); 59 oled_write_P(PSTR(" Numpad "), true);
60 } else { 60 } else {
61 oled_write_P(PSTR(" Default"), false); 61 oled_write_P(PSTR(" Default"), false);
62 } 62 }
63} 63}
64 64
diff --git a/users/ninjonas/process_records.c b/users/ninjonas/process_records.c
index a3b841791..c298227e5 100644
--- a/users/ninjonas/process_records.c
+++ b/users/ninjonas/process_records.c
@@ -6,7 +6,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true;
6__attribute__((weak)) 6__attribute__((weak))
7bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { return true; } 7bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { return true; }
8 8
9#ifdef OLED_DRIVER_ENABLE 9#ifdef OLED_ENABLE
10__attribute__((weak)) 10__attribute__((weak))
11bool process_record_oled(uint16_t keycode, keyrecord_t *record) { return true; } 11bool process_record_oled(uint16_t keycode, keyrecord_t *record) { return true; }
12#endif 12#endif
@@ -110,7 +110,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
110 } 110 }
111 111
112 return process_record_keymap(keycode, record) && process_record_secrets(keycode, record) 112 return process_record_keymap(keycode, record) && process_record_secrets(keycode, record)
113 #ifdef OLED_DRIVER_ENABLE 113 #ifdef OLED_ENABLE
114 && process_record_oled(keycode, record) 114 && process_record_oled(keycode, record)
115 #endif 115 #endif
116 ; // Close return 116 ; // Close return
diff --git a/users/ninjonas/process_records.h b/users/ninjonas/process_records.h
index 2e69ca216..5b901a165 100644
--- a/users/ninjonas/process_records.h
+++ b/users/ninjonas/process_records.h
@@ -25,6 +25,6 @@ enum custom_keycodes {
25 25
26bool process_record_secrets(uint16_t keycode, keyrecord_t *record); 26bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
27bool process_record_keymap(uint16_t keycode, keyrecord_t *record); 27bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
28#ifdef OLED_DRIVER_ENABLE 28#ifdef OLED_ENABLE
29bool process_record_oled(uint16_t keycode, keyrecord_t *record); 29bool process_record_oled(uint16_t keycode, keyrecord_t *record);
30#endif 30#endif