diff options
Diffstat (limited to 'drivers/oled')
| -rw-r--r-- | drivers/oled/glcdfont.c | 11 | ||||
| -rw-r--r-- | drivers/oled/oled_driver.c | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/drivers/oled/glcdfont.c b/drivers/oled/glcdfont.c index 95c5d2ebf..de5896018 100644 --- a/drivers/oled/glcdfont.c +++ b/drivers/oled/glcdfont.c | |||
| @@ -1,13 +1,4 @@ | |||
| 1 | #pragma once | 1 | #include "progmem.h" |
| 2 | |||
| 3 | #ifdef __AVR__ | ||
| 4 | # include <avr/io.h> | ||
| 5 | # include <avr/pgmspace.h> | ||
| 6 | #elif defined(ESP8266) | ||
| 7 | # include <pgmspace.h> | ||
| 8 | #else | ||
| 9 | # define PROGMEM | ||
| 10 | #endif | ||
| 11 | 2 | ||
| 12 | // Helidox 8x6 font with QMK Firmware Logo | 3 | // Helidox 8x6 font with QMK Firmware Logo |
| 13 | // Online editor: http://teripom.x0.com/ | 4 | // Online editor: http://teripom.x0.com/ |
diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c index e541228ea..d03b2de3a 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/>. | |||
| 22 | 22 | ||
| 23 | #include <string.h> | 23 | #include <string.h> |
| 24 | 24 | ||
| 25 | #if defined(__AVR__) | 25 | #include "progmem.h" |
| 26 | # include <avr/io.h> | 26 | #ifndef __AVR__ |
| 27 | # include <avr/pgmspace.h> | ||
| 28 | #elif defined(ESP8266) | ||
| 29 | # include <pgmspace.h> | ||
| 30 | #else // defined(ESP8266) | ||
| 31 | # define PROGMEM | ||
| 32 | # define memcpy_P(des, src, len) memcpy(des, src, len) | 27 | # define memcpy_P(des, src, len) memcpy(des, src, len) |
| 33 | #endif // defined(__AVR__) | 28 | #endif |
| 34 | 29 | ||
| 35 | // Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf | 30 | // Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf |
| 36 | // for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf | 31 | // for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf |
