summaryrefslogtreecommitdiff
path: root/drivers/oled
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-03-01 17:56:50 +1100
committerGitHub <noreply@github.com>2020-03-01 17:56:50 +1100
commitc9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8 (patch)
tree14c44c3670da10f6e286ad4e14e6af2bc5cc015f /drivers/oled
parentf513a9193cdde47d1da7f647088beec8f280e4f3 (diff)
downloadqmk_firmware-c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8.tar.gz
qmk_firmware-c9e3fa6f702d7b814c408f1476e43ce6cdd8f7d8.zip
Clean up includes for glcdfont headers (#7745)
* Clean up includes for glcdfont headers * Remove pragma once, most of these are not headers * Missed these
Diffstat (limited to 'drivers/oled')
-rw-r--r--drivers/oled/glcdfont.c11
-rw-r--r--drivers/oled/oled_driver.c11
2 files changed, 4 insertions, 18 deletions
diff --git a/drivers/oled/glcdfont.c b/drivers/oled/glcdfont.c
index 95c5d2ebf4..de58960189 100644
--- a/drivers/oled/glcdfont.c
+++ b/drivers/oled/glcdfont.c
@@ -1,13 +1,4 @@
-#pragma once
-
-#ifdef __AVR__
-# include <avr/io.h>
-# include <avr/pgmspace.h>
-#elif defined(ESP8266)
-# include <pgmspace.h>
-#else
-# define PROGMEM
-#endif
+#include "progmem.h"
// Helidox 8x6 font with QMK Firmware Logo
// Online editor: http://teripom.x0.com/
diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c
index e541228ea9..d03b2de3a2 100644
--- a/drivers/oled/oled_driver.c
+++ b/drivers/oled/oled_driver.c
@@ -22,15 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <string.h>
-#if defined(__AVR__)
-# include <avr/io.h>
-# include <avr/pgmspace.h>
-#elif defined(ESP8266)
-# include <pgmspace.h>
-#else // defined(ESP8266)
-# define PROGMEM
+#include "progmem.h"
+#ifndef __AVR__
# define memcpy_P(des, src, len) memcpy(des, src, len)
-#endif // defined(__AVR__)
+#endif
// Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
// for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf