DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display code sanitization

Browse Source
This commit is contained in:
cyberman54 2022-08-14 16:49:30 +02:00
parent cb137109d6
commit 0af786224f
3 changed files with 122 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/display.h
View File

@ -9,8 +9,10 @@
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
#include <OneBitDisplay.h> #include <OneBitDisplay.h>
extern ONE_BIT_DISPLAY *dp;
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
#include <TFT_eSPI.h> #include <TFT_eSPI.h>
extern TFT_eSPI *dp;
#endif #endif
#define DISPLAY_PAGES (7) // number of paxcounter display pages #define DISPLAY_PAGES (7) // number of paxcounter display pages
@ -104,7 +106,6 @@ void dp_init(bool verbose = false);
void dp_shutdown(void); void dp_shutdown(void);
void dp_message(const char *msg, int line, bool invers); void dp_message(const char *msg, int line, bool invers);
void dp_drawPage(bool nextpage); void dp_drawPage(bool nextpage);
void dp_printf(const char *format, ...);
void dp_setFont(int font, int inv = 0); void dp_setFont(int font, int inv = 0);
void dp_dump(uint8_t *pBuffer = NULL); void dp_dump(uint8_t *pBuffer = NULL);
void dp_setTextCursor(int col, int row); void dp_setTextCursor(int col, int row);
@ -112,8 +113,6 @@ void dp_contrast(uint8_t contrast);
void dp_clear(void); void dp_clear(void);
void dp_power(uint8_t screenon); void dp_power(uint8_t screenon);
void dp_printqr(uint16_t offset_x, uint16_t offset_y, const char *Message); void dp_printqr(uint16_t offset_x, uint16_t offset_y, const char *Message);
void dp_fillRect(uint16_t x, uint16_t y, uint16_t width, uint16_t height,
uint8_t bRender);
void dp_scrollHorizontal(uint8_t *buf, const uint16_t width, void dp_scrollHorizontal(uint8_t *buf, const uint16_t width,
const uint16_t height, bool left = true); const uint16_t height, bool left = true);
void dp_scrollVertical(uint8_t *buf, const uint16_t width, void dp_scrollVertical(uint8_t *buf, const uint16_t width,

235
src/display.cpp
View File

@ -45,11 +45,12 @@ uint8_t DisplayIsOn = 0;
hw_timer_t *displayIRQ = NULL; hw_timer_t *displayIRQ = NULL;
static QRCode qrcode; static QRCode qrcode;
// select display driver
#ifdef HAS_DISPLAY #ifdef HAS_DISPLAY
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
static ONE_BIT_DISPLAY oled; ONE_BIT_DISPLAY *dp = NULL;
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
static TFT_eSPI tft = TFT_eSPI(MY_DISPLAY_WIDTH, MY_DISPLAY_HEIGHT); TFT_eSPI *dp = NULL;
#else #else
#error Unknown display type specified in hal file #error Unknown display type specified in hal file
#endif #endif
@ -58,20 +59,21 @@ static TFT_eSPI tft = TFT_eSPI(MY_DISPLAY_WIDTH, MY_DISPLAY_HEIGHT);
void dp_setup(int contrast) { void dp_setup(int contrast) {
#if (HAS_DISPLAY) == 1 // I2C OLED #if (HAS_DISPLAY) == 1 // I2C OLED
oled.setI2CPins(MY_DISPLAY_SDA, MY_DISPLAY_SCL, MY_DISPLAY_RST); dp = new ONE_BIT_DISPLAY;
oled.setBitBang(false); dp->setI2CPins(MY_DISPLAY_SDA, MY_DISPLAY_SCL, MY_DISPLAY_RST);
oled.I2Cbegin(OLED_TYPE, OLED_ADDR, OLED_FREQUENCY); dp->setBitBang(false);
oled.allocBuffer(); // render all outputs to lib internal backbuffer dp->I2Cbegin(OLED_TYPE, OLED_ADDR, OLED_FREQUENCY);
oled.setTextWrap(false); dp->allocBuffer(); // render all outputs to lib internal backbuffer
oled.setRotation( dp->setTextWrap(false);
dp->setRotation(
MY_DISPLAY_FLIP ? 2 : 0); // 0 = no rotation, 1 = 90°, 2 = 180°, 3 = 280° MY_DISPLAY_FLIP ? 2 : 0); // 0 = no rotation, 1 = 90°, 2 = 180°, 3 = 280°
#elif (HAS_DISPLAY) == 2 // SPI TFT #elif (HAS_DISPLAY) == 2 // SPI TFT
dp = new TFT_eSPI(MY_DISPLAY_WIDTH, MY_DISPLAY_HEIGHT);
tft.init(); dp->init();
tft.setRotation(MY_DISPLAY_FLIP ? 3 : 1); dp->setRotation(MY_DISPLAY_FLIP ? 3 : 1);
tft.invertDisplay(MY_DISPLAY_INVERT ? true : false); dp->invertDisplay(MY_DISPLAY_INVERT ? true : false);
tft.setTextColor(MY_DISPLAY_FGCOLOR, MY_DISPLAY_BGCOLOR); dp->setTextColor(MY_DISPLAY_FGCOLOR, MY_DISPLAY_BGCOLOR);
#endif #endif
@ -96,14 +98,14 @@ void dp_init(bool verbose) {
esp_chip_info(&chip_info); esp_chip_info(&chip_info);
dp_setFont(MY_FONT_NORMAL); dp_setFont(MY_FONT_NORMAL);
dp_printf("** PAXCOUNTER **\r\n"); dp->printf("** PAXCOUNTER **\r\n");
dp_printf("Software v%s\r\n", PROGVERSION); dp->printf("Software v%s\r\n", PROGVERSION);
dp_printf("ESP32 %d cores\r\n", chip_info.cores); dp->printf("ESP32 %d cores\r\n", chip_info.cores);
dp_printf("Chip Rev.%d\r\n", chip_info.revision); dp->printf("Chip Rev.%d\r\n", chip_info.revision);
dp_printf("WiFi%s%s\r\n", dp->printf("WiFi%s%s\r\n",
(chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
(chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : ""); (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
dp_printf("%dMB %s Flash", spi_flash_get_chip_size() / (1024 * 1024), dp->printf("%dMB %s Flash", spi_flash_get_chip_size() / (1024 * 1024),
(chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "int." : "ext."); (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "int." : "ext.");
// give user some time to read or take picture // give user some time to read or take picture
@ -127,10 +129,10 @@ void dp_init(bool verbose) {
const int x_offset = QR_SCALEFACTOR * 29 + 14; const int x_offset = QR_SCALEFACTOR * 29 + 14;
dp_setFont(MY_FONT_NORMAL); dp_setFont(MY_FONT_NORMAL);
dp_setTextCursor(x_offset, 0); dp_setTextCursor(x_offset, 0);
dp_printf("DEVEUI:\r\n"); dp->printf("DEVEUI:\r\n");
for (uint8_t i = 0; i <= 3; i++) { for (uint8_t i = 0; i <= 3; i++) {
dp_setTextCursor(x_offset, i * 8 + 20); dp_setTextCursor(x_offset, i * 8 + 20);
dp_printf("%4.4s", deveui + i * 4); dp->printf("%4.4s", deveui + i * 4);
} }
// give user some time to read or take picture // give user some time to read or take picture
@ -211,7 +213,7 @@ void dp_drawPage(bool nextpage) {
// show pax // show pax
dp_setFont(MY_FONT_LARGE); dp_setFont(MY_FONT_LARGE);
dp_printf("%-8d", count.pax); dp->printf("%-8d", count.pax);
dp_setFont(MY_FONT_SMALL); dp_setFont(MY_FONT_SMALL);
dp_setTextCursor(0, MY_DISPLAY_FIRSTLINE); dp_setTextCursor(0, MY_DISPLAY_FIRSTLINE);
@ -221,43 +223,43 @@ void dp_drawPage(bool nextpage) {
#if ((WIFICOUNTER) && (BLECOUNTER)) #if ((WIFICOUNTER) && (BLECOUNTER))
if (cfg.wifiscan) if (cfg.wifiscan)
dp_printf("WIFI:%-5d", count.wifi_count); dp->printf("WIFI:%-5d", count.wifi_count);
else else
dp_printf("WIFI:off"); dp->printf("WIFI:off");
if (cfg.blescan) if (cfg.blescan)
dp_printf("BLTH:%-5d", count.ble_count); dp->printf("BLTH:%-5d", count.ble_count);
else else
dp_printf(" BLTH:off"); dp->printf(" BLTH:off");
#elif ((WIFICOUNTER) && (!BLECOUNTER)) #elif ((WIFICOUNTER) && (!BLECOUNTER))
if (cfg.wifiscan) if (cfg.wifiscan)
dp_printf("WIFI:%-5d", count.wifi_count); dp->printf("WIFI:%-5d", count.wifi_count);
else else
dp_printf("WIFI:off"); dp->printf("WIFI:off");
#elif ((!WIFICOUNTER) && (BLECOUNTER)) #elif ((!WIFICOUNTER) && (BLECOUNTER))
if (cfg.blescan) if (cfg.blescan)
dp_printf("BLTH:%-5d", count.ble_count); dp->printf("BLTH:%-5d", count.ble_count);
dp_printf("BLTH:off"); dp->printf("BLTH:off");
#else #else
dp_printf("Sniffer disabled"); dp->printf("Sniffer disabled");
#endif #endif
dp_printf("\r\n"); dp->printf("\r\n");
// line 4: Battery + GPS status + Wifi channel // line 4: Battery + GPS status + Wifi channel
// B:a.bcV Sats:ab ch:ab // B:a.bcV Sats:ab ch:ab
#if (defined BAT_MEASURE_ADC || defined HAS_PMU || defined HAS_IP5306) #if (defined BAT_MEASURE_ADC || defined HAS_PMU || defined HAS_IP5306)
if (batt_level == 0) if (batt_level == 0)
dp_printf("No batt "); dp->printf("No batt ");
else else
dp_printf("Batt:%3u%% ", batt_level); dp->printf("Batt:%3u%% ", batt_level);
#else #else
dp_printf(" "); dp->printf(" ");
#endif #endif
dp_printf("chan:%02u\r\n", channel); dp->printf("chan:%02u\r\n", channel);
// line 5: RSSI limiter + free memory // line 5: RSSI limiter + free memory
// RLIM:abcd Mem:abcdKB // RLIM:abcd Mem:abcdKB
dp_printf(!cfg.rssilimit ? "RLIM:off " : "RLIM:%-4d", cfg.rssilimit); dp->printf(!cfg.rssilimit ? "RLIM:off " : "RLIM:%-4d", cfg.rssilimit);
dp_printf(" Mem:%4dKB\r\n", getFreeRAM() / 1024); dp->printf(" Mem:%4dKB\r\n", getFreeRAM() / 1024);
// line 6: time + date // line 6: time + date
// Wed Jan 12 21:49:08 * // Wed Jan 12 21:49:08 *
@ -267,15 +269,15 @@ void dp_drawPage(bool nextpage) {
time(&now); time(&now);
localtime_r(&now, &timeinfo); localtime_r(&now, &timeinfo);
strftime(strftime_buf, sizeof(strftime_buf), "%c", &timeinfo); strftime(strftime_buf, sizeof(strftime_buf), "%c", &timeinfo);
dp_printf("%.20s", strftime_buf); dp->printf("%.20s", strftime_buf);
// display inverse timeState if clock controller is enabled // display inverse timeState if clock controller is enabled
#if (defined HAS_DCF77) || (defined HAS_IF482) #if (defined HAS_DCF77) || (defined HAS_IF482)
dp_setFont(MY_FONT_SMALL, 1); dp_setFont(MY_FONT_SMALL, 1);
dp_printf("%c\r\n", timeState); dp->printf("%c\r\n", timeState);
dp_setFont(MY_FONT_SMALL, 0); dp_setFont(MY_FONT_SMALL, 0);
#else #else
dp_printf("%c\r\n", timeState); dp->printf("%c\r\n", timeState);
#endif #endif
#endif // TIME_SYNC_INTERVAL #endif // TIME_SYNC_INTERVAL
@ -284,10 +286,10 @@ void dp_drawPage(bool nextpage) {
#if (HAS_LORA) #if (HAS_LORA)
// LMiC event display // LMiC event display
dp_printf("%-16s ", lmic_event_msg); dp->printf("%-16s ", lmic_event_msg);
// LORA datarate, display inverse if ADR disabled // LORA datarate, display inverse if ADR disabled
dp_setFont(MY_FONT_SMALL, !cfg.adrmode); dp_setFont(MY_FONT_SMALL, !cfg.adrmode);
dp_printf("%-4s", getSfName(updr2rps(LMIC.datarate))); dp->printf("%-4s", getSfName(updr2rps(LMIC.datarate)));
dp_setFont(MY_FONT_SMALL, 0); dp_setFont(MY_FONT_SMALL, 0);
#endif // HAS_LORA #endif // HAS_LORA
@ -307,17 +309,17 @@ void dp_drawPage(bool nextpage) {
// show pax // show pax
dp_setFont(MY_FONT_LARGE); dp_setFont(MY_FONT_LARGE);
dp_printf("%-8d", count.pax); dp->printf("%-8d", count.pax);
dp_setFont(MY_FONT_SMALL); dp_setFont(MY_FONT_SMALL);
dp_setTextCursor(0, MY_DISPLAY_FIRSTLINE); dp_setTextCursor(0, MY_DISPLAY_FIRSTLINE);
dp_printf("Net:%06X Pwr:%-2d\r\n", LMIC.netid & 0x001FFFFF, dp->printf("Net:%06X Pwr:%-2d\r\n", LMIC.netid & 0x001FFFFF,
LMIC.radio_txpow); LMIC.radio_txpow);
dp_printf("Dev:%08X DR:%1d\r\n", LMIC.devaddr, LMIC.datarate); dp->printf("Dev:%08X DR:%1d\r\n", LMIC.devaddr, LMIC.datarate);
dp_printf("ChMsk:%04X Nonce:%04X\r\n", LMIC.channelMap, LMIC.devNonce); dp->printf("ChMsk:%04X Nonce:%04X\r\n", LMIC.channelMap, LMIC.devNonce);
dp_printf("fUp:%-6d fDn:%-6d\r\n", LMIC.seqnoUp ? LMIC.seqnoUp - 1 : 0, dp->printf("fUp:%-6d fDn:%-6d\r\n", LMIC.seqnoUp ? LMIC.seqnoUp - 1 : 0,
LMIC.seqnoDn ? LMIC.seqnoDn - 1 : 0); LMIC.seqnoDn ? LMIC.seqnoDn - 1 : 0);
dp_printf("SNR:%-5d RSSI:%-5d", (LMIC.snr + 2) / 4, LMIC.rssi); dp->printf("SNR:%-5d RSSI:%-5d", (LMIC.snr + 2) / 4, LMIC.rssi);
dp_dump(); dp_dump();
break; break;
@ -333,20 +335,20 @@ void dp_drawPage(bool nextpage) {
// show pax // show pax
dp_setFont(MY_FONT_LARGE); dp_setFont(MY_FONT_LARGE);
dp_printf("%-8d", count.pax); dp->printf("%-8d", count.pax);
// show satellite status at bottom line // show satellite status at bottom line
dp_setFont(MY_FONT_SMALL); dp_setFont(MY_FONT_SMALL);
dp_setTextCursor(0, 56); dp_setTextCursor(0, 56);
dp_printf("%u Sats", gps.satellites.value()); dp->printf("%u Sats", gps.satellites.value());
dp_printf(gps_hasfix() ? " " : " - No fix"); dp->printf(gps_hasfix() ? " " : " - No fix");
// show latitude and longitude // show latitude and longitude
dp_setFont(MY_FONT_STRETCHED); dp_setFont(MY_FONT_STRETCHED);
dp_setTextCursor(0, MY_DISPLAY_FIRSTLINE); dp_setTextCursor(0, MY_DISPLAY_FIRSTLINE);
dp_printf("%c%09.6f\r\n", gps.location.rawLat().negative ? 'S' : 'N', dp->printf("%c%09.6f\r\n", gps.location.rawLat().negative ? 'S' : 'N',
gps.location.lat()); gps.location.lat());
dp_printf("%c%09.6f", gps.location.rawLng().negative ? 'W' : 'E', dp->printf("%c%09.6f", gps.location.rawLng().negative ? 'W' : 'E',
gps.location.lng()); gps.location.lng());
dp_dump(); dp_dump();
break; break;
@ -361,11 +363,11 @@ void dp_drawPage(bool nextpage) {
#if (HAS_BME) #if (HAS_BME)
dp_setFont(MY_FONT_STRETCHED); dp_setFont(MY_FONT_STRETCHED);
dp_setTextCursor(0, 0); dp_setTextCursor(0, 0);
dp_printf("TMP: %-6.1f\r\n", bme_status.temperature); dp->printf("TMP: %-6.1f\r\n", bme_status.temperature);
dp_printf("HUM: %-6.1f\r\n", bme_status.humidity); dp->printf("HUM: %-6.1f\r\n", bme_status.humidity);
dp_printf("PRE: %-6.1f\r\n", bme_status.pressure); dp->printf("PRE: %-6.1f\r\n", bme_status.pressure);
#ifdef HAS_BME680 #ifdef HAS_BME680
dp_printf("IAQ: %-6.0f", bme_status.iaq); dp->printf("IAQ: %-6.0f", bme_status.iaq);
#endif #endif
dp_dump(); dp_dump();
break; break;
@ -382,13 +384,13 @@ void dp_drawPage(bool nextpage) {
dp_setFont(MY_FONT_STRETCHED); dp_setFont(MY_FONT_STRETCHED);
dp_setTextCursor(0, 0); dp_setTextCursor(0, 0);
dp_printf("Timeofday:"); dp->printf("Timeofday:");
dp_setTextCursor(0, 26); dp_setTextCursor(0, 26);
dp_setFont(MY_FONT_LARGE); dp_setFont(MY_FONT_LARGE);
strftime(strftime_buf, sizeof(strftime_buf), "%T", &timeinfo); strftime(strftime_buf, sizeof(strftime_buf), "%T", &timeinfo);
dp_printf("%.8s\r\n", strftime_buf); dp->printf("%.8s\r\n", strftime_buf);
dp_setFont(MY_FONT_SMALL); dp_setFont(MY_FONT_SMALL);
dp_printf("%21.1f", uptime() / 1000.0); dp->printf("%21.1f", uptime() / 1000.0);
dp_dump(); dp_dump();
break; break;
@ -418,104 +420,65 @@ void dp_drawPage(bool nextpage) {
void dp_setTextCursor(int x, int y) { void dp_setTextCursor(int x, int y) {
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
oled.setCursor(x, y); dp->setCursor(x, y);
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
tft.setCursor(x, y); dp->setCursor(x, y);
#endif #endif
} }
void dp_setFont(int font, int inv) { void dp_setFont(int font, int inv) {
// handle invers printing
if (inv)
dp->setTextColor(MY_DISPLAY_BGCOLOR, MY_DISPLAY_FGCOLOR);
else
dp->setTextColor(MY_DISPLAY_FGCOLOR, MY_DISPLAY_BGCOLOR);
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
// handle invers printing
if (inv)
oled.setTextColor(MY_DISPLAY_BGCOLOR, MY_DISPLAY_FGCOLOR);
else
oled.setTextColor(MY_DISPLAY_FGCOLOR, MY_DISPLAY_BGCOLOR);
// set desired font // set desired font
oled.setFont(font); dp->setFont(font);
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
// handle invers printing
if (inv)
tft.setTextColor(MY_DISPLAY_BGCOLOR, MY_DISPLAY_FGCOLOR);
else
tft.setTextColor(MY_DISPLAY_FGCOLOR, MY_DISPLAY_BGCOLOR);
// map desired oled font to tft font // map desired oled font to tft font
switch (font) { switch (font) {
case MY_FONT_STRETCHED: // 16x16 on OLED case MY_FONT_STRETCHED: // 16x16 on OLED
case MY_FONT_LARGE: // 16x32 on OLED case MY_FONT_LARGE: // 16x32 on OLED
tft.setTextFont(4); // 26px dp->setTextFont(4); // 26px
break; break;
case MY_FONT_SMALL: // 6x8 on OLED case MY_FONT_SMALL: // 6x8 on OLED
case MY_FONT_NORMAL: // 8x8 on OLED case MY_FONT_NORMAL: // 8x8 on OLED
default: default:
tft.setTextFont(2); // 16px dp->setTextFont(2); // 16px
break; break;
} }
#endif #endif
} }
void dp_printf(const char *format, ...) {
char loc_buf[64];
char *temp = loc_buf;
va_list arg;
va_list copy;
va_start(arg, format);
va_copy(copy, arg);
int len = vsnprintf(temp, sizeof(loc_buf), format, copy);
va_end(copy);
if (len < 0) {
va_end(arg);
return;
};
if (len >= sizeof(loc_buf)) {
temp = (char *)malloc(len + 1);
if (temp == NULL) {
va_end(arg);
return;
}
vsnprintf(temp, len + 1, format, arg);
}
va_end(arg);
#if (HAS_DISPLAY) == 1
oled.write(temp);
#elif (HAS_DISPLAY) == 2
tft.printf(temp);
#endif
if (temp != loc_buf) {
free(temp);
}
}
void dp_dump(uint8_t *pBuffer) { void dp_dump(uint8_t *pBuffer) {
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
if (pBuffer) if (pBuffer)
memcpy(oled.getBuffer(), pBuffer, PLOTBUFFERSIZE); memcpy(dp->getBuffer(), pBuffer, PLOTBUFFERSIZE);
oled.display(); dp->display();
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
if (pBuffer) if (pBuffer)
tft.drawBitmap(0, 0, pBuffer, MY_DISPLAY_WIDTH, MY_DISPLAY_HEIGHT, dp->drawBitmap(0, 0, pBuffer, MY_DISPLAY_WIDTH, MY_DISPLAY_HEIGHT,
MY_DISPLAY_FGCOLOR); MY_DISPLAY_FGCOLOR);
#endif #endif
} }
void dp_clear(void) { void dp_clear(void) {
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
oled.fillScreen(MY_DISPLAY_BGCOLOR); dp->fillScreen(MY_DISPLAY_BGCOLOR);
oled.display(); dp->display();
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
tft.fillScreen(MY_DISPLAY_BGCOLOR); dp->fillScreen(MY_DISPLAY_BGCOLOR);
#endif #endif
dp_setTextCursor(0, 0); dp_setTextCursor(0, 0);
} }
void dp_contrast(uint8_t contrast) { void dp_contrast(uint8_t contrast) {
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
oled.setContrast(contrast); dp->setContrast(contrast);
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
// to do: gamma correction for TFT // to do: gamma correction for TFT
#endif #endif
@ -523,7 +486,7 @@ void dp_contrast(uint8_t contrast) {
void dp_power(uint8_t screenon) { void dp_power(uint8_t screenon) {
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
oled.setPower(screenon); dp->setPower(screenon);
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
// to come // to come
#endif #endif
@ -531,7 +494,7 @@ void dp_power(uint8_t screenon) {
void dp_shutdown(void) { void dp_shutdown(void) {
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
oled.setPower(false); dp->setPower(false);
delay(DISPLAYREFRESH_MS / 1000 * 1.1); delay(DISPLAYREFRESH_MS / 1000 * 1.1);
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
// to come // to come
@ -542,7 +505,7 @@ void dp_shutdown(void) {
void dp_message(const char *msg, int line, bool invers) { void dp_message(const char *msg, int line, bool invers) {
dp_setFont(MY_FONT_SMALL, invers ? 1 : 0); dp_setFont(MY_FONT_SMALL, invers ? 1 : 0);
dp_setTextCursor(0, line * 8); dp_setTextCursor(0, line * 8);
dp_printf("%-16s", msg); dp->printf("%-16s", msg);
dp_dump(); dp_dump();
} // dp_message } // dp_message
@ -556,32 +519,24 @@ void dp_printqr(uint16_t offset_x, uint16_t offset_y, const char *Message) {
for (uint8_t y = 0; y < qrcode.size; y++) for (uint8_t y = 0; y < qrcode.size; y++)
for (uint8_t x = 0; x < qrcode.size; x++) for (uint8_t x = 0; x < qrcode.size; x++)
if (!qrcode_getModule(&qrcode, x, y)) // "black" if (!qrcode_getModule(&qrcode, x, y)) // "black"
dp_fillRect(x * QR_SCALEFACTOR + offset_x, dp->fillRect(x * QR_SCALEFACTOR + offset_x,
y * QR_SCALEFACTOR + offset_y, QR_SCALEFACTOR, y * QR_SCALEFACTOR + offset_y, QR_SCALEFACTOR,
QR_SCALEFACTOR, false); QR_SCALEFACTOR, MY_DISPLAY_FGCOLOR);
// draw horizontal frame lines // draw horizontal frame lines
dp_fillRect(0, 0, qrcode.size * QR_SCALEFACTOR + 2 * offset_x, offset_y, dp->fillRect(0, 0, qrcode.size * QR_SCALEFACTOR + 2 * offset_x, offset_y,
false); MY_DISPLAY_FGCOLOR);
dp_fillRect(0, qrcode.size * QR_SCALEFACTOR + offset_y, dp->fillRect(0, qrcode.size * QR_SCALEFACTOR + offset_y,
qrcode.size * QR_SCALEFACTOR + 2 * offset_x, offset_y, false); qrcode.size * QR_SCALEFACTOR + 2 * offset_x, offset_y,
MY_DISPLAY_FGCOLOR);
// draw vertical frame lines // draw vertical frame lines
dp_fillRect(0, 0, offset_x, qrcode.size * QR_SCALEFACTOR + 2 * offset_y, dp->fillRect(0, 0, offset_x, qrcode.size * QR_SCALEFACTOR + 2 * offset_y,
false); MY_DISPLAY_FGCOLOR);
dp_fillRect(qrcode.size * QR_SCALEFACTOR + offset_x, 0, offset_x, dp->fillRect(qrcode.size * QR_SCALEFACTOR + offset_x, 0, offset_x,
qrcode.size * QR_SCALEFACTOR + 2 * offset_y, false); qrcode.size * QR_SCALEFACTOR + 2 * offset_y, MY_DISPLAY_FGCOLOR);
} }
// ------------- graphics primitives ----------------- // ------------- graphics primitives -----------------
void dp_fillRect(uint16_t x, uint16_t y, uint16_t width, uint16_t height,
uint8_t bRender) {
#if (HAS_DISPLAY) == 1
oled.fillRect(x, y, width, height, MY_DISPLAY_FGCOLOR);
#elif (HAS_DISPLAY) == 2
tft.fillRect(x, y, width, height, MY_DISPLAY_FGCOLOR);
#endif
}
int dp_drawPixel(uint8_t *buf, const uint16_t x, const uint16_t y, int dp_drawPixel(uint8_t *buf, const uint16_t x, const uint16_t y,
const uint8_t dot) { const uint8_t dot) {

20
src/ota.cpp
View File

@ -51,12 +51,12 @@ void start_ota_update() {
dp_setup(); dp_setup();
dp_setFont(MY_FONT_NORMAL); dp_setFont(MY_FONT_NORMAL);
dp_printf("SOFTWARE UPDATE\r\n"); dp->printf("SOFTWARE UPDATE\r\n");
dp_printf("WiFi connect ..\r\n"); dp->printf("WiFi connect ..\r\n");
dp_printf("Has Update? ..\r\n"); dp->printf("Has Update? ..\r\n");
dp_printf("Fetching ..\r\n"); dp->printf("Fetching ..\r\n");
dp_printf("Downloading ..\r\n"); dp->printf("Downloading ..\r\n");
dp_printf("Rebooting ..\r\n"); dp->printf("Rebooting ..\r\n");
dp_dump(); dp_dump();
#endif #endif
@ -326,11 +326,11 @@ void ota_display(const uint8_t row, const std::string status,
const std::string msg) { const std::string msg) {
#ifdef HAS_DISPLAY #ifdef HAS_DISPLAY
dp_setTextCursor(14 * 8, row * 8); dp_setTextCursor(14 * 8, row * 8);
dp_printf(status.substr(0, 2).c_str()); dp->printf(status.substr(0, 2).c_str());
if (!msg.empty()) { if (!msg.empty()) {
dp_printf(" "); dp->printf(" ");
dp_printf(msg.substr(0, 16).c_str()); dp->printf(msg.substr(0, 16).c_str());
// dp_printf("\r\n"); // dp->printf("\r\n");
} }
dp_dump(); dp_dump();
#endif #endif