diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-12-29 20:17:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-29 20:17:34 -0800 |
| commit | c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf (patch) | |
| tree | 67dc381a45d59626132c4c59b71c4b36fa971f8b /users/drashna/oled | |
| parent | 1a8a842cfb3e87a82afb57ba29ca59c5fa6fe97b (diff) | |
| download | qmk_firmware-c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf.tar.gz qmk_firmware-c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf.zip | |
[Keymap] Reorganization, cleanup and readmes for drashna code (#15617)
Diffstat (limited to 'users/drashna/oled')
| -rw-r--r-- | users/drashna/oled/drashna_font.h | 4 | ||||
| -rw-r--r-- | users/drashna/oled/oled_stuff.c | 9 | ||||
| -rw-r--r-- | users/drashna/oled/readme.md | 42 |
3 files changed, 45 insertions, 10 deletions
diff --git a/users/drashna/oled/drashna_font.h b/users/drashna/oled/drashna_font.h index 844292a53..7ba03c4c1 100644 --- a/users/drashna/oled/drashna_font.h +++ b/users/drashna/oled/drashna_font.h | |||
| @@ -3,8 +3,8 @@ | |||
| 3 | // additional fonts from | 3 | // additional fonts from |
| 4 | // https://github.com/datacute/TinyOLED-Fonts | 4 | // https://github.com/datacute/TinyOLED-Fonts |
| 5 | 5 | ||
| 6 | #if __has_include("../../../../Documents/qmk/oled_font.h") | 6 | #if __has_include("oled_font.h") |
| 7 | # include "../../../../Documents/qmk/oled_font.h" | 7 | # include "oled_font.h" |
| 8 | #else | 8 | #else |
| 9 | 9 | ||
| 10 | // additional fonts from | 10 | // additional fonts from |
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c index 9ee2cbfed..de8476672 100644 --- a/users/drashna/oled/oled_stuff.c +++ b/users/drashna/oled/oled_stuff.c | |||
| @@ -162,15 +162,8 @@ void render_keylock_status(uint8_t led_usb_state) { | |||
| 162 | 162 | ||
| 163 | void render_matrix_scan_rate(void) { | 163 | void render_matrix_scan_rate(void) { |
| 164 | #ifdef DEBUG_MATRIX_SCAN_RATE | 164 | #ifdef DEBUG_MATRIX_SCAN_RATE |
| 165 | char matrix_rate[5]; | ||
| 166 | uint16_t n = get_matrix_scan_rate(); | ||
| 167 | matrix_rate[4] = '\0'; | ||
| 168 | matrix_rate[3] = '0' + n % 10; | ||
| 169 | matrix_rate[2] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' '; | ||
| 170 | matrix_rate[1] = n / 10 ? '0' + n / 10 : ' '; | ||
| 171 | matrix_rate[0] = ' '; | ||
| 172 | oled_write_P(PSTR("MS:"), false); | 165 | oled_write_P(PSTR("MS:"), false); |
| 173 | oled_write(matrix_rate, false); | 166 | oled_write(get_u16_str(get_matrix_scan_rate(), ' '), false); |
| 174 | #endif | 167 | #endif |
| 175 | } | 168 | } |
| 176 | 169 | ||
diff --git a/users/drashna/oled/readme.md b/users/drashna/oled/readme.md new file mode 100644 index 000000000..dbb8187d4 --- /dev/null +++ b/users/drashna/oled/readme.md | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | # OLED Display | ||
| 2 | |||
| 3 | To disable the pre genrated oled display, add `CUSTOM_OLED_DRIVER = no` to your `rules.mk`. | ||
| 4 | |||
| 5 | <!-- to do: add all the stuff --> | ||
| 6 | ## OLED Font | ||
| 7 | |||
| 8 | My font file has multiple fonts and multiple logs integrated into the one file. And it uses the full 255 possible characters. | ||
| 9 | |||
| 10 | In addition to the default font and logos: | ||
| 11 | |||
| 12 | ```c | ||
| 13 | # define OLED_FONT_5X5 | ||
| 14 | # define OLED_FONT_AZTECH | ||
| 15 | # define OLED_FONT_BMPLAIN | ||
| 16 | # define OLED_FONT_CRACKERS | ||
| 17 | # define OLED_FONT_EIN | ||
| 18 | # define OLED_FONT_HISKYF21 | ||
| 19 | # define OLED_FONT_SQUASH | ||
| 20 | # define OLED_FONT_SUPER_DIGG | ||
| 21 | # define OLED_FONT_ZXPIX | ||
| 22 | ``` | ||
| 23 | |||
| 24 | ```c | ||
| 25 | # define OLED_LOGO_CORNE | ||
| 26 | # define OLED_LOGO_GMK_BAD | ||
| 27 | # define OLED_LOGO_GOTHAM | ||
| 28 | # define OLED_LOGO_HUE_MANITEE | ||
| 29 | # define OLED_LOGO_LOOSE | ||
| 30 | # define OLED_LOGO_SETS3N | ||
| 31 | # define OLED_LOGO_SKEEB | ||
| 32 | ``` | ||
| 33 | |||
| 34 | Additionally, the font file allows for external oled font files, instead. This allows for additional files that cannot be hosted in the QMK Repo. | ||
| 35 | |||
| 36 | ## Display | ||
| 37 | |||
| 38 | A picture is worth a thousand words. So here are two: | ||
| 39 | |||
| 40 |  | ||
| 41 | |||
| 42 |  | ||
