From db7b418d3cd50282c116b22f91d75aef57c540eb Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Thu, 18 Jul 2019 08:37:09 -0700 Subject: [PATCH] update type for fonts (char* -> uint8_t*) --- ESPNTPServer/DialogInput_plain_10.h | 2 +- ESPNTPServer/Display.cpp | 2 +- ESPNTPServer/Display.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ESPNTPServer/DialogInput_plain_10.h b/ESPNTPServer/DialogInput_plain_10.h index 40683ba..5fefd6e 100644 --- a/ESPNTPServer/DialogInput_plain_10.h +++ b/ESPNTPServer/DialogInput_plain_10.h @@ -10,7 +10,7 @@ // Created by http://oleddisplay.squix.ch/ Consider a donation // In case of problems make sure that you are using the font file with the correct version! -const char DialogInput_plain_10[] PROGMEM = { +const uint8_t DialogInput_plain_10[] PROGMEM = { 0x06, // Width: 6 0x0D, // Height: 13 0x20, // First Char: 32 diff --git a/ESPNTPServer/Display.cpp b/ESPNTPServer/Display.cpp index c42e969..fa24a0c 100644 --- a/ESPNTPServer/Display.cpp +++ b/ESPNTPServer/Display.cpp @@ -145,7 +145,7 @@ void Display::display() _dsp.display(); } -void Display::font(const char* fontData) +void Display::font(const uint8_t* fontData) { _dsp.setFont(fontData); } diff --git a/ESPNTPServer/Display.h b/ESPNTPServer/Display.h index c09dd0f..fc8c101 100644 --- a/ESPNTPServer/Display.h +++ b/ESPNTPServer/Display.h @@ -29,7 +29,7 @@ public: void clear(); void display(); void align(OLEDDISPLAY_TEXT_ALIGNMENT alignment); - void font(const char* fontData); + void font(const uint8_t* fontData); void print(int16_t x, int16_t y, const char* fmt, ...); void vprint(int16_t x, int16_t y, const char* fmt, va_list ap);