drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

[Core] Refactor OLED to allow easy addition of other types (#13454)

Browse source 
* 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>
This commit is contained in:
Xelus22 2021-08-24 16:28:26 +10:00 • committed by GitHub
parent 6fd20acf4b
commit 4e1c5887c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
500 changed files with 1579 additions and 1387 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboards/palette1202/config.h
View file

@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEBOUNCE 5
/* Register custom font file */
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
#define OLED_FONT_H "lib/glcdfont.c"
#endif

6
keyboards/palette1202/keymaps/default/keymap.c
View file

@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
#include <string.h>
#include "lib/oled_helper.h"
#endif
@ -273,7 +273,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
// OLED Display
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
void oled_task_user(void) {
// get layer Number
uint8_t currentDefault = get_highest_layer(default_layer_state);
@ -327,4 +327,4 @@ void oled_task_user(void) {
render_row(3, " ");
}
}
#endif // #ifdef OLED_DRIVER_ENABLE
#endif // #ifdef OLED_ENABLE

6
keyboards/palette1202/keymaps/key-check/keymap.c
View file

@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
#include <string.h>
#include "lib/oled_helper.h"
#endif
@ -141,11 +141,11 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
// OLED Display
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
void oled_task_user(void) {
render_row(0, "TEST");
render_row(1, "test");
render_row(2, "TEST");
render_row(3, "test");
}
#endif // #ifdef OLED_DRIVER_ENABLE
#endif // #ifdef OLED_ENABLE

2
keyboards/palette1202/lib/oled_helper.c
View file

@ -1,4 +1,4 @@
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
#include QMK_KEYBOARD_H
#include <stdio.h>
#include <string.h>

6
keyboards/palette1202/lib/oled_helper.h
View file

@ -1,7 +1,7 @@
#pragma once
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
void render_row(int row, const char* status);
#endif /* #ifdef OLED_DRIVER_ENABLE */
#endif /* #ifdef OLED_ENABLE */

3
keyboards/palette1202/palette1202.c
View file

@ -16,9 +16,8 @@
#include "palette1202.h"
// initialize OLED if OLED is enabled
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
return OLED_ROTATION_180;
}
#endif

3
keyboards/palette1202/rules.mk
View file

@ -28,7 +28,8 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
ENCODER_ENABLE = yes # Enable support for rotary encoders
OLED_DRIVER_ENABLE = yes # Enable support for OLED display
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enable support for OLED display
# Additional code
SRC += lib/oled_helper.c # Adding OLED