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

M5 display support (experimental)

Browse Source
This commit is contained in:
Klaus K Wilting 2020-04-06 17:40:45 +02:00
parent 59930870fd
commit 4584a5a34b
3 changed files with 148 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/display.h
View File

@ -69,9 +69,9 @@
#endif #endif
// settings for qr code generator // settings for qr code generator
#define QR_VERSION 3 // 29 x 29px #define QR_VERSION 3 // 29 x 29px
#define QR_SCALEFACTOR MY_DISPLAY_HEIGHT / (29 + 4) // 4px borderlines
const uint8_t QR_SCALEFACTOR = (MY_DISPLAY_HEIGHT - 4) / 29; // 4px borderlines
extern uint8_t DisplayIsOn, displaybuf[]; extern uint8_t DisplayIsOn, displaybuf[];
void dp_setup(int contrast = 0); void dp_setup(int contrast = 0);
@ -79,11 +79,12 @@ void dp_refresh(bool nextPage = false);
void dp_init(bool verbose = false); void dp_init(bool verbose = false);
void dp_shutdown(void); void dp_shutdown(void);
void dp_drawPage(time_t t, bool nextpage); void dp_drawPage(time_t t, bool nextpage);
void dp_println(void); void dp_println(int lines = 1);
void dp_printf(uint16_t x, uint16_t y, uint8_t font, uint8_t inv, void dp_printf(const char *format, ...);
const char *format, ...); void dp_setFont(int font, int inv = 0);
void dp_dump(uint8_t *pBuffer); void dp_dump(uint8_t *pBuffer);
void dp_setCursor(int x, int y); void dp_setCursor(int x, int y);
void dp_setTextCursor(int col, int row);
void dp_contrast(uint8_t contrast); 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);

240
src/display.cpp
View File

@ -45,6 +45,7 @@ const char *printmonth[] = {"xxx", "Jan", "Feb", "Mar", "Apr", "May", "Jun",
uint8_t DisplayIsOn = 0; uint8_t DisplayIsOn = 0;
uint8_t displaybuf[MY_DISPLAY_WIDTH * MY_DISPLAY_HEIGHT / 8] = {0}; uint8_t displaybuf[MY_DISPLAY_WIDTH * MY_DISPLAY_HEIGHT / 8] = {0};
static uint8_t plotbuf[MY_DISPLAY_WIDTH * MY_DISPLAY_HEIGHT / 8] = {0}; static uint8_t plotbuf[MY_DISPLAY_WIDTH * MY_DISPLAY_HEIGHT / 8] = {0};
static int dp_row = 0, dp_col = 0, dp_font = 0;
QRCode qrcode; QRCode qrcode;
@ -66,6 +67,7 @@ void dp_setup(int contrast) {
// set display buffer // set display buffer
oledSetBackBuffer(&ssoled, displaybuf); oledSetBackBuffer(&ssoled, displaybuf);
oledSetTextWrap(&ssoled, true); oledSetTextWrap(&ssoled, true);
dp_font = MY_FONT_NORMAL;
#elif (HAS_DISPLAY) == 2 // SPI TFT #elif (HAS_DISPLAY) == 2 // SPI TFT
@ -102,15 +104,20 @@ void dp_init(bool verbose) {
#if (VERBOSE) #if (VERBOSE)
esp_chip_info_t chip_info; esp_chip_info_t chip_info;
esp_chip_info(&chip_info); esp_chip_info(&chip_info);
dp_printf(0, 0, 0, 0, "** PAXCOUNTER **");
dp_printf(0, 1, 0, 0, "Software v%s", PROGVERSION); dp_setFont(MY_FONT_NORMAL);
dp_printf(0, 3, 0, 0, "ESP32 %d cores", chip_info.cores); dp_printf("** PAXCOUNTER **");
dp_printf(0, 4, 0, 0, "Chip Rev.%d", chip_info.revision); dp_println();
dp_printf(0, 5, 0, 0, "WiFi%s%s", dp_printf("Software v%s", PROGVERSION);
(chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", dp_println();
dp_printf("ESP32 %d cores", chip_info.cores);
dp_println();
dp_printf("Chip Rev.%d", chip_info.revision);
dp_println();
dp_printf("WiFi%s%s", (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
(chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : ""); (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
dp_printf(0, 6, 0, 0, "%dMB %s Flash", dp_println();
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." (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "int."
: "ext."); : "ext.");
@ -132,16 +139,14 @@ void dp_init(bool verbose) {
dp_printqr(3, 3, deveui); dp_printqr(3, 3, deveui);
// display DEVEUI as plain text on the right // display DEVEUI as plain text on the right
const int x_offset = QR_SCALEFACTOR * 29 + 20; const int x_offset = (QR_SCALEFACTOR * 29 + 4) / 8 + 2;
dp_setCursor(x_offset, 1); dp_setTextCursor(x_offset, 0);
dp_printf(x_offset, 1, MY_FONT_NORMAL, 0, "DEVEUI:"); dp_setFont(MY_FONT_NORMAL);
dp_printf("DEVEUI");
dp_println();
for (uint8_t i = 0; i <= 3; i++) { for (uint8_t i = 0; i <= 3; i++) {
#if (HAS_DISPLAY) == 1 dp_setTextCursor(x_offset, i + 3);
dp_setCursor(x_offset, i + 3); dp_printf("%4.4s", deveui + i * 4);
#elif (HAS_DISPLAY) == 2
dp_setCursor(x_offset, 2 * (i + 3));
#endif
dp_printf(x_offset, i + 3, MY_FONT_NORMAL, 0, "%4.4s", deveui + i * 4);
} }
// give user some time to read or take picture // give user some time to read or take picture
@ -223,13 +228,14 @@ start:
} }
// cursor home // cursor home
dp_setCursor(0, 0); dp_setTextCursor(0, 0);
// line 1/2: pax counter // line 1/2: pax counter
// display number of unique macs total Wifi + BLE
if (DisplayPage < 6) { if (DisplayPage < 6) {
dp_printf(0, 0, MY_FONT_STRETCHED, 0, "PAX:%-4d", dp_setFont(MY_FONT_STRETCHED);
macs.size()); // display number of unique macs total Wifi + BLE dp_printf("PAX:%-4d", macs.size());
dp_println(); dp_println(3);
} }
switch (DisplayPage) { switch (DisplayPage) {
@ -244,82 +250,79 @@ start:
// page 0: parameters overview // page 0: parameters overview
case 0: case 0:
dp_setFont(MY_FONT_SMALL);
// line 3: wifi + bluetooth counters // line 3: wifi + bluetooth counters
// WIFI:abcde BLTH:abcde // WIFI:abcde BLTH:abcde
#if ((WIFICOUNTER) && (BLECOUNTER)) #if ((WIFICOUNTER) && (BLECOUNTER))
if (cfg.wifiscan) if (cfg.wifiscan)
dp_printf(0, 3, MY_FONT_SMALL, 0, "WIFI:%-5d", macs_wifi); dp_printf("WIFI:%-5d", macs_wifi);
else else
dp_printf(0, 3, MY_FONT_SMALL, 0, "%s", "WIFI:off"); dp_printf("WIFI:off");
if (cfg.blescan) if (cfg.blescan)
dp_printf(66, 3, MY_FONT_SMALL, 0, " BLTH:%-5d", macs_ble); dp_printf(" BLTH:%-5d", macs_ble);
else else
dp_printf(66, 3, MY_FONT_SMALL, 0, "%s", " BLTH:off"); dp_printf(" BLTH:off");
#elif ((WIFICOUNTER) && (!BLECOUNTER)) #elif ((WIFICOUNTER) && (!BLECOUNTER))
if (cfg.wifiscan) if (cfg.wifiscan)
dp_printf(0, 3, MY_FONT_SMALL, 0, "WIFI:%-5d", macs_wifi); dp_printf("WIFI:%-5d", macs_wifi);
else else
dp_printf(0, 3, MY_FONT_SMALL, 0, "%s", "WIFI:off"); dp_printf("WIFI:off");
#elif ((!WIFICOUNTER) && (BLECOUNTER)) #elif ((!WIFICOUNTER) && (BLECOUNTER))
if (cfg.blescan) if (cfg.blescan)
dp_printf(0, 3, MY_FONT_SMALL, 0, "BLTH:%-5d", macs_ble); dp_printf("BLTH:%-5d", macs_ble);
else else
dp_printf(0, 3, MY_FONT_SMALL, 0, "%s", "BLTH:off"); dp_printf("BLTH:off");
#else #else
dp_printf(0, 3, MY_FONT_SMALL, 0, "%s", "Sniffer disabled"); dp_printf("Sniffer disabled");
#endif #endif
dp_println(); dp_println();
// 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) #if (defined BAT_MEASURE_ADC || defined HAS_PMU)
if (batt_voltage == 0xffff) if (batt_voltage == 0xffff)
dp_printf(0, 4, MY_FONT_SMALL, 0, "%s", "USB "); dp_printf("USB ");
else if (batt_voltage == 0) else if (batt_voltage == 0)
dp_printf(0, 4, MY_FONT_SMALL, 0, "%s", "No batt"); dp_printf("No batt ");
else else
dp_printf(0, 4, MY_FONT_SMALL, 0, "B:%.2fV", batt_voltage / 1000.0); dp_printf("B:%.2fV ", batt_voltage / 1000.0);
#else #else
dp_printf(0, 4, MY_FONT_SMALL, 0, "%s", " "); dp_printf(" ");
#endif #endif
#if (HAS_GPS) #if (HAS_GPS)
if (gps_hasfix()) dp_setFont(MY_FONT_SMALL, !gps_hasfix());
dp_printf(48, 4, MY_FONT_SMALL, 0, " Sats:%.2d", gps.satellites.value()); dp_printf("Sats:%.2d", gps.satellites.value());
else // if no fix then display Sats value inverse dp_setFont(MY_FONT_SMALL);
dp_printf(48, 4, MY_FONT_SMALL, 1, " Sats:%.2d", gps.satellites.value());
#else #else
dp_printf(48, 4, MY_FONT_SMALL, 0, "%s", " "); dp_printf(" ");
#endif #endif
dp_printf(96, 4, MY_FONT_SMALL, 0, " ch:%02d", channel); dp_printf(" ch:%02d", channel);
dp_println(); dp_println();
// 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(0, 5, MY_FONT_SMALL, 0, dp_printf(" Mem:%4dKB", getFreeRAM() / 1024);
!cfg.rssilimit ? "RLIM:off " : "RLIM:%-4d", cfg.rssilimit);
dp_printf(66, 5, MY_FONT_SMALL, 0, " Mem:%4dKB", getFreeRAM() / 1024);
dp_println(); dp_println();
// line 6: time + date // line 6: time + date
// 27.Feb 2019 20:27:00* // 27.Feb 2019 20:27:00*
#if (TIME_SYNC_INTERVAL) #if (TIME_SYNC_INTERVAL)
timeState = TimePulseTick ? ' ' : timeSetSymbols[timeSource]; timeState = TimePulseTick ? ' ' : timeSetSymbols[timeSource];
TimePulseTick = false; TimePulseTick = false;
dp_printf(0, 6, MY_FONT_SMALL, 0, "%02d.%3s %4d", day(t), dp_printf("%02d.%3s %4d", day(t), printmonth[month(t)], year(t));
printmonth[month(t)], year(t)); dp_printf(" %02d:%02d:%02d", hour(t), minute(t), second(t));
dp_printf(72, 6, MY_FONT_SMALL, 0, " %02d:%02d:%02d", hour(t), minute(t),
second(t));
// 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_printf(120, 6, MY_FONT_SMALL, 1, "%c", timeState); dp_setFont(MY_FONT_SMALL, 1);
dp_printf("%c", timeState);
dp_setFont(MY_FONT_SMALL, 0);
#else #else
dp_printf(120, 6, MY_FONT_SMALL, 0, "%c", timeState); dp_printf("%c", timeState);
#endif #endif
dp_println(); dp_println();
#endif // TIME_SYNC_INTERVAL #endif // TIME_SYNC_INTERVAL
@ -329,10 +332,11 @@ start:
#if (HAS_LORA) #if (HAS_LORA)
// LMiC event display // LMiC event display
dp_printf(0, 7, MY_FONT_SMALL, 0, "%-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_printf(102, 7, MY_FONT_SMALL, !cfg.adrmode, " %-4s", dp_setFont(MY_FONT_SMALL, !cfg.adrmode);
getSfName(updr2rps(LMIC.datarate))); dp_printf(" %-4s", getSfName(updr2rps(LMIC.datarate)));
dp_setFont(MY_FONT_SMALL, 0);
dp_println(); dp_println();
#endif // HAS_LORA #endif // HAS_LORA
break; // page0 break; // page0
@ -345,22 +349,26 @@ start:
// page 2: GPS // page 2: GPS
case 2: case 2:
#if (HAS_GPS) #if (HAS_GPS)
dp_setFont(MY_FONT_STRETCHED);
if (gps_hasfix()) { if (gps_hasfix()) {
// line 5: clear "No fix" // line 5: clear "No fix"
if (wasnofix) { if (wasnofix) {
dp_printf(16, 5, MY_FONT_STRETCHED, 0, " "); dp_setTextCursor(2, 4);
dp_printf(" ");
wasnofix = false; wasnofix = false;
} }
// line 3-4: GPS latitude // line 3-4: GPS latitude
dp_printf(0, 3, MY_FONT_STRETCHED, 0, "%c%07.4f", dp_printf("%c%07.4f", gps.location.rawLat().negative ? 'S' : 'N',
gps.location.rawLat().negative ? 'S' : 'N', gps.location.lat()); gps.location.lat());
// line 6-7: GPS longitude // line 6-7: GPS longitude
dp_printf(0, 6, MY_FONT_STRETCHED, 0, "%c%07.4f", dp_printf("%c%07.4f", gps.location.rawLat().negative ? 'W' : 'E',
gps.location.rawLat().negative ? 'W' : 'E', gps.location.lng()); gps.location.lng());
} else { } else {
dp_printf(16, 5, MY_FONT_STRETCHED, 1, "No fix"); dp_setTextCursor(2, 4);
dp_setFont(MY_FONT_STRETCHED, 1);
dp_printf("No fix");
wasnofix = true; wasnofix = true;
} }
break; // page2 break; // page2
@ -370,19 +378,23 @@ start:
// page 3: BME280/680 // page 3: BME280/680
case 3: case 3:
dp_setFont(MY_FONT_STRETCHED);
dp_setTextCursor(0, 2);
#if (HAS_BME) #if (HAS_BME)
// line 2-3: Temp // line 2-3: Temp
dp_printf(0, 2, MY_FONT_STRETCHED, 0, "TMP:%-2.1f", bme_status.temperature); dp_printf("TMP:%-2.1f", bme_status.temperature);
dp_println(2);
// line 4-5: Hum // line 4-5: Hum
dp_printf(0, 4, MY_FONT_STRETCHED, 0, "HUM:%-2.1f", bme_status.humidity); dp_printf("HUM:%-2.1f", bme_status.humidity);
dp_println(2);
#ifdef HAS_BME680 #ifdef HAS_BME680
// line 6-7: IAQ // line 6-7: IAQ
dp_printf(0, 6, MY_FONT_STRETCHED, 0, "IAQ:%-3.0f", bme_status.iaq); dp_printf("IAQ:%-3.0f", bme_status.iaq);
#else // is BME280 or BMP180 #else // is BME280 or BMP180
// line 6-7: Pre // line 6-7: Pre
dp_printf(0, 6, MY_FONT_STRETCHED, 0, "PRE:%-2.1f", bme_status.pressure); dp_printf("PRE:%-2.1f", bme_status.pressure);
#endif // HAS_BME680 #endif // HAS_BME680
break; // page 3 break; // page 3
#else #else
@ -391,34 +403,33 @@ start:
// page 4: time // page 4: time
case 4: case 4:
dp_printf(0, 4, MY_FONT_LARGE, 0, "%02d:%02d:%02d", hour(t), minute(t), dp_setFont(MY_FONT_LARGE);
second(t)); dp_printf("%02d:%02d:%02d", hour(t), minute(t), second(t));
break; break;
// page 5: lorawan parameters // page 5: lorawan parameters
case 5: case 5:
#if (HAS_LORA) #if (HAS_LORA)
// 3|NtwkID:000000 TXpw:aa // 3|NtwkID:000000 TXpw:aa
// 4|DevAdd:00000000 DR:0 // 4|DevAdd:00000000 DR:0
// 5|CHMsk:0000 Nonce:0000 // 5|CHMsk:0000 Nonce:0000
// 6|CUp:000000 CDn:000000 // 6|CUp:000000 CDn:000000
// 7|SNR:-0000 RSSI:-0000 // 7|SNR:-0000 RSSI:-0000
dp_printf(0, 3, MY_FONT_SMALL, 0, "NetwID:%06X TXpw:%-2d",
LMIC.netid & 0x001FFFFF, LMIC.radio_txpow); dp_setFont(MY_FONT_SMALL);
dp_printf("NetwID:%06X TXpw:%-2d", LMIC.netid & 0x001FFFFF,
LMIC.radio_txpow);
dp_println(); dp_println();
dp_printf(0, 4, MY_FONT_SMALL, 0, "DevAdd:%08X DR:%1d", LMIC.devaddr, dp_printf("DevAdd:%08X DR:%1d", LMIC.devaddr, LMIC.datarate);
LMIC.datarate);
dp_println(); dp_println();
dp_printf(0, 5, MY_FONT_SMALL, 0, "ChMsk:%04X Nonce:%04X", LMIC.channelMap, dp_printf("ChMsk:%04X Nonce:%04X", LMIC.channelMap, LMIC.devNonce);
LMIC.devNonce);
dp_println(); dp_println();
dp_printf(0, 6, MY_FONT_SMALL, 0, "fUp:%-6d fDn:%-6d", dp_printf("fUp:%-6d fDn:%-6d", LMIC.seqnoUp ? LMIC.seqnoUp - 1 : 0,
LMIC.seqnoUp ? LMIC.seqnoUp - 1 : 0,
LMIC.seqnoDn ? LMIC.seqnoDn - 1 : 0); LMIC.seqnoDn ? LMIC.seqnoDn - 1 : 0);
dp_println(); dp_println();
dp_printf(0, 7, MY_FONT_SMALL, 0, "SNR:%-5d RSSI:%-5d", (LMIC.snr + 2) / 4, dp_printf("SNR:%-5d RSSI:%-5d", (LMIC.snr + 2) / 4, LMIC.rssi);
LMIC.rssi);
break; // page5 break; // page5
#else // don't show blank page if we are unattended #else // don't show blank page if we are unattended
DisplayPage++; // next page DisplayPage++; // next page
@ -440,26 +451,57 @@ start:
} // dp_drawPage } // dp_drawPage
// display helper functions // ------------- display helper functions -----------------
void dp_setTextCursor(int col, int row) {
dp_col = col;
dp_row = row;
#if (HAS_DISPLAY) == 1
oledSetCursor(&ssoled, dp_col * 8, dp_row);
#elif (HAS_DISPLAY) == 2
tft.setCursor(dp_row, dp_col);
#endif
}
void dp_setCursor(int x, int y) { void dp_setCursor(int x, int y) {
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
oledSetCursor(&ssoled, x, y); oledSetCursor(&ssoled, x, y);
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
tft.setCursor(x, y * 8); tft.setCursor(x, y);
#endif #endif
} }
void dp_println(void) { void dp_setFont(int font, int inv) {
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
// to come dp_font = (font << 1) | (inv & 0x01);
#elif (HAS_DISPLAY) == 2
// map font oled -> tft
switch (font) {
case MY_FONT_STRETCHED: // 16x16 on OLED
case MY_FONT_LARGE: // 16x32 on OLED
tft.setTextFont(4); // 26px
break;
case MY_FONT_SMALL: // 6x8 on OLED
case MY_FONT_NORMAL: // 8x8 on OLED
default:
tft.setTextFont(2); // 16px
break;
}
// to do: invers printing
#endif
}
void dp_println(int lines) {
dp_col = 0;
dp_row += lines;
#if (HAS_DISPLAY) == 1
dp_setTextCursor(dp_col, dp_row);
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
tft.println(); tft.println();
#endif #endif
}; };
void dp_printf(uint16_t x, uint16_t y, uint8_t font, uint8_t inv, void dp_printf(const char *format, ...) {
const char *format, ...) {
char loc_buf[64]; char loc_buf[64];
char *temp = loc_buf; char *temp = loc_buf;
va_list arg; va_list arg;
@ -482,25 +524,10 @@ void dp_printf(uint16_t x, uint16_t y, uint8_t font, uint8_t inv,
} }
va_end(arg); va_end(arg);
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
oledWriteString(&ssoled, 0, x, y, temp, font, inv, false); oledWriteString(&ssoled, 0, -1, dp_row, temp, dp_font >> 1, dp_font & 0x01,
false);
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
// map font oled -> tft
uint8_t tft_font;
switch (font) {
case MY_FONT_STRETCHED: // 16x16 on OLED
case MY_FONT_LARGE: // 16x32 on OLED
tft_font = 4; // 26px
break;
case MY_FONT_SMALL: // 6x8 on OLED
case MY_FONT_NORMAL: // 8x8 on OLED
default:
tft_font = 2; // 16px
break;
}
tft.setTextFont(tft_font);
tft.printf(temp); tft.printf(temp);
#endif #endif
if (temp != loc_buf) { if (temp != loc_buf) {
free(temp); free(temp);
@ -516,11 +543,10 @@ void dp_dump(uint8_t *pBuffer) {
} }
void dp_clear(void) { void dp_clear(void) {
dp_setTextCursor(0, 0);
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
oledSetCursor(&ssoled, 0, 0);
oledFill(&ssoled, 0, 1); oledFill(&ssoled, 0, 1);
#elif (HAS_DISPLAY) == 2 #elif (HAS_DISPLAY) == 2
tft.setCursor(0, 0);
tft.fillScreen(MY_DISPLAY_BGCOLOR); tft.fillScreen(MY_DISPLAY_BGCOLOR);
#endif #endif
} }
@ -557,6 +583,8 @@ void dp_shutdown(void) {
#endif #endif
} }
// ------------- QR code plotter -----------------
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) {
uint8_t qrcodeData[qrcode_getBufferSize(QR_VERSION)]; uint8_t qrcodeData[qrcode_getBufferSize(QR_VERSION)];
qrcode_initText(&qrcode, qrcodeData, QR_VERSION, ECC_HIGH, Message); qrcode_initText(&qrcode, qrcodeData, QR_VERSION, ECC_HIGH, Message);
@ -580,6 +608,8 @@ void dp_printqr(uint16_t offset_x, uint16_t offset_y, const char *Message) {
qrcode.size * QR_SCALEFACTOR + 2 * offset_y, false); qrcode.size * QR_SCALEFACTOR + 2 * offset_y, false);
} }
// ------------- graphics primitives -----------------
void dp_fillRect(uint16_t x, uint16_t y, uint16_t width, uint16_t height, void dp_fillRect(uint16_t x, uint16_t y, uint16_t width, uint16_t height,
uint8_t bRender) { uint8_t bRender) {
#if (HAS_DISPLAY) == 1 #if (HAS_DISPLAY) == 1
@ -606,6 +636,8 @@ int dp_drawPixel(uint8_t *buf, const uint16_t x, const uint16_t y,
return 0; return 0;
} }
// ------------- buffer scroll functions -----------------
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) { const uint16_t height, bool left) {
@ -651,6 +683,8 @@ void dp_scrollVertical(uint8_t *buf, const uint16_t width,
} }
} }
// ------------- curve plotter -----------------
void dp_plotCurve(uint16_t count, bool reset) { void dp_plotCurve(uint16_t count, bool reset) {
static uint16_t last_count = 0, col = 0, row = 0; static uint16_t last_count = 0, col = 0, row = 0;

8
src/ota.cpp
View File

@ -301,10 +301,12 @@ retry:
void ota_display(const uint8_t row, const std::string status, 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_printf(112, row, 0, 0, status.substr(0, 2).c_str()); dp_setFont(MY_FONT_SMALL);
dp_setTextCursor(0, row);
dp_printf(status.substr(0, 2).c_str());
if (!msg.empty()) { if (!msg.empty()) {
dp_printf(0, 7, 0, 0, " "); dp_printf(" ");
dp_printf(0, 7, 0, 0, msg.substr(0, 16).c_str()); dp_printf(msg.substr(0, 16).c_str());
} }
dp_dump(displaybuf); dp_dump(displaybuf);
#endif #endif