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

pps pulse display

Browse Source
This commit is contained in:
Klaus K Wilting 2019-02-18 21:51:01 +01:00
parent 1b42afafd7
commit dd5007897d
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/display.cpp
View File

@ -41,6 +41,16 @@ const char lora_datarate[] = {"1211100908078CNA1211109C8C7C"};
const char lora_datarate[] = {"121110090807FSNA"}; const char lora_datarate[] = {"121110090807FSNA"};
#endif #endif
// time display symbols
#if defined HAS_GPS || defined HAS_RTC
const char timeNosyncSymbol = '?';
#if defined HAS_IF482
const char timesyncSymbol = '+';
#elif defined HAS_DCF77
const char timesyncSymbol = '*';
#endif
#endif
// helper arry for converting month values to text // helper arry for converting month values to text
const char *printmonth[] = {"xxx", "Jan", "Feb", "Mar", "Apr", "May", "Jun", const char *printmonth[] = {"xxx", "Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
@ -130,6 +140,11 @@ void init_display(const char *Productname, const char *Version) {
void refreshtheDisplay() { void refreshtheDisplay() {
uint8_t msgWaiting;
char timeSync, timeState;
char buff[16]; // 16 chars line buffer
time_t t;
// block i2c bus access // block i2c bus access
if (I2C_MUTEX_LOCK()) { if (I2C_MUTEX_LOCK()) {
@ -143,17 +158,6 @@ void refreshtheDisplay() {
if (!DisplayState) if (!DisplayState)
return; return;
uint8_t msgWaiting;
char buff[16]; // 16 chars line buffer
#if (defined HAS_DCF77) || (defined HAS_IF482)
const char timeNosyncSymbol = '?';
#if (defined HAS_IF482)
const char timesyncSymbol = '+';
#else
const char timesyncSymbol = '*';
#endif
#endif
// update counter (lines 0-1) // update counter (lines 0-1)
snprintf( snprintf(
buff, sizeof(buff), "PAX:%-4d", buff, sizeof(buff), "PAX:%-4d",
@ -221,12 +225,12 @@ void refreshtheDisplay() {
// update LoRa status display (line 6) // update LoRa status display (line 6)
u8x8.printf("%-16s", display_line6); u8x8.printf("%-16s", display_line6);
#else // we want a systime display instead LoRa status #else // we want a systime display instead LoRa status
time_t t = myTZ.toLocal(best_time()); t = myTZ.toLocal(best_time());
char timeState = timeSync = (timeStatus() == timeSet) ? timesyncSymbol : timeNosyncSymbol;
(timeStatus() == timeSet) ? timesyncSymbol : timeNosyncSymbol; timeState = TimePulseTick ? timeSync : ' ';
char timePulse = TimePulseTick ? '.' : ':'; TimePulseTick = false;
u8x8.printf("%02d:%02d%c%02d%c %2d.%3s", hour(t), minute(t), timePulse, u8x8.printf("%02d:%02d:%02d%c %2d.%3s", hour(t), minute(t), second(t),
second(t), timeState, day(t), printmonth[month(t)]); timeState, day(t), printmonth[month(t)]);
#endif #endif
// update LMiC event display (line 7) // update LMiC event display (line 7)