Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-09-01 09:49:03 +00:00
commit 4df91985f7
2 changed files with 3 additions and 3 deletions

View file

@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
/*=========================================== OLED CONFIGURATION ===========================================*/
bool oled_horizontal = true; // OLED rotation (true = horizontal, false = vertical)
bool ansi_layout = true; // ANSI or ISO layout (true = ANSI, false = ISO)
@ -464,7 +464,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// Forwards keystrokes from an external input device over UART/TRRS
process_record_remote_kb(keycode, record);
#ifdef OLED_DRIVER_ENABLE
#ifdef OLED_ENABLE
// Toggle pixels surrounding key
render_keymap(record->event.key.row, record->event.key.col, record->event.pressed);
#endif

View file

@ -1,4 +1,4 @@
OLED_DRIVER_ENABLE = yes
OLED_ENABLE = yes
WPM_ENABLE = yes
SPACE_CADET_ENABLE = no
GRAVE_ESC_ENABLE = no