diff options
| author | Drashna Jaelre <drashna@live.com> | 2023-05-31 11:44:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-31 11:44:06 -0700 |
| commit | 3a3e5abac992712a8bb4e9b61430f5fc62dc6043 (patch) | |
| tree | 832d14c0ca63e13ca1b97e2cbfe94d75d6bb89c7 /keyboards/bastardkb/dilemma/3x5_2/keymaps | |
| parent | 1411c79aefc989f5fae138b795f53f3b10863ec9 (diff) | |
[Keymap] Drashna Keymap updates for 0.21.0 (#21073)
Diffstat (limited to 'keyboards/bastardkb/dilemma/3x5_2/keymaps')
3 files changed, 2 insertions, 11 deletions
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h index d7b1351d89..7c46c83310 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/config.h @@ -6,3 +6,5 @@ #define CIRQUE_PINNACLE_TAP_ENABLE #define POINTING_DEVICE_GESTURES_CURSOR_GLIDE_ENABLE #define POINTING_DEVICE_GESTURES_SCROLL_ENABLE + +#define OLED_DISPLAY_128X128 diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c index d80d006796..bf75e97841 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/keymap.c @@ -84,14 +84,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { - for (int32_t i = 0; i < 40; i++) { - __asm__ volatile("nop" ::: "memory"); - } -} - - #if defined(OLED_ENABLE) && defined(OLED_DISPLAY_128X128) # ifdef UNICODE_COMMON_ENABLE # include "process_unicode_common.h" @@ -100,8 +92,6 @@ void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { extern const char PROGMEM display_border[3]; - -extern uint32_t oled_timer; extern bool is_oled_enabled; diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk index 41d73bc49a..a1be9cb8fd 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/rules.mk @@ -5,4 +5,3 @@ CONSOLE_ENABLE = yes KEYLOGGER_ENABLE = no WPM_ENABLE = yes OLED_ENABLE = yes -OLED_DRIVER = custom |