summaryrefslogtreecommitdiff
path: root/users/drashna/oled
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-12-30 04:18:05 +0000
committerQMK Bot <hello@qmk.fm>2021-12-30 04:18:05 +0000
commit602b0b14d5d1b67951851c9880dc426411cc65d9 (patch)
tree7ebaa2f5bb8c1a7ac87f4be84ce88ba73cd3968e /users/drashna/oled
parentdde5cd1c54fc6f93ff439666f5c421a451e4e8dd (diff)
parentc4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf (diff)
downloadqmk_firmware-602b0b14d5d1b67951851c9880dc426411cc65d9.tar.gz
qmk_firmware-602b0b14d5d1b67951851c9880dc426411cc65d9.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users/drashna/oled')
-rw-r--r--users/drashna/oled/drashna_font.h4
-rw-r--r--users/drashna/oled/oled_stuff.c9
-rw-r--r--users/drashna/oled/readme.md42
3 files changed, 45 insertions, 10 deletions
diff --git a/users/drashna/oled/drashna_font.h b/users/drashna/oled/drashna_font.h
index 844292a53a..7ba03c4c13 100644
--- a/users/drashna/oled/drashna_font.h
+++ b/users/drashna/oled/drashna_font.h
@@ -3,8 +3,8 @@
// additional fonts from
// https://github.com/datacute/TinyOLED-Fonts
-#if __has_include("../../../../Documents/qmk/oled_font.h")
-# include "../../../../Documents/qmk/oled_font.h"
+#if __has_include("oled_font.h")
+# include "oled_font.h"
#else
// additional fonts from
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index 8894814985..26411305e7 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) {
void render_matrix_scan_rate(void) {
#ifdef DEBUG_MATRIX_SCAN_RATE
- char matrix_rate[5];
- uint16_t n = get_matrix_scan_rate();
- matrix_rate[4] = '\0';
- matrix_rate[3] = '0' + n % 10;
- matrix_rate[2] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
- matrix_rate[1] = n / 10 ? '0' + n / 10 : ' ';
- matrix_rate[0] = ' ';
oled_write_P(PSTR("MS:"), false);
- oled_write(matrix_rate, false);
+ oled_write(get_u16_str(get_matrix_scan_rate(), ' '), false);
#endif
}
diff --git a/users/drashna/oled/readme.md b/users/drashna/oled/readme.md
new file mode 100644
index 0000000000..dbb8187d49
--- /dev/null
+++ b/users/drashna/oled/readme.md
@@ -0,0 +1,42 @@
+# OLED Display
+
+To disable the pre genrated oled display, add `CUSTOM_OLED_DRIVER = no` to your `rules.mk`.
+
+<!-- to do: add all the stuff -->
+## OLED Font
+
+My font file has multiple fonts and multiple logs integrated into the one file. And it uses the full 255 possible characters.
+
+In addition to the default font and logos:
+
+```c
+# define OLED_FONT_5X5
+# define OLED_FONT_AZTECH
+# define OLED_FONT_BMPLAIN
+# define OLED_FONT_CRACKERS
+# define OLED_FONT_EIN
+# define OLED_FONT_HISKYF21
+# define OLED_FONT_SQUASH
+# define OLED_FONT_SUPER_DIGG
+# define OLED_FONT_ZXPIX
+```
+
+```c
+# define OLED_LOGO_CORNE
+# define OLED_LOGO_GMK_BAD
+# define OLED_LOGO_GOTHAM
+# define OLED_LOGO_HUE_MANITEE
+# define OLED_LOGO_LOOSE
+# define OLED_LOGO_SETS3N
+# define OLED_LOGO_SKEEB
+```
+
+Additionally, the font file allows for external oled font files, instead. This allows for additional files that cannot be hosted in the QMK Repo.
+
+## Display
+
+A picture is worth a thousand words. So here are two:
+
+![Right](https://i.imgur.com/4XFOVKBl.jpg)
+
+![Left](https://i.imgur.com/W5RX4pAl.jpg)