mirror of
https://github.com/qmk/qmk_firmware
synced 2024-11-19 11:46:08 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
4df91985f7
2 changed files with 3 additions and 3 deletions
|
@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef OLED_DRIVER_ENABLE
|
#ifdef OLED_ENABLE
|
||||||
/*=========================================== OLED CONFIGURATION ===========================================*/
|
/*=========================================== OLED CONFIGURATION ===========================================*/
|
||||||
bool oled_horizontal = true; // OLED rotation (true = horizontal, false = vertical)
|
bool oled_horizontal = true; // OLED rotation (true = horizontal, false = vertical)
|
||||||
bool ansi_layout = true; // ANSI or ISO layout (true = ANSI, false = ISO)
|
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
|
// Forwards keystrokes from an external input device over UART/TRRS
|
||||||
process_record_remote_kb(keycode, record);
|
process_record_remote_kb(keycode, record);
|
||||||
|
|
||||||
#ifdef OLED_DRIVER_ENABLE
|
#ifdef OLED_ENABLE
|
||||||
// Toggle pixels surrounding key
|
// Toggle pixels surrounding key
|
||||||
render_keymap(record->event.key.row, record->event.key.col, record->event.pressed);
|
render_keymap(record->event.key.row, record->event.key.col, record->event.pressed);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
OLED_DRIVER_ENABLE = yes
|
OLED_ENABLE = yes
|
||||||
WPM_ENABLE = yes
|
WPM_ENABLE = yes
|
||||||
SPACE_CADET_ENABLE = no
|
SPACE_CADET_ENABLE = no
|
||||||
GRAVE_ESC_ENABLE = no
|
GRAVE_ESC_ENABLE = no
|
||||||
|
|
Loading…
Reference in a new issue