diff options
author | Drashna Jaelre <drashna@live.com> | 2022-01-30 13:20:33 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-30 13:20:33 -0800 |
commit | 941b1d35b8e40a9c93301a1131ef3f3336fee0b5 (patch) | |
tree | 54c8d1ec131d5c8a6e0dd89364a9840b3925fcdd /keyboards/splitkb | |
parent | 3555ee0555c8a9ff8aea2a101ae02a72b0e76076 (diff) | |
download | qmk_firmware-941b1d35b8e40a9c93301a1131ef3f3336fee0b5.tar.gz qmk_firmware-941b1d35b8e40a9c93301a1131ef3f3336fee0b5.zip |
[Keymap] Add oled improvements and cnano keymap for drashna (#16133)
Diffstat (limited to 'keyboards/splitkb')
-rw-r--r-- | keyboards/splitkb/kyria/keymaps/drashna/config.h | 13 | ||||
-rw-r--r-- | keyboards/splitkb/kyria/keymaps/drashna/keymap.c | 27 | ||||
-rw-r--r-- | keyboards/splitkb/kyria/keymaps/drashna/rules.mk | 2 |
3 files changed, 38 insertions, 4 deletions
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/config.h b/keyboards/splitkb/kyria/keymaps/drashna/config.h index 8239e28cd..89a162a9b 100644 --- a/keyboards/splitkb/kyria/keymaps/drashna/config.h +++ b/keyboards/splitkb/kyria/keymaps/drashna/config.h | |||
@@ -19,17 +19,21 @@ | |||
19 | #define EE_HANDS | 19 | #define EE_HANDS |
20 | 20 | ||
21 | #ifdef OLED_ENABLE | 21 | #ifdef OLED_ENABLE |
22 | # define OLED_DISPLAY_128X64 | 22 | # ifdef OLED_DRIVER_SH1107 |
23 | # undef OLED_DISPLAY_128X64 | ||
24 | # define OLED_DISPLAY_128X128 | ||
25 | # endif | ||
23 | #endif | 26 | #endif |
24 | 27 | ||
25 | #ifdef RGBLIGHT_ENABLE | 28 | #ifdef RGBLIGHT_ENABLE |
26 | # define RGBLIGHT_SLEEP | 29 | # define RGBLIGHT_SLEEP |
27 | # define RGBLIGHT_LIMIT_VAL 200 | 30 | # undef RGBLIGHT_LIMIT_VAL |
31 | # define RGBLIGHT_LIMIT_VAL 120 | ||
28 | # define RGBLIGHT_HUE_STEP 8 | 32 | # define RGBLIGHT_HUE_STEP 8 |
29 | # define RGBLIGHT_SAT_STEP 8 | 33 | # define RGBLIGHT_SAT_STEP 8 |
30 | # define RGBLIGHT_VAL_STEP 8 | 34 | # define RGBLIGHT_VAL_STEP 8 |
31 | # define RGBLIGHT_SPLIT | 35 | # define RGBLIGHT_SPLIT |
32 | // # define RGBLIGHT_LAYERS | 36 | # define RGBLIGHT_LAYERS |
33 | #endif | 37 | #endif |
34 | 38 | ||
35 | #define KEYLOGGER_LENGTH 10 | 39 | #define KEYLOGGER_LENGTH 10 |
@@ -41,3 +45,6 @@ | |||
41 | #define BOOTMAGIC_LITE_COLUMN 7 | 45 | #define BOOTMAGIC_LITE_COLUMN 7 |
42 | #define BOOTMAGIC_LITE_ROW_RIGHT 4 | 46 | #define BOOTMAGIC_LITE_ROW_RIGHT 4 |
43 | #define BOOTMAGIC_LITE_COLUMN_RIGHT 7 | 47 | #define BOOTMAGIC_LITE_COLUMN_RIGHT 7 |
48 | |||
49 | #define I2C1_CLOCK_SPEED 400000 | ||
50 | #define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 | ||
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c index 1346616b2..41ef4b270 100644 --- a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c | |||
@@ -121,7 +121,32 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { | |||
121 | // clang-format on | 121 | // clang-format on |
122 | 122 | ||
123 | #ifdef OLED_ENABLE | 123 | #ifdef OLED_ENABLE |
124 | oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_180; } | 124 | oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { |
125 | #ifdef OLED_DRIVER_SH1107 | ||
126 | return OLED_ROTATION_0; | ||
127 | #else | ||
128 | return OLED_ROTATION_180; | ||
129 | #endif | ||
130 | } | ||
131 | |||
132 | void oled_render_large_display(void) { | ||
133 | if (is_keyboard_left()) { | ||
134 | render_wpm_graph(54, 64); | ||
135 | } else { | ||
136 | static const char PROGMEM kyria_logo[] = { | ||
137 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
138 | 0, 0, 0, 0, 0, 0, 0,192,224,240,124, 62, 31, 15, 7, 3, 1,128,192,224,240,120, 56, 60, 28, 30, 14, 14, 7, 7,135,231,127, 31,255,255, 31,127,231,135, 7, 7, 14, 14, 30, 28, 60, 56,120,240,224,192,128, 1, 3, 7, 15, 31, 62,124,240,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
139 | 0, 0, 0, 0,240,252,255, 31, 7, 1, 0, 0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135, 1, 0, 0,255,255, 0, 0, 1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192, 0, 0, 1, 7, 31,255,252,240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
140 | 0, 0, 0,255,255,255, 0, 0, 0, 0, 0,254,255,255, 1, 1, 7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30, 7, 1, 1,255,255,254, 0, 0, 0, 0, 0,255,255,255, 0, 0, 0, 0,255,255, 0, 0,192,192, 48, 48, 0, 0,240,240, 0, 0, 0, 0, 0, 0,240,240, 0, 0,240,240,192,192, 48, 48, 48, 48,192,192, 0, 0, 48, 48,243,243, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48,192,192, 0, 0, 0, 0, 0, | ||
141 | 0, 0, 0,255,255,255, 0, 0, 0, 0, 0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31, 7,255,255, 7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127, 0, 0, 0, 0, 0,255,255,255, 0, 0, 0, 0, 63, 63, 3, 3, 12, 12, 48, 48, 0, 0, 0, 0, 51, 51, 51, 51, 51, 51, 15, 15, 0, 0, 63, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 63, 63, 48, 48, 0, 0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63, 0, 0, 0, 0, 0, | ||
142 | 0, 0, 0, 0, 15, 63,255,248,224,128, 0, 0, 3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128, 0, 0,255,255, 0, 0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15, 3, 0, 0,128,224,248,255, 63, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
143 | 0, 0, 0, 0, 0, 0, 0, 3, 7, 15, 62,124,248,240,224,192,128, 1, 3, 7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15, 7, 3, 1,128,192,224,240,248,124, 62, 15, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
144 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15, 7, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 | ||
145 | }; | ||
146 | // clang-format on | ||
147 | oled_write_raw_P(kyria_logo, sizeof(kyria_logo)); | ||
148 | } | ||
149 | } | ||
125 | #endif | 150 | #endif |
126 | 151 | ||
127 | #ifdef ENCODER_ENABLE | 152 | #ifdef ENCODER_ENABLE |
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk index 3cdfe1bec..ddba0780a 100644 --- a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk +++ b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk | |||
@@ -20,8 +20,10 @@ ifeq ($(strip $(KEYBOARD)), splitkb/kyria/rev1/proton_c) | |||
20 | CTPC = yes | 20 | CTPC = yes |
21 | AUTOCORRECTION_ENABLE = yes | 21 | AUTOCORRECTION_ENABLE = yes |
22 | CAPS_WORD_ENABLE = yes | 22 | CAPS_WORD_ENABLE = yes |
23 | DEBUG_MATRIX_SCAN_RATE_ENABLE = api | ||
23 | else | 24 | else |
24 | LTO_ENABLE = yes | 25 | LTO_ENABLE = yes |
25 | BOOTLOADER = qmk-hid | 26 | BOOTLOADER = qmk-hid |
26 | BOOTLOADER_SIZE = 512 | 27 | BOOTLOADER_SIZE = 512 |
28 | CUSTOM_UNICODE_ENABLE = no | ||
27 | endif | 29 | endif |