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

Merge pull request #886 from cyberman54/master

Browse Source 
sync dev to master
This commit is contained in:
Verkehrsrot 2022-08-16 13:15:28 +02:00 committed by GitHub
commit c23c6f60da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 178 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -3,6 +3,7 @@
Tutorial (in german language): https://www.heise.de/select/make/2019/1/1551099236518668 Tutorial (in german language): https://www.heise.de/select/make/2019/1/1551099236518668
[![CodeFactor](https://www.codefactor.io/repository/github/cyberman54/esp32-paxcounter/badge)](https://www.codefactor.io/repository/github/cyberman54/esp32-paxcounter)
<img src="img/Paxcounter-title.jpg"> <img src="img/Paxcounter-title.jpg">
@ -32,8 +33,9 @@ You can build this project battery powered using ESP32 deep sleep mode and reach
*LoRa & SPI*: *LoRa & SPI*:
- **LilyGo: [Paxcounter-Board*](https://www.aliexpress.com/item/32915894264.html?spm=a2g0o.productlist.0.0.3d656325QrcfQc&algo_pvid=4a150199-63e7-4d21-bdb1-b48164537744&algo_exp_id=4a150199-63e7-4d21-bdb1-b48164537744-2&pdp_ext_f=%7B%22sku_id%22%3A%2212000023374441919%22%7D)**
- TTGO: T1*, T2*, T3*, T-Beam, T-Fox
- Heltec: LoRa-32 v1 and v2 - Heltec: LoRa-32 v1 and v2
- TTGO: [Paxcounter-Board*](https://www.aliexpress.com/item/32915894264.html?spm=a2g0o.productlist.0.0.3d656325QrcfQc&algo_pvid=4a150199-63e7-4d21-bdb1-b48164537744&algo_exp_id=4a150199-63e7-4d21-bdb1-b48164537744-2&pdp_ext_f=%7B%22sku_id%22%3A%2212000023374441919%22%7D), T1*, T2*, T3*, T-Beam, T-Fox
- Pycom: LoPy, LoPy4, FiPy - Pycom: LoPy, LoPy4, FiPy
- Radioshuttle.de: [ECO Power Board](https://www.radioshuttle.de/esp32-eco-power/esp32-eco-power-board/) - Radioshuttle.de: [ECO Power Board](https://www.radioshuttle.de/esp32-eco-power/esp32-eco-power-board/)
- WeMos: LoLin32 + [LoraNode32 shield](https://github.com/hallard/LoLin32-Lora), - WeMos: LoLin32 + [LoraNode32 shield](https://github.com/hallard/LoLin32-Lora),

15
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
@ -40,10 +42,10 @@
#endif #endif
#ifndef MY_DISPLAY_FGCOLOR #ifndef MY_DISPLAY_FGCOLOR
#define MY_DISPLAY_FGCOLOR OLED_WHITE #define MY_DISPLAY_FGCOLOR 1 // OLED_WHITE
#endif #endif
#ifndef MY_DISPLAY_BGCOLOR #ifndef MY_DISPLAY_BGCOLOR
#define MY_DISPLAY_BGCOLOR OLED_BLACK #define MY_DISPLAY_BGCOLOR 0 // OLED_BLACK
#endif #endif
// settings for TFT display library // settings for TFT display library
@ -57,10 +59,10 @@
#define MY_DISPLAY_FIRSTLINE 30 #define MY_DISPLAY_FIRSTLINE 30
#ifndef MY_DISPLAY_FGCOLOR #ifndef MY_DISPLAY_FGCOLOR
#define MY_DISPLAY_FGCOLOR TFT_WHITE #define MY_DISPLAY_FGCOLOR 0xFFFF // TFT_WHITE
#endif #endif
#ifndef MY_DISPLAY_BGCOLOR #ifndef MY_DISPLAY_BGCOLOR
#define MY_DISPLAY_BGCOLOR TFT_BLACK #define MY_DISPLAY_BGCOLOR 0x0000 // TFT_BLACK
#endif #endif
#ifndef TOUCH_CS #ifndef TOUCH_CS
@ -103,17 +105,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_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_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 = 0, int row = MY_DISPLAY_FIRSTLINE);
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);
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,

343
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,13 +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", (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", dp->printf("WiFi%s%s\r\n",
(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
@ -125,11 +128,11 @@ void dp_init(bool verbose) {
// display DEVEUI as plain text on the right // display DEVEUI as plain text on the right
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->setCursor(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->setCursor(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
@ -146,10 +149,18 @@ void dp_init(bool verbose) {
} // dp_init } // dp_init
// write display content to display buffer
// nextpage = true -> flip 1 page
void dp_refresh(bool nextPage) { void dp_refresh(bool nextPage) {
struct count_payload_t count; // libpax count storage
static uint8_t DisplayPage = 0;
char timeState, strftime_buf[64];
time_t now;
struct tm timeinfo = {0};
#ifndef HAS_BUTTON #ifndef HAS_BUTTON
static uint32_t framecounter = 0; static uint32_t framecounter = 0;
const uint32_t flip_threshold = DISPLAYCYCLE * 1000 / DISPLAYREFRESH_MS;
#endif #endif
// if display is switched off we don't refresh it to relax cpu // if display is switched off we don't refresh it to relax cpu
@ -164,103 +175,81 @@ void dp_refresh(bool nextPage) {
#ifndef HAS_BUTTON #ifndef HAS_BUTTON
// auto flip page if we are in unattended mode // auto flip page if we are in unattended mode
if ((++framecounter) > (DISPLAYCYCLE * 1000 / DISPLAYREFRESH_MS)) { if (++framecounter > flip_threshold) {
framecounter = 0; framecounter = 0;
nextPage = true; nextPage = true;
} }
#endif #endif
dp_drawPage(nextPage); if (nextPage) {
} // refreshDisplay()
void dp_drawPage(bool nextpage) {
// write display content to display buffer
// nextpage = true -> flip 1 page
struct count_payload_t count; // libpax count storage
static uint8_t DisplayPage = 0;
char timeState, strftime_buf[64];
time_t now;
struct tm timeinfo = {0};
if (nextpage) {
DisplayPage = (DisplayPage >= DISPLAY_PAGES - 1) ? 0 : (DisplayPage + 1); DisplayPage = (DisplayPage >= DISPLAY_PAGES - 1) ? 0 : (DisplayPage + 1);
dp_clear(); dp_clear();
} } else
dp->setCursor(0, 0);
// update counter values from libpax
libpax_counter_count(&count);
// cursor home
dp_setTextCursor(0, 0);
// line 1/2: pax counter
// display number of unique macs total Wifi + BLE
if (DisplayPage < 3) {
dp_setFont(MY_FONT_LARGE);
dp_printf("%-8d", count.pax);
}
switch (DisplayPage) { switch (DisplayPage) {
// page 0: parameters overview // page 0: pax + parameters overview
// page 1: lorawan parameters // page 1: pax + lorawan parameters
// page 2: GPS // page 2: pax + GPS lat/lon
// page 3: BME280/680 // page 3: BME280/680 values
// page 4: time // page 4: timeofday
// page 5: pax graph // page 5: pax graph
// page 6: blank screen // page 6: blank screen
// ---------- page 0: parameters overview ---------- // ---------- page 0: parameters overview ----------
case 0: case 0:
// show pax
libpax_counter_count(&count);
dp_setFont(MY_FONT_LARGE);
dp->printf("%-8d", count.pax);
dp_setFont(MY_FONT_SMALL); dp_setFont(MY_FONT_SMALL);
dp_setTextCursor(); dp->setCursor(0, MY_DISPLAY_FIRSTLINE);
// 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("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 *
@ -270,15 +259,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
@ -287,10 +276,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
@ -308,19 +297,26 @@ void dp_drawPage(bool nextpage) {
// 6|fUp:000000 fDn:000000 // 6|fUp:000000 fDn:000000
// 7|SNR:-0000 RSSI:-0000 // 7|SNR:-0000 RSSI:-0000
// show pax
libpax_counter_count(&count);
dp_setFont(MY_FONT_LARGE);
dp->printf("%-8d", count.pax);
dp_setFont(MY_FONT_SMALL); dp_setFont(MY_FONT_SMALL);
dp_setTextCursor(); dp->setCursor(0, MY_DISPLAY_FIRSTLINE);
dp_printf("Net:%06X Pwr:%-2d\r\n", LMIC.netid & 0x001FFFFF, LMIC.radio_txpow); dp->printf("Net:%06X Pwr:%-2d\r\n", LMIC.netid & 0x001FFFFF,
dp_printf("Dev:%08X DR:%1d\r\n", LMIC.devaddr, LMIC.datarate); LMIC.radio_txpow);
dp_printf("ChMsk:%04X Nonce:%04X\r\n", LMIC.channelMap, LMIC.devNonce); dp->printf("Dev:%08X DR:%1d\r\n", LMIC.devaddr, LMIC.datarate);
dp_printf("fUp:%-6d fDn:%-6d\r\n", LMIC.seqnoUp ? LMIC.seqnoUp - 1 : 0, 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,
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;
#else // flip page if we are unattended #else // skip this page
DisplayPage++; DisplayPage++;
break;
#endif // HAS_LORA #endif // HAS_LORA
// ---------- page 2: GPS ---------- // ---------- page 2: GPS ----------
@ -328,23 +324,29 @@ void dp_drawPage(bool nextpage) {
#if (HAS_GPS) #if (HAS_GPS)
// show pax
libpax_counter_count(&count);
dp_setFont(MY_FONT_LARGE);
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->setCursor(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(); dp->setCursor(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;
#else // flip page if we are unattended #else // skip this page
DisplayPage++; DisplayPage++;
break;
#endif #endif
// ---------- page 3: BME280/680 ---------- // ---------- page 3: BME280/680 ----------
@ -352,17 +354,18 @@ 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->setCursor(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; // page 3 break;
#else // flip page if we are unattended #else // skip this page
DisplayPage++; DisplayPage++;
break;
#endif // HAS_BME #endif // HAS_BME
// ---------- page 4: time ---------- // ---------- page 4: time ----------
@ -370,16 +373,16 @@ void dp_drawPage(bool nextpage) {
time(&now); time(&now);
localtime_r(&now, &timeinfo); localtime_r(&now, &timeinfo);
strftime(strftime_buf, sizeof(strftime_buf), "%T", &timeinfo);
dp_setFont(MY_FONT_STRETCHED); dp_setFont(MY_FONT_STRETCHED);
dp_setTextCursor(0, 0); dp->setCursor(0, 0);
dp_printf("Timeofday:"); dp->printf("Timeofday:");
dp_setTextCursor(0, 26); dp->setCursor(0, 26);
dp_setFont(MY_FONT_LARGE); dp_setFont(MY_FONT_LARGE);
dp_printf("%.8s\r\n", strftime_buf); strftime(strftime_buf, sizeof(strftime_buf), "%T", &timeinfo);
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;
@ -397,115 +400,69 @@ void dp_drawPage(bool nextpage) {
#ifdef HAS_BUTTON #ifdef HAS_BUTTON
dp_clear(); dp_clear();
break; break;
#else // flip page if we are unattended #else // skip this page
DisplayPage++; DisplayPage++;
break;
#endif #endif
} // switch (page) } // switch (page)
} // dp_drawPage } // dp_refresh
// ------------- display helper functions ----------------- // ------------- display helper functions -----------------
void dp_setTextCursor(int x, int y) {
#if (HAS_DISPLAY) == 1
oled.setCursor(x, y);
#elif (HAS_DISPLAY) == 2
tft.setCursor(x, y);
#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->setCursor(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
@ -513,7 +470,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
@ -521,7 +478,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
@ -531,8 +488,8 @@ void dp_shutdown(void) {
// print static message on display // print static message on display
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->setCursor(0, line * 8);
dp_printf("%-16s", msg); dp->printf("%-16s", msg);
dp_dump(); dp_dump();
} // dp_message } // dp_message
@ -546,32 +503,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) {

10
src/gpsread.cpp
View File

@ -87,7 +87,6 @@ byte CFG_CFG[] = {
// helper functions to send UBX commands to ublox gps chip // helper functions to send UBX commands to ublox gps chip
void sendPacket(byte *packet, byte len) { void sendPacket(byte *packet, byte len) {
uint8_t CK_A = 0; uint8_t CK_A = 0;
uint8_t CK_B = 0; uint8_t CK_B = 0;
@ -107,7 +106,6 @@ void restoreDefaults() { sendPacket(CFG_CFG, sizeof(CFG_CFG)); }
void changeBaudrate() { sendPacket(CFG_PRT, sizeof(CFG_PRT)); } void changeBaudrate() { sendPacket(CFG_PRT, sizeof(CFG_PRT)); }
void disableNmea() { void disableNmea() {
// tinygps++ processes only $GPGGA/$GNGGA and $GPRMC/$GNRMC // tinygps++ processes only $GPGGA/$GNGGA and $GPRMC/$GNRMC
// thus, we disable all other NMEA messages // thus, we disable all other NMEA messages
@ -128,7 +126,6 @@ void disableNmea() {
// initialize and configure GPS // initialize and configure GPS
int gps_init(void) { int gps_init(void) {
ESP_LOGI(TAG, "Opening serial GPS"); ESP_LOGI(TAG, "Opening serial GPS");
GPS_Serial.begin(GPS_SERIAL); GPS_Serial.begin(GPS_SERIAL);
@ -144,7 +141,6 @@ int gps_init(void) {
disableNmea(); disableNmea();
return 1; return 1;
} // gps_init() } // gps_init()
// store current GPS location data in struct // store current GPS location data in struct
@ -170,13 +166,11 @@ bool gps_hasfix() {
// function to poll UTC time from GPS NMEA data; note: this is costly // function to poll UTC time from GPS NMEA data; note: this is costly
time_t get_gpstime(uint16_t *msec = 0) { time_t get_gpstime(uint16_t *msec = 0) {
const uint16_t txDelay = const uint16_t txDelay =
70U * 1000 / (GPS_BAUDRATE / 9); // serial tx of 70 NMEA chars 70U * 1000 / (GPS_BAUDRATE / 9); // serial tx of 70 NMEA chars
// did we get a current date & time? // did we get a current date & time?
if (gps.time.age() < 1000) { if (gps.time.age() < 1000) {
// convert tinygps time format to struct tm format // convert tinygps time format to struct tm format
struct tm gps_tm = {0}; struct tm gps_tm = {0};
gps_tm.tm_sec = gps.time.second(); gps_tm.tm_sec = gps.time.second();
@ -209,18 +203,15 @@ time_t get_gpstime(uint16_t *msec = 0) {
ESP_LOGD(TAG, "no valid GPS time"); ESP_LOGD(TAG, "no valid GPS time");
return 0; return 0;
} // get_gpstime() } // get_gpstime()
// GPS serial feed FreeRTos Task // GPS serial feed FreeRTos Task
void gps_loop(void *pvParameters) { void gps_loop(void *pvParameters) {
_ASSERT((uint32_t)pvParameters == 1); // FreeRTOS check _ASSERT((uint32_t)pvParameters == 1); // FreeRTOS check
// feed GPS decoder with serial NMEA data from GPS device // feed GPS decoder with serial NMEA data from GPS device
while (1) { while (1) {
while (cfg.payloadmask & GPS_DATA) { while (cfg.payloadmask & GPS_DATA) {
while (GPS_Serial.available()) while (GPS_Serial.available())
gps.encode(GPS_Serial.read()); gps.encode(GPS_Serial.read());
@ -228,7 +219,6 @@ void gps_loop(void *pvParameters) {
} }
delay(1000); delay(1000);
} // infinite while loop } // infinite while loop
} // gps_loop() } // gps_loop()
#endif // HAS_GPS #endif // HAS_GPS

6
src/ledmatrixdisplay.cpp
View File

@ -70,7 +70,6 @@ void refreshTheMatrixDisplay(bool nextPage) {
} }
switch (DisplayPage % MATRIX_DISPLAY_PAGES) { switch (DisplayPage % MATRIX_DISPLAY_PAGES) {
// page 0: number of current pax OR footfall line diagram // page 0: number of current pax OR footfall line diagram
// page 1: time of day // page 1: time of day
@ -89,18 +88,14 @@ void refreshTheMatrixDisplay(bool nextPage) {
} }
else { // cyclic counter mode -> plot a line diagram else { // cyclic counter mode -> plot a line diagram
if (ulLastNumMacs != count.pax) { if (ulLastNumMacs != count.pax) {
// next count cycle? // next count cycle?
if (count.pax == 0) { if (count.pax == 0) {
// matrix full? then scroll left 1 dot, else increment column // matrix full? then scroll left 1 dot, else increment column
if (col < (LED_MATRIX_WIDTH - 1)) if (col < (LED_MATRIX_WIDTH - 1))
col++; col++;
else else
ScrollMatrixLeft(displaybuf, LED_MATRIX_WIDTH, LED_MATRIX_HEIGHT); ScrollMatrixLeft(displaybuf, LED_MATRIX_WIDTH, LED_MATRIX_HEIGHT);
} else } else
matrix.drawPoint(col, row, 0); // clear current dot matrix.drawPoint(col, row, 0); // clear current dot
@ -124,7 +119,6 @@ void refreshTheMatrixDisplay(bool nextPage) {
// DrawNumber(myTZ.dateTime("H:i:s").c_str()); // DrawNumber(myTZ.dateTime("H:i:s").c_str());
} }
break; break;
} // switch page } // switch page
matrix.scan(); matrix.scan();

18
src/lorawan.cpp
View File

@ -21,18 +21,17 @@ TaskHandle_t lmicTask = NULL, lorasendTask = NULL;
char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer for LMIC event message char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer for LMIC event message
class MyHalConfig_t : public Arduino_LMIC::HalConfiguration_t { class MyHalConfig_t : public Arduino_LMIC::HalConfiguration_t {
public: public:
MyHalConfig_t(){}; MyHalConfig_t(){};
// set SPI pins to board configuration, pins may come from pins_arduino.h // set SPI pins to board configuration, pins may come from pins_arduino.h
virtual void begin(void) override { void begin(void) override {
SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
} }
// virtual void end(void) override // void end(void) override
// virtual ostime_t setModuleActive(bool state) override // ostime_t setModuleActive(bool state) override
}; };
static MyHalConfig_t myHalConfig{}; static MyHalConfig_t myHalConfig{};
@ -50,9 +49,7 @@ static const lmic_pinmap myPinmap = {
.pConfig = &myHalConfig}; .pConfig = &myHalConfig};
void lora_setupForNetwork(bool preJoin) { void lora_setupForNetwork(bool preJoin) {
if (preJoin) { if (preJoin) {
#if CFG_LMIC_US_like #if CFG_LMIC_US_like
// in the US, with TTN, it saves join time if we start on subband 1 // in the US, with TTN, it saves join time if we start on subband 1
// (channels 8-15). This will get overridden after the join by // (channels 8-15). This will get overridden after the join by
@ -196,7 +193,6 @@ void lora_send(void *pvParameters) {
MessageBuffer_t SendBuffer; MessageBuffer_t SendBuffer;
while (1) { while (1) {
// postpone until we are joined if we are not // postpone until we are joined if we are not
while (!LMIC.devaddr) { while (!LMIC.devaddr) {
vTaskDelay(pdMS_TO_TICKS(500)); vTaskDelay(pdMS_TO_TICKS(500));
@ -213,7 +209,6 @@ void lora_send(void *pvParameters) {
switch (LMIC_setTxData2_strict(SendBuffer.MessagePort, SendBuffer.Message, switch (LMIC_setTxData2_strict(SendBuffer.MessagePort, SendBuffer.Message,
SendBuffer.MessageSize, SendBuffer.MessageSize,
(cfg.countermode & 0x02))) { (cfg.countermode & 0x02))) {
case LMIC_ERROR_SUCCESS: case LMIC_ERROR_SUCCESS:
#if (TIME_SYNC_LORASERVER) #if (TIME_SYNC_LORASERVER)
// if last packet sent was a timesync request, store TX timestamp // if last packet sent was a timesync request, store TX timestamp
@ -237,7 +232,6 @@ void lora_send(void *pvParameters) {
break; break;
default: // other LMIC return code default: // other LMIC return code
ESP_LOGE(TAG, "LMIC error, message not sent and deleted"); ESP_LOGE(TAG, "LMIC error, message not sent and deleted");
} // switch } // switch
delay(2); // yield to CPU delay(2); // yield to CPU
} // while(1) } // while(1)
@ -351,7 +345,6 @@ void lmictask(void *pvParameters) {
// lmic event handler // lmic event handler
void myEventCallback(void *pUserData, ev_t ev) { void myEventCallback(void *pUserData, ev_t ev) {
// using message descriptors from LMIC library // using message descriptors from LMIC library
static const char *const evNames[] = {LMIC_EVENT_NAME_TABLE__INIT}; static const char *const evNames[] = {LMIC_EVENT_NAME_TABLE__INIT};
// get current length of lora send queue // get current length of lora send queue
@ -366,7 +359,6 @@ void myEventCallback(void *pUserData, ev_t ev) {
// process current event message // process current event message
switch (ev) { switch (ev) {
case EV_TXCOMPLETE: case EV_TXCOMPLETE:
// -> processed in lora_send() // -> processed in lora_send()
break; break;
@ -411,7 +403,6 @@ void myEventCallback(void *pUserData, ev_t ev) {
// event EV_RXCOMPLETE message handler // event EV_RXCOMPLETE message handler
void myRxCallback(void *pUserData, uint8_t port, const uint8_t *pMsg, void myRxCallback(void *pUserData, uint8_t port, const uint8_t *pMsg,
size_t nMsg) { size_t nMsg) {
// display amount of received data // display amount of received data
if (nMsg) if (nMsg)
ESP_LOGI(TAG, "Received %u byte(s) of payload on port %u", nMsg, port); ESP_LOGI(TAG, "Received %u byte(s) of payload on port %u", nMsg, port);
@ -419,7 +410,6 @@ void myRxCallback(void *pUserData, uint8_t port, const uint8_t *pMsg,
ESP_LOGI(TAG, "Received empty message on port %u", port); ESP_LOGI(TAG, "Received empty message on port %u", port);
switch (port) { switch (port) {
// rcommand received -> call interpreter // rcommand received -> call interpreter
case RCMDPORT: case RCMDPORT:
rcommand(pMsg, nMsg); rcommand(pMsg, nMsg);
@ -432,7 +422,6 @@ void myRxCallback(void *pUserData, uint8_t port, const uint8_t *pMsg,
timesync_serverAnswer(const_cast<uint8_t *>(pMsg), nMsg); timesync_serverAnswer(const_cast<uint8_t *>(pMsg), nMsg);
break; break;
#endif #endif
} // switch } // switch
} }
@ -513,7 +502,6 @@ bool ttn_rtc_restore() {
// https://github.com/JackGruber/ESP32-LMIC-DeepSleep-example/blob/master/src/main.cpp // https://github.com/JackGruber/ESP32-LMIC-DeepSleep-example/blob/master/src/main.cpp
void SaveLMICToRTC(int deepsleep_sec) { void SaveLMICToRTC(int deepsleep_sec) {
// ESP32 can't track millis during DeepSleep and no option to advance // ESP32 can't track millis during DeepSleep and no option to advance
// millis after DeepSleep. Therefore reset DutyCyles before saving LMIC struct // millis after DeepSleep. Therefore reset DutyCyles before saving LMIC struct

4
src/main.cpp
View File

@ -185,7 +185,7 @@ void setup() {
// initialize display // initialize display
#ifdef HAS_DISPLAY #ifdef HAS_DISPLAY
strcat_P(features, " OLED"); strcat_P(features, " DISP");
DisplayIsOn = cfg.screenon; DisplayIsOn = cfg.screenon;
// display verbose info only after a coldstart (note: blocking call!) // display verbose info only after a coldstart (note: blocking call!)
dp_init(RTC_runmode == RUNMODE_POWERCYCLE ? true : false); dp_init(RTC_runmode == RUNMODE_POWERCYCLE ? true : false);
@ -213,7 +213,7 @@ void setup() {
#ifdef HAS_TWO_LED #ifdef HAS_TWO_LED
pinMode(HAS_TWO_LED, OUTPUT); pinMode(HAS_TWO_LED, OUTPUT);
strcat_P(features, " LED1"); strcat_P(features, " LED2");
#endif #endif
// use LED for power display if we have additional RGB LED, else for status // use LED for power display if we have additional RGB LED, else for status

26
src/ota.cpp
View File

@ -41,7 +41,6 @@ inline String getHeaderValue(String header, String headerName) {
} }
void start_ota_update() { void start_ota_update() {
const char *host = clientId; const char *host = clientId;
switch_LED(LED_ON); switch_LED(LED_ON);
@ -51,12 +50,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
@ -121,13 +120,11 @@ end:
ota_display(5, "**", ""); // mark line rebooting ota_display(5, "**", ""); // mark line rebooting
delay(5000); delay(5000);
do_reset(false); do_reset(false);
} // start_ota_update } // start_ota_update
// Reads data vom wifi client and flashes it to ota partition // Reads data vom wifi client and flashes it to ota partition
// returns: 0 = finished, 1 = retry, -1 = abort // returns: 0 = finished, 1 = retry, -1 = abort
int do_ota_update() { int do_ota_update() {
char buf[17]; char buf[17];
bool redirect = true; bool redirect = true;
size_t written = 0; size_t written = 0;
@ -319,18 +316,17 @@ abort:
retry: retry:
return 1; return 1;
} // do_ota_update } // do_ota_update
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_setTextCursor(14 * 8, row * 8); dp->setCursor(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

6
src/power.cpp
View File

@ -26,7 +26,6 @@ static const adc_unit_t unit = ADC_UNIT_1;
AXP20X_Class pmu; AXP20X_Class pmu;
void AXP192_powerevent_IRQ(void) { void AXP192_powerevent_IRQ(void) {
pmu.readIRQ(); pmu.readIRQ();
if (pmu.isVbusOverVoltageIRQ()) if (pmu.isVbusOverVoltageIRQ())
@ -83,9 +82,7 @@ void AXP192_powerevent_IRQ(void) {
} }
void AXP192_power(pmu_power_t powerlevel) { void AXP192_power(pmu_power_t powerlevel) {
switch (powerlevel) { switch (powerlevel) {
case pmu_power_off: case pmu_power_off:
pmu.shutdown(); pmu.shutdown();
break; break;
@ -119,7 +116,6 @@ void AXP192_power(pmu_power_t powerlevel) {
} }
void AXP192_showstatus(void) { void AXP192_showstatus(void) {
if (pmu.isBatteryConnect()) if (pmu.isBatteryConnect())
if (pmu.isChargeing()) if (pmu.isChargeing())
ESP_LOGI(TAG, "Battery charging, %.2fV @ %.0fmAh", ESP_LOGI(TAG, "Battery charging, %.2fV @ %.0fmAh",
@ -137,12 +133,10 @@ void AXP192_showstatus(void) {
} }
void AXP192_init(void) { void AXP192_init(void) {
if (pmu.begin(i2c_readBytes, i2c_writeBytes, AXP192_PRIMARY_ADDRESS) == if (pmu.begin(i2c_readBytes, i2c_writeBytes, AXP192_PRIMARY_ADDRESS) ==
AXP_FAIL) AXP_FAIL)
ESP_LOGI(TAG, "AXP192 PMU initialization failed"); ESP_LOGI(TAG, "AXP192 PMU initialization failed");
else { else {
// configure voltages // configure voltages
pmu.setDCDC1Voltage(3300); // for external OLED display pmu.setDCDC1Voltage(3300); // for external OLED display
pmu.setLDO2Voltage(3300); // LORA VDD 3v3 pmu.setLDO2Voltage(3300); // LORA VDD 3v3

7
src/rcommand.cpp
View File

@ -234,7 +234,6 @@ void set_loradr(uint8_t val[]) {
getSfName(updr2rps(LMIC.datarate)), getSfName(updr2rps(LMIC.datarate)),
getBwName(updr2rps(LMIC.datarate)), getBwName(updr2rps(LMIC.datarate)),
getCrName(updr2rps(LMIC.datarate))); getCrName(updr2rps(LMIC.datarate)));
} else } else
ESP_LOGI( ESP_LOGI(
TAG, TAG,
@ -430,14 +429,12 @@ static const uint8_t cmdtablesize =
// check and execute remote command // check and execute remote command
void rcmd_execute(const uint8_t cmd[], const uint8_t cmdlength) { void rcmd_execute(const uint8_t cmd[], const uint8_t cmdlength) {
if (cmdlength == 0) if (cmdlength == 0)
return; return;
uint8_t foundcmd[cmdlength], cursor = 0; uint8_t foundcmd[cmdlength], cursor = 0;
while (cursor < cmdlength) { while (cursor < cmdlength) {
int i = cmdtablesize; int i = cmdtablesize;
while (i--) { while (i--) {
if (cmd[cursor] == table[i].opcode) { // lookup command in opcode table if (cmd[cursor] == table[i].opcode) { // lookup command in opcode table
@ -462,7 +459,6 @@ void rcmd_execute(const uint8_t cmd[], const uint8_t cmdlength) {
break; break;
} }
} // command parsing loop } // command parsing loop
} // rcmd_execute() } // rcmd_execute()
// remote command processing task // remote command processing task
@ -485,9 +481,7 @@ void rcmd_process(void *pvParameters) {
// enqueue remote command // enqueue remote command
void rcommand(const uint8_t *cmd, const size_t cmdlength) { void rcommand(const uint8_t *cmd, const size_t cmdlength) {
RcmdBuffer_t rcmd = {0}; RcmdBuffer_t rcmd = {0};
rcmd.cmdLen = cmdlength; rcmd.cmdLen = cmdlength;
memcpy(rcmd.cmd, cmd, cmdlength); memcpy(rcmd.cmd, cmd, cmdlength);
@ -505,7 +499,6 @@ void rcmd_deinit(void) {
} }
esp_err_t rcmd_init(void) { esp_err_t rcmd_init(void) {
_ASSERT(RCMD_QUEUE_SIZE > 0); _ASSERT(RCMD_QUEUE_SIZE > 0);
RcmdQueue = xQueueCreate(RCMD_QUEUE_SIZE, sizeof(RcmdBuffer_t)); RcmdQueue = xQueueCreate(RCMD_QUEUE_SIZE, sizeof(RcmdBuffer_t));
if (RcmdQueue == 0) { if (RcmdQueue == 0) {

18
src/timekeeper.cpp
View File

@ -40,7 +40,6 @@ void setTimeSyncIRQ() { xTaskNotify(irqHandlerTask, TIMESYNC_IRQ, eSetBits); }
#ifdef GPS_INT #ifdef GPS_INT
// interrupt service routine triggered by GPS PPS // interrupt service routine triggered by GPS PPS
void IRAM_ATTR GPSIRQ(void) { void IRAM_ATTR GPSIRQ(void) {
BaseType_t xHigherPriorityTaskWoken = pdFALSE; BaseType_t xHigherPriorityTaskWoken = pdFALSE;
// take timestamp // take timestamp
@ -54,7 +53,6 @@ void IRAM_ATTR GPSIRQ(void) {
// interrupt service routine triggered by esp32 hardware timer // interrupt service routine triggered by esp32 hardware timer
void IRAM_ATTR CLOCKIRQ(void) { void IRAM_ATTR CLOCKIRQ(void) {
BaseType_t xHigherPriorityTaskWoken = pdFALSE; BaseType_t xHigherPriorityTaskWoken = pdFALSE;
// advance wall clock, if we have // advance wall clock, if we have
@ -79,7 +77,6 @@ void IRAM_ATTR CLOCKIRQ(void) {
} }
void calibrateTime(void) { void calibrateTime(void) {
// kick off asynchronous lora timesync if we have // kick off asynchronous lora timesync if we have
#if (HAS_LORA_TIME) #if (HAS_LORA_TIME)
timesync_request(); timesync_request();
@ -106,12 +103,10 @@ void calibrateTime(void) {
#endif #endif
#endif #endif
} // calibrateTime() } // calibrateTime()
// set system time (UTC), calibrate RTC and RTC_INT pps // set system time (UTC), calibrate RTC and RTC_INT pps
bool setMyTime(uint32_t t_sec, uint16_t t_msec, timesource_t mytimesource) { bool setMyTime(uint32_t t_sec, uint16_t t_msec, timesource_t mytimesource) {
struct timeval tv = {0}; struct timeval tv = {0};
// called with invalid timesource? // called with invalid timesource?
@ -123,7 +118,6 @@ bool setMyTime(uint32_t t_sec, uint16_t t_msec, timesource_t mytimesource) {
// do we have a valid time? // do we have a valid time?
if (timeIsValid(time_to_set)) { if (timeIsValid(time_to_set)) {
// if we have msec fraction, then wait until top of second with // if we have msec fraction, then wait until top of second with
// millisecond precision // millisecond precision
if (t_msec % 1000) { if (t_msec % 1000) {
@ -160,7 +154,6 @@ bool setMyTime(uint32_t t_sec, uint16_t t_msec, timesource_t mytimesource) {
return true; return true;
} else { } else {
timesyncer.attach(TIME_SYNC_INTERVAL_RETRY * 60, setTimeSyncIRQ); timesyncer.attach(TIME_SYNC_INTERVAL_RETRY * 60, setTimeSyncIRQ);
ESP_LOGV(TAG, ESP_LOGV(TAG,
"[%0.3f] Failed to synchronise time from source %c | unix sec " "[%0.3f] Failed to synchronise time from source %c | unix sec "
@ -173,7 +166,6 @@ bool setMyTime(uint32_t t_sec, uint16_t t_msec, timesource_t mytimesource) {
// helper function to setup a pulse per second for time synchronisation // helper function to setup a pulse per second for time synchronisation
void timepulse_init(void) { void timepulse_init(void) {
// set esp-idf API sntp sync mode // set esp-idf API sntp sync mode
// sntp_init(); // sntp_init();
sntp_set_sync_mode(SNTP_SYNC_MODE_IMMED); sntp_set_sync_mode(SNTP_SYNC_MODE_IMMED);
@ -210,7 +202,6 @@ void timepulse_init(void) {
// start cyclic time sync // start cyclic time sync
timesyncer.attach(TIME_SYNC_INTERVAL * 60, setTimeSyncIRQ); timesyncer.attach(TIME_SYNC_INTERVAL * 60, setTimeSyncIRQ);
} // timepulse_init } // timepulse_init
// helper function to check plausibility of a given epoch time // helper function to check plausibility of a given epoch time
@ -224,7 +215,6 @@ bool timeIsValid(time_t const t) {
// helper function to calculate serial transmit time // helper function to calculate serial transmit time
TickType_t tx_Ticks(uint32_t framesize, unsigned long baud, uint32_t config, TickType_t tx_Ticks(uint32_t framesize, unsigned long baud, uint32_t config,
int8_t rxPin, int8_t txPins) { int8_t rxPin, int8_t txPins) {
uint32_t databits = ((config & 0x0c) >> 2) + 5; uint32_t databits = ((config & 0x0c) >> 2) + 5;
uint32_t stopbits = ((config & 0x20) >> 5) + 1; uint32_t stopbits = ((config & 0x20) >> 5) + 1;
uint32_t txTime = (databits + stopbits + 1) * framesize * 1000.0 / baud; uint32_t txTime = (databits + stopbits + 1) * framesize * 1000.0 / baud;
@ -234,7 +224,6 @@ TickType_t tx_Ticks(uint32_t framesize, unsigned long baud, uint32_t config,
} }
void clock_loop(void *taskparameter) { // ClockTask void clock_loop(void *taskparameter) { // ClockTask
uint32_t current_time = 0, previous_time = 0; uint32_t current_time = 0, previous_time = 0;
time_t tt; time_t tt;
struct tm t = {0}; struct tm t = {0};
@ -248,7 +237,6 @@ void clock_loop(void *taskparameter) { // ClockTask
// output the next second's pulse/telegram after pps arrived // output the next second's pulse/telegram after pps arrived
for (;;) { for (;;) {
// wait for timepulse and store UTC time // wait for timepulse and store UTC time
xTaskNotifyWait(0x00, ULONG_MAX, &current_time, portMAX_DELAY); xTaskNotifyWait(0x00, ULONG_MAX, &current_time, portMAX_DELAY);
@ -291,7 +279,6 @@ void clock_loop(void *taskparameter) { // ClockTask
ESP_LOGD(TAG, "[%0.3f] DCF77: new frame for min %d", _seconds(), ESP_LOGD(TAG, "[%0.3f] DCF77: new frame for min %d", _seconds(),
t.tm_min); t.tm_min);
} else { } else {
// generate impulse // generate impulse
if (t.tm_min == ClockMinute) { // ensure frame is recent if (t.tm_min == ClockMinute) { // ensure frame is recent
DCF77_Pulse(ClockPulse & 1); // output next second DCF77_Pulse(ClockPulse & 1); // output next second
@ -311,12 +298,10 @@ void clock_loop(void *taskparameter) { // ClockTask
#endif #endif
previous_time = current_time; previous_time = current_time;
} // for } // for
} // clock_loop() } // clock_loop()
void clock_init(void) { void clock_init(void) {
// setup clock output interface // setup clock output interface
#ifdef HAS_IF482 #ifdef HAS_IF482
IF482.begin(HAS_IF482); IF482.begin(HAS_IF482);
@ -337,7 +322,6 @@ void clock_init(void) {
// we use compile date to create a time_t reference "in the past" // we use compile date to create a time_t reference "in the past"
time_t compileTime(void) { time_t compileTime(void) {
char s_month[5]; char s_month[5];
int year; int year;
struct tm t = {0}; struct tm t = {0};
@ -347,7 +331,6 @@ time_t compileTime(void) {
static time_t secs = -1; static time_t secs = -1;
if (secs == -1) { if (secs == -1) {
// determine date // determine date
sscanf(__DATE__, "%s %d %d", s_month, &t.tm_mday, &year); sscanf(__DATE__, "%s %d %d", s_month, &t.tm_mday, &year);
t.tm_mon = (strstr(month_names, s_month) - month_names) / 3; t.tm_mon = (strstr(month_names, s_month) - month_names) / 3;
@ -396,7 +379,6 @@ time_t mkgmtime(const struct tm *ptm) {
} }
void time_init(void) { void time_init(void) {
#if (defined HAS_IF482 || defined HAS_DCF77) #if (defined HAS_IF482 || defined HAS_DCF77)
ESP_LOGI(TAG, "Starting clock controller..."); ESP_LOGI(TAG, "Starting clock controller...");
clock_init(); clock_init();