diff options
Diffstat (limited to 'keyboards/lily58')
24 files changed, 63 insertions, 58 deletions
diff --git a/keyboards/lily58/keymaps/barabas/keymap.c b/keyboards/lily58/keymaps/barabas/keymap.c index ca23a59c2..00d6045d4 100644 --- a/keyboards/lily58/keymaps/barabas/keymap.c +++ b/keyboards/lily58/keymaps/barabas/keymap.c | |||
@@ -124,8 +124,8 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { | |||
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | // SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk | 127 | // SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk |
128 | #ifdef OLED_DRIVER_ENABLE | 128 | #ifdef OLED_ENABLE |
129 | 129 | ||
130 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 130 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
131 | if (!is_keyboard_master()) return OLED_ROTATION_180; // flips the display 180 degrees if offhand | 131 | if (!is_keyboard_master()) return OLED_ROTATION_180; // flips the display 180 degrees if offhand |
@@ -180,11 +180,11 @@ void oled_task_user(void) { | |||
180 | oled_write(read_logo(), false); | 180 | oled_write(read_logo(), false); |
181 | } | 181 | } |
182 | } | 182 | } |
183 | #endif // OLED_DRIVER_ENABLE | 183 | #endif // OLED_ENABLE |
184 | 184 | ||
185 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 185 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
186 | if (record->event.pressed) { | 186 | if (record->event.pressed) { |
187 | #ifdef OLED_DRIVER_ENABLE | 187 | #ifdef OLED_ENABLE |
188 | set_keylog(keycode, record); | 188 | set_keylog(keycode, record); |
189 | #endif | 189 | #endif |
190 | } | 190 | } |
diff --git a/keyboards/lily58/keymaps/chuan/keymap.c b/keyboards/lily58/keymaps/chuan/keymap.c index da3416087..29e5aae19 100644 --- a/keyboards/lily58/keymaps/chuan/keymap.c +++ b/keyboards/lily58/keymaps/chuan/keymap.c | |||
@@ -130,7 +130,7 @@ void matrix_init_user(void) { | |||
130 | #endif | 130 | #endif |
131 | } | 131 | } |
132 | 132 | ||
133 | #ifdef OLED_DRIVER_ENABLE | 133 | #ifdef OLED_ENABLE |
134 | 134 | ||
135 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 135 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
136 | if (!is_keyboard_master()) | 136 | if (!is_keyboard_master()) |
@@ -169,7 +169,7 @@ void oled_task_user(void) { | |||
169 | // oled_write_ln(encoder_debug, false); | 169 | // oled_write_ln(encoder_debug, false); |
170 | } | 170 | } |
171 | } | 171 | } |
172 | #endif //OLED_DRIVER_ENABLE | 172 | #endif //OLED_ENABLE |
173 | 173 | ||
174 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 174 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
175 | if (record->event.pressed) { | 175 | if (record->event.pressed) { |
diff --git a/keyboards/lily58/keymaps/curry/rules.mk b/keyboards/lily58/keymaps/curry/rules.mk index ce7c24eaf..1ff1fad96 100644 --- a/keyboards/lily58/keymaps/curry/rules.mk +++ b/keyboards/lily58/keymaps/curry/rules.mk | |||
@@ -10,7 +10,7 @@ COMMAND_ENABLE = no | |||
10 | RGBLIGHT_ENABLE = no | 10 | RGBLIGHT_ENABLE = no |
11 | RGB_MATRIX_ENABLE = no | 11 | RGB_MATRIX_ENABLE = no |
12 | 12 | ||
13 | OLED_DRIVER_ENABLE = yes | 13 | OLED_ENABLE = yes |
14 | 14 | ||
15 | BOOTLOADER = atmel-dfu | 15 | BOOTLOADER = atmel-dfu |
16 | SPLIT_TRANSPORT = mirror | 16 | SPLIT_TRANSPORT = mirror |
diff --git a/keyboards/lily58/keymaps/cykedev/keymap.c b/keyboards/lily58/keymaps/cykedev/keymap.c index e38872356..460afb229 100644 --- a/keyboards/lily58/keymaps/cykedev/keymap.c +++ b/keyboards/lily58/keymaps/cykedev/keymap.c | |||
@@ -105,7 +105,7 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
108 | #ifdef OLED_DRIVER_ENABLE | 108 | #ifdef OLED_ENABLE |
109 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 109 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
110 | if (!is_keyboard_master()) | 110 | if (!is_keyboard_master()) |
111 | return OLED_ROTATION_180; | 111 | return OLED_ROTATION_180; |
@@ -117,5 +117,5 @@ const char *read_logo(void); | |||
117 | void oled_task_user(void) { | 117 | void oled_task_user(void) { |
118 | oled_write_ln(read_logo(), false); | 118 | oled_write_ln(read_logo(), false); |
119 | } | 119 | } |
120 | #endif // OLED_DRIVER_ENABLE | 120 | #endif // OLED_ENABLE |
121 | 121 | ||
diff --git a/keyboards/lily58/keymaps/cykedev/rules.mk b/keyboards/lily58/keymaps/cykedev/rules.mk index 442481369..30a34bd64 100644 --- a/keyboards/lily58/keymaps/cykedev/rules.mk +++ b/keyboards/lily58/keymaps/cykedev/rules.mk | |||
@@ -1,9 +1,9 @@ | |||
1 | AUTO_SHIFT_ENABLE = no | 1 | AUTO_SHIFT_ENABLE = no |
2 | OLED_DRIVER_ENABLE= yes | 2 | OLED_ENABLE= yes |
3 | 3 | ||
4 | EXTRAKEY_ENABLE = yes | 4 | EXTRAKEY_ENABLE = yes |
5 | 5 | ||
6 | SRC += ./lib/logo_reader.c | 6 | SRC += ./lib/logo_reader.c |
7 | # ./lib/keylogger.c \ | 7 | # ./lib/keylogger.c \ |
8 | # ./lib/mode_icon_reader.c \ | 8 | # ./lib/mode_icon_reader.c \ |
9 | # ./lib/timelogger.c \ | 9 | # ./lib/timelogger.c \ |
diff --git a/keyboards/lily58/keymaps/datadavd/keymap.c b/keyboards/lily58/keymaps/datadavd/keymap.c index df963b365..15bcce10b 100644 --- a/keyboards/lily58/keymaps/datadavd/keymap.c +++ b/keyboards/lily58/keymaps/datadavd/keymap.c | |||
@@ -114,8 +114,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
114 | ) | 114 | ) |
115 | }; | 115 | }; |
116 | 116 | ||
117 | //SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk | 117 | //SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk |
118 | #ifdef OLED_DRIVER_ENABLE | 118 | #ifdef OLED_ENABLE |
119 | 119 | ||
120 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 120 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
121 | if (!is_keyboard_master()) | 121 | if (!is_keyboard_master()) |
@@ -226,11 +226,11 @@ void oled_task_user(void) { | |||
226 | render_lfc_logo(); | 226 | render_lfc_logo(); |
227 | } | 227 | } |
228 | } | 228 | } |
229 | #endif // OLED_DRIVER_ENABLE | 229 | #endif // OLED_ENABLE |
230 | 230 | ||
231 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 231 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
232 | if (record->event.pressed) { | 232 | if (record->event.pressed) { |
233 | #ifdef OLED_DRIVER_ENABLE | 233 | #ifdef OLED_ENABLE |
234 | #endif | 234 | #endif |
235 | } | 235 | } |
236 | return true; | 236 | return true; |
diff --git a/keyboards/lily58/keymaps/default/keymap.c b/keyboards/lily58/keymaps/default/keymap.c index 74a1895dd..1b5b7c862 100644 --- a/keyboards/lily58/keymaps/default/keymap.c +++ b/keyboards/lily58/keymaps/default/keymap.c | |||
@@ -101,8 +101,8 @@ layer_state_t layer_state_set_user(layer_state_t state) { | |||
101 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 101 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
102 | } | 102 | } |
103 | 103 | ||
104 | //SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk | 104 | //SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk |
105 | #ifdef OLED_DRIVER_ENABLE | 105 | #ifdef OLED_ENABLE |
106 | 106 | ||
107 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 107 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
108 | if (!is_keyboard_master()) | 108 | if (!is_keyboard_master()) |
@@ -135,11 +135,11 @@ void oled_task_user(void) { | |||
135 | oled_write(read_logo(), false); | 135 | oled_write(read_logo(), false); |
136 | } | 136 | } |
137 | } | 137 | } |
138 | #endif // OLED_DRIVER_ENABLE | 138 | #endif // OLED_ENABLE |
139 | 139 | ||
140 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 140 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
141 | if (record->event.pressed) { | 141 | if (record->event.pressed) { |
142 | #ifdef OLED_DRIVER_ENABLE | 142 | #ifdef OLED_ENABLE |
143 | set_keylog(keycode, record); | 143 | set_keylog(keycode, record); |
144 | #endif | 144 | #endif |
145 | // set_timelog(); | 145 | // set_timelog(); |
diff --git a/keyboards/lily58/keymaps/default/rules.mk b/keyboards/lily58/keymaps/default/rules.mk index 881a5939f..c98eb9edf 100644 --- a/keyboards/lily58/keymaps/default/rules.mk +++ b/keyboards/lily58/keymaps/default/rules.mk | |||
@@ -13,9 +13,9 @@ MIDI_ENABLE = no # MIDI controls | |||
13 | AUDIO_ENABLE = no # Audio output on port C6 | 13 | AUDIO_ENABLE = no # Audio output on port C6 |
14 | UNICODE_ENABLE = no # Unicode | 14 | UNICODE_ENABLE = no # Unicode |
15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
17 | SWAP_HANDS_ENABLE = no # Enable one-hand typing | 17 | SWAP_HANDS_ENABLE = no # Enable one-hand typing |
18 | OLED_DRIVER_ENABLE= yes # OLED display | 18 | OLED_ENABLE= yes # OLED display |
19 | 19 | ||
20 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 20 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
21 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 21 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
diff --git a/keyboards/lily58/keymaps/drasbeck/keymap.c b/keyboards/lily58/keymaps/drasbeck/keymap.c index e575736c0..6e22f0431 100644 --- a/keyboards/lily58/keymaps/drasbeck/keymap.c +++ b/keyboards/lily58/keymaps/drasbeck/keymap.c | |||
@@ -71,8 +71,8 @@ void matrix_init_user(void) { | |||
71 | #endif | 71 | #endif |
72 | } | 72 | } |
73 | 73 | ||
74 | //SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk | 74 | //SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk |
75 | #ifdef OLED_DRIVER_ENABLE | 75 | #ifdef OLED_ENABLE |
76 | 76 | ||
77 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 77 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
78 | if (!is_keyboard_master()) | 78 | if (!is_keyboard_master()) |
@@ -105,11 +105,11 @@ void oled_task_user(void) { | |||
105 | oled_write(read_logo(), false); | 105 | oled_write(read_logo(), false); |
106 | } | 106 | } |
107 | } | 107 | } |
108 | #endif // OLED_DRIVER_ENABLE | 108 | #endif // OLED_ENABLE |
109 | 109 | ||
110 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 110 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
111 | if (record->event.pressed) { | 111 | if (record->event.pressed) { |
112 | #ifdef OLED_DRIVER_ENABLE | 112 | #ifdef OLED_ENABLE |
113 | set_keylog(keycode, record); | 113 | set_keylog(keycode, record); |
114 | #endif | 114 | #endif |
115 | // set_timelog(); | 115 | // set_timelog(); |
diff --git a/keyboards/lily58/keymaps/drasbeck/rules.mk b/keyboards/lily58/keymaps/drasbeck/rules.mk index cc91d36c5..10228e367 100644 --- a/keyboards/lily58/keymaps/drasbeck/rules.mk +++ b/keyboards/lily58/keymaps/drasbeck/rules.mk | |||
@@ -12,7 +12,8 @@ AUDIO_ENABLE = no # Audio output | |||
12 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 12 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
13 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 13 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
14 | SWAP_HANDS_ENABLE = no # Enable one-hand typing | 14 | SWAP_HANDS_ENABLE = no # Enable one-hand typing |
15 | OLED_DRIVER_ENABLE = yes # OLED display | 15 | OLED_ENABLE = yes |
16 | OLED_DRIVER = SSD1306 # OLED display | ||
16 | ENCODER_ENABLE = yes # Enable encoder | 17 | ENCODER_ENABLE = yes # Enable encoder |
17 | 18 | ||
18 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 19 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
diff --git a/keyboards/lily58/keymaps/lily58l/keymap.c b/keyboards/lily58/keymaps/lily58l/keymap.c index cf1f38d74..3db5f4ac6 100644 --- a/keyboards/lily58/keymaps/lily58l/keymap.c +++ b/keyboards/lily58/keymaps/lily58l/keymap.c | |||
@@ -126,8 +126,8 @@ layer_state_t layer_state_set_user(layer_state_t state) { | |||
126 | return state; | 126 | return state; |
127 | } | 127 | } |
128 | 128 | ||
129 | //SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk | 129 | //SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk |
130 | #ifdef OLED_DRIVER_ENABLE | 130 | #ifdef OLED_ENABLE |
131 | 131 | ||
132 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 132 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
133 | if (is_keyboard_master()) { | 133 | if (is_keyboard_master()) { |
@@ -286,7 +286,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
286 | } | 286 | } |
287 | return true; | 287 | return true; |
288 | } | 288 | } |
289 | #endif // OLED_DRIVER_ENABLE | 289 | #endif // OLED_ENABLE |
290 | 290 | ||
291 | 291 | ||
292 | // Rotary encoder related code | 292 | // Rotary encoder related code |
diff --git a/keyboards/lily58/keymaps/mikefightsbears/keymap.c b/keyboards/lily58/keymaps/mikefightsbears/keymap.c index d6e24ef3c..303e7b7d5 100644 --- a/keyboards/lily58/keymaps/mikefightsbears/keymap.c +++ b/keyboards/lily58/keymaps/mikefightsbears/keymap.c | |||
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
60 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 60 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
61 | * | | | left | dn | rght | |-------. ,-------| | home | pgdn | end | | INS | | 61 | * | | | left | dn | rght | |-------. ,-------| | home | pgdn | end | | INS | |
62 | * |------+------+------+------+------+------| | | |------+------+------+------+------+------| | 62 | * |------+------+------+------+------+------| | | |------+------+------+------+------+------| |
63 | * | | | | | | |-------| |-------| | mute | prev | next | play | | 63 | * | | | | | | |-------| |-------| | mute | prev | next | play | |
64 | * `-----------------------------------------/ / \ \-----------------------------------------' | 64 | * `-----------------------------------------/ / \ \-----------------------------------------' |
65 | * | | | | / / \ \ | | vol- | vol+ | | 65 | * | | | | / / \ \ | | vol- | vol+ | |
66 | * | | | |/ / \ \ | | | | | 66 | * | | | |/ / \ \ | | | | |
@@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
81 | * |------+------+------+------+------+------| |------+------+------+------+------+------| | 81 | * |------+------+------+------+------+------| |------+------+------+------+------+------| |
82 | * | | | left | dn | rght | |-------. ,-------| | home | pgdn | end | | INS | | 82 | * | | | left | dn | rght | |-------. ,-------| | home | pgdn | end | | INS | |
83 | * |------+------+------+------+------+------| | | |------+------+------+------+------+------| | 83 | * |------+------+------+------+------+------| | | |------+------+------+------+------+------| |
84 | * | | | | | | |-------| |-------| | mute | prev | next | play | | 84 | * | | | | | | |-------| |-------| | mute | prev | next | play | |
85 | * `-----------------------------------------/ / \ \-----------------------------------------' | 85 | * `-----------------------------------------/ / \ \-----------------------------------------' |
86 | * | | | | / / \ \ | | vol- | vol+ | | 86 | * | | | | / / \ \ | | vol- | vol+ | |
87 | * | | | |/ / \ \ | | | | | 87 | * | | | |/ / \ \ | | | | |
@@ -135,8 +135,8 @@ void matrix_init_user(void) { | |||
135 | #endif | 135 | #endif |
136 | } | 136 | } |
137 | 137 | ||
138 | //SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk | 138 | //SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk |
139 | #ifdef OLED_DRIVER_ENABLE | 139 | #ifdef OLED_ENABLE |
140 | 140 | ||
141 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 141 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
142 | if (!is_keyboard_master()) | 142 | if (!is_keyboard_master()) |
@@ -169,11 +169,11 @@ void oled_task_user(void) { | |||
169 | oled_write(read_logo(), false); | 169 | oled_write(read_logo(), false); |
170 | } | 170 | } |
171 | } | 171 | } |
172 | #endif // OLED_DRIVER_ENABLE | 172 | #endif // OLED_ENABLE |
173 | 173 | ||
174 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 174 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
175 | if (record->event.pressed) { | 175 | if (record->event.pressed) { |
176 | #ifdef OLED_DRIVER_ENABLE | 176 | #ifdef OLED_ENABLE |
177 | set_keylog(keycode, record); | 177 | set_keylog(keycode, record); |
178 | #endif | 178 | #endif |
179 | // set_timelog(); | 179 | // set_timelog(); |
diff --git a/keyboards/lily58/keymaps/mikefightsbears/rules.mk b/keyboards/lily58/keymaps/mikefightsbears/rules.mk index af0885683..f43c8e200 100644 --- a/keyboards/lily58/keymaps/mikefightsbears/rules.mk +++ b/keyboards/lily58/keymaps/mikefightsbears/rules.mk | |||
@@ -4,9 +4,9 @@ | |||
4 | # | 4 | # |
5 | EXTRAKEY_ENABLE = yes # Audio control and System control | 5 | EXTRAKEY_ENABLE = yes # Audio control and System control |
6 | NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 6 | NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
7 | RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. | 7 | RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. |
8 | SWAP_HANDS_ENABLE = no # Enable one-hand typing | 8 | SWAP_HANDS_ENABLE = no # Enable one-hand typing |
9 | OLED_DRIVER_ENABLE= yes # OLED display | 9 | OLED_ENABLE= yes # OLED display |
10 | 10 | ||
11 | # If you want to change the display of OLED, you need to change here | 11 | # If you want to change the display of OLED, you need to change here |
12 | SRC += ./lib/rgb_state_reader.c \ | 12 | SRC += ./lib/rgb_state_reader.c \ |
diff --git a/keyboards/lily58/keymaps/muuko/keymap.c b/keyboards/lily58/keymaps/muuko/keymap.c index b8afa0aa4..7ec273743 100644 --- a/keyboards/lily58/keymaps/muuko/keymap.c +++ b/keyboards/lily58/keymaps/muuko/keymap.c | |||
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
58 | ) | 58 | ) |
59 | }; | 59 | }; |
60 | 60 | ||
61 | #ifdef OLED_DRIVER_ENABLE | 61 | #ifdef OLED_ENABLE |
62 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 62 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
63 | if (!is_keyboard_master()) return OLED_ROTATION_180; | 63 | if (!is_keyboard_master()) return OLED_ROTATION_180; |
64 | else return rotation; | 64 | else return rotation; |
diff --git a/keyboards/lily58/keymaps/muuko/rules.mk b/keyboards/lily58/keymaps/muuko/rules.mk index 3f958dff3..7c38d43f8 100644 --- a/keyboards/lily58/keymaps/muuko/rules.mk +++ b/keyboards/lily58/keymaps/muuko/rules.mk | |||
@@ -1,4 +1,5 @@ | |||
1 | OLED_DRIVER_ENABLE = yes | 1 | OLED_ENABLE = yes |
2 | OLED_DRIVER = SSD1306 | ||
2 | WPM_ENABLE = yes | 3 | WPM_ENABLE = yes |
3 | EXTRAKEY_ENABLE = yes | 4 | EXTRAKEY_ENABLE = yes |
4 | COMBO_ENABLE = yes | 5 | COMBO_ENABLE = yes |
diff --git a/keyboards/lily58/keymaps/narze/keymap.c b/keyboards/lily58/keymaps/narze/keymap.c index c0c5680da..dfb51ae50 100644 --- a/keyboards/lily58/keymaps/narze/keymap.c +++ b/keyboards/lily58/keymaps/narze/keymap.c | |||
@@ -277,7 +277,7 @@ void matrix_init_user(void) { | |||
277 | #endif | 277 | #endif |
278 | } | 278 | } |
279 | 279 | ||
280 | #ifdef OLED_DRIVER_ENABLE | 280 | #ifdef OLED_ENABLE |
281 | 281 | ||
282 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 282 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
283 | if (!is_keyboard_master()) | 283 | if (!is_keyboard_master()) |
@@ -315,7 +315,7 @@ void oled_task_user(void) { | |||
315 | } | 315 | } |
316 | } | 316 | } |
317 | 317 | ||
318 | #endif //OLED_DRIVER_ENABLE | 318 | #endif //OLED_ENABLE |
319 | 319 | ||
320 | #ifdef SWAP_HANDS_ENABLE | 320 | #ifdef SWAP_HANDS_ENABLE |
321 | __attribute__ ((weak)) | 321 | __attribute__ ((weak)) |
@@ -337,7 +337,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { | |||
337 | 337 | ||
338 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 338 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
339 | if (record->event.pressed) { | 339 | if (record->event.pressed) { |
340 | #ifdef OLED_DRIVER_ENABLE | 340 | #ifdef OLED_ENABLE |
341 | set_keylog(keycode, record); | 341 | set_keylog(keycode, record); |
342 | #endif | 342 | #endif |
343 | // set_timelog(); | 343 | // set_timelog(); |
diff --git a/keyboards/lily58/keymaps/ninjonas/rules.mk b/keyboards/lily58/keymaps/ninjonas/rules.mk index 2cccbd077..b7c57d87b 100644 --- a/keyboards/lily58/keymaps/ninjonas/rules.mk +++ b/keyboards/lily58/keymaps/ninjonas/rules.mk | |||
@@ -1,2 +1,3 @@ | |||
1 | OLED_DRIVER_ENABLE = yes | 1 | OLED_ENABLE = yes |
2 | OLED_DRIVER = SSD1306 | ||
2 | LTO_ENABLE = yes | 3 | LTO_ENABLE = yes |
diff --git a/keyboards/lily58/keymaps/via/keymap.c b/keyboards/lily58/keymaps/via/keymap.c index bf46fb8e1..5cc5dc1e5 100644 --- a/keyboards/lily58/keymaps/via/keymap.c +++ b/keyboards/lily58/keymaps/via/keymap.c | |||
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
120 | ) | 120 | ) |
121 | }; | 121 | }; |
122 | 122 | ||
123 | #ifdef OLED_DRIVER_ENABLE | 123 | #ifdef OLED_ENABLE |
124 | 124 | ||
125 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 125 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
126 | if (!is_keyboard_master()) | 126 | if (!is_keyboard_master()) |
@@ -215,12 +215,12 @@ void oled_task_user(void) { | |||
215 | render_logo(); | 215 | render_logo(); |
216 | } | 216 | } |
217 | } | 217 | } |
218 | #endif // OLED_DRIVER_ENABLE | 218 | #endif // OLED_ENABLE |
219 | 219 | ||
220 | 220 | ||
221 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 221 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
222 | if (record->event.pressed) { | 222 | if (record->event.pressed) { |
223 | #ifdef OLED_DRIVER_ENABLE | 223 | #ifdef OLED_ENABLE |
224 | set_keylog(keycode, record); | 224 | set_keylog(keycode, record); |
225 | #endif | 225 | #endif |
226 | // set_timelog(); | 226 | // set_timelog(); |
diff --git a/keyboards/lily58/keymaps/via/rules.mk b/keyboards/lily58/keymaps/via/rules.mk index 03f8d38f4..d3528d52a 100644 --- a/keyboards/lily58/keymaps/via/rules.mk +++ b/keyboards/lily58/keymaps/via/rules.mk | |||
@@ -1,4 +1,5 @@ | |||
1 | VIA_ENABLE = yes | 1 | VIA_ENABLE = yes |
2 | OLED_DRIVER_ENABLE = yes | 2 | OLED_ENABLE = yes |
3 | OLED_DRIVER = SSD1306 | ||
3 | MOUSEKEY_ENABLE = yes | 4 | MOUSEKEY_ENABLE = yes |
4 | EXTRAKEY_ENABLE = yes | 5 | EXTRAKEY_ENABLE = yes |
diff --git a/keyboards/lily58/keymaps/yshrsmz/keymap.c b/keyboards/lily58/keymaps/yshrsmz/keymap.c index 545d440b4..da840e585 100644 --- a/keyboards/lily58/keymaps/yshrsmz/keymap.c +++ b/keyboards/lily58/keymaps/yshrsmz/keymap.c | |||
@@ -137,8 +137,8 @@ void matrix_init_user(void) { | |||
137 | #endif | 137 | #endif |
138 | } | 138 | } |
139 | 139 | ||
140 | //SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk | 140 | //SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk |
141 | #ifdef OLED_DRIVER_ENABLE | 141 | #ifdef OLED_ENABLE |
142 | 142 | ||
143 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 143 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
144 | if (!is_keyboard_master()) | 144 | if (!is_keyboard_master()) |
@@ -171,11 +171,11 @@ void oled_task_user(void) { | |||
171 | oled_write(read_logo(), false); | 171 | oled_write(read_logo(), false); |
172 | } | 172 | } |
173 | } | 173 | } |
174 | #endif // OLED_DRIVER_ENABLE | 174 | #endif // OLED_ENABLE |
175 | 175 | ||
176 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 176 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
177 | if (record->event.pressed) { | 177 | if (record->event.pressed) { |
178 | #ifdef OLED_DRIVER_ENABLE | 178 | #ifdef OLED_ENABLE |
179 | set_keylog(keycode, record); | 179 | set_keylog(keycode, record); |
180 | #endif | 180 | #endif |
181 | // set_timelog(); | 181 | // set_timelog(); |
diff --git a/keyboards/lily58/keymaps/yshrsmz/rules.mk b/keyboards/lily58/keymaps/yshrsmz/rules.mk index 4d481eac1..2541d64e1 100644 --- a/keyboards/lily58/keymaps/yshrsmz/rules.mk +++ b/keyboards/lily58/keymaps/yshrsmz/rules.mk | |||
@@ -1,6 +1,6 @@ | |||
1 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 1 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
2 | AUTO_SHIFT_ENABLE = yes | 2 | AUTO_SHIFT_ENABLE = yes |
3 | OLED_DRIVER_ENABLE= yes # OLED display | 3 | OLED_ENABLE= yes # OLED display |
4 | 4 | ||
5 | # If you want to change the display of OLED, you need to change here | 5 | # If you want to change the display of OLED, you need to change here |
6 | SRC += ./lib/rgb_state_reader.c \ | 6 | SRC += ./lib/rgb_state_reader.c \ |
diff --git a/keyboards/lily58/keymaps/yuchi/keymap.c b/keyboards/lily58/keymaps/yuchi/keymap.c index 37230696f..02279bb8a 100644 --- a/keyboards/lily58/keymaps/yuchi/keymap.c +++ b/keyboards/lily58/keymaps/yuchi/keymap.c | |||
@@ -119,8 +119,8 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { | |||
119 | } | 119 | } |
120 | } | 120 | } |
121 | 121 | ||
122 | //SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk | 122 | //SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk |
123 | #ifdef OLED_DRIVER_ENABLE | 123 | #ifdef OLED_ENABLE |
124 | 124 | ||
125 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 125 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
126 | if (!is_keyboard_master()) | 126 | if (!is_keyboard_master()) |
@@ -153,11 +153,11 @@ void oled_task_user(void) { | |||
153 | oled_write(read_logo(), false); | 153 | oled_write(read_logo(), false); |
154 | } | 154 | } |
155 | } | 155 | } |
156 | #endif // OLED_DRIVER_ENABLE | 156 | #endif // OLED_ENABLE |
157 | 157 | ||
158 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 158 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
159 | if (record->event.pressed) { | 159 | if (record->event.pressed) { |
160 | #ifdef OLED_DRIVER_ENABLE | 160 | #ifdef OLED_ENABLE |
161 | set_keylog(keycode, record); | 161 | set_keylog(keycode, record); |
162 | #endif | 162 | #endif |
163 | // set_timelog(); | 163 | // set_timelog(); |
diff --git a/keyboards/lily58/keymaps/yuchi/rules.mk b/keyboards/lily58/keymaps/yuchi/rules.mk index 5612aa9ef..f714be7c6 100644 --- a/keyboards/lily58/keymaps/yuchi/rules.mk +++ b/keyboards/lily58/keymaps/yuchi/rules.mk | |||
@@ -15,7 +15,7 @@ UNICODE_ENABLE = no # Unicode | |||
15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 15 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 16 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
17 | SWAP_HANDS_ENABLE = no # Enable one-hand typing | 17 | SWAP_HANDS_ENABLE = no # Enable one-hand typing |
18 | OLED_DRIVER_ENABLE= yes # OLED display | 18 | OLED_ENABLE= yes # OLED display |
19 | 19 | ||
20 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 20 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
21 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 21 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk index b2d7e648b..302cb0cdc 100644 --- a/keyboards/lily58/rules.mk +++ b/keyboards/lily58/rules.mk | |||
@@ -28,7 +28,8 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | |||
28 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 28 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
29 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 29 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
30 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 30 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
31 | OLED_DRIVER_ENABLE = yes # OLED display | 31 | OLED_ENABLE = yes |
32 | OLED_DRIVER = SSD1306 # OLED display | ||
32 | SPLIT_KEYBOARD = yes | 33 | SPLIT_KEYBOARD = yes |
33 | 34 | ||
34 | DEFAULT_FOLDER = lily58/rev1 | 35 | DEFAULT_FOLDER = lily58/rev1 |