Merge pull request #947 from cyberman54/development

v3.4.7
cyberman54 · Mar 5, 2023 · 603a188 · 603a188
2 parents 6ae1cf4 + e7a3d24
commit 603a188
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/include/senddata.h b/include/senddata.h
@@ -15,7 +15,7 @@ void sendData(void);
 void checkSendQueues(void);
 void flushQueues(void);
 bool allQueuesEmtpy(void);
-void setSendIRQ(TimerHandle_t xTimer);
+//void setSendIRQ(TimerHandle_t xTimer);
 void setSendIRQ(void);
 
 #endif // _SENDDATA_H_
diff --git a/platformio_orig.ini b/platformio_orig.ini
@@ -46,15 +46,15 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
 
 [common]
 ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
-release_version = 3.4.62
+release_version = 3.4.7
 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
 debug_level = 3
 extra_scripts = pre:src/build.py
 otakeyfile = ota.conf
 lorakeyfile = loraconf.h
 lmicconfigfile = lmic_config.h
-platform_espressif32 = espressif32@6.0.0
+platform_espressif32 = espressif32@6.0.1
 monitor_speed = 115200
 upload_speed = 115200 ; set by build.py and taken from hal file
 lib_deps_lora =
@@ -78,11 +78,11 @@ lib_deps_sensors =
 lib_deps_basic =
     greyrook/libpax @ ^1.1.0
     https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
-    bblanchon/ArduinoJson @ ^6.20.0
-    makuna/RTC @ ^2.3.5
+    bblanchon/ArduinoJson @ ^6.20.1
+    makuna/RTC @ ^2.3.6
     mathertel/OneButton @ ^2.0.3
     lewisxhe/XPowersLib @ ^0.1.5
-    256dpi/MQTT @ ^2.5.0
+    256dpi/MQTT @ ^2.5.1
 lib_deps_all =
     ${common.lib_deps_basic}
     ${common.lib_deps_lora}

diff --git a/platformio_orig_s3.ini b/platformio_orig_s3.ini
@@ -10,15 +10,15 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
 
 [common]
 ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
-release_version = 3.4.62
+release_version = 3.4.7
 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
 debug_level = 3
 extra_scripts = pre:src/build.py
 otakeyfile = ota.conf
 lorakeyfile = loraconf.h
 lmicconfigfile = lmic_config.h
-platform_espressif32 = espressif32@6.0.0
+platform_espressif32 = espressif32@6.0.1
 monitor_speed = 115200
 upload_speed = 115200 ; set by build.py and taken from hal file
 lib_deps_all =
@@ -27,9 +27,9 @@ lib_deps_all =
     fastled/FastLED @ ^3.5.0
     greyrook/libpax @ ^1.1.0
     https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
-    bblanchon/ArduinoJson @ ^6.20.0
+    bblanchon/ArduinoJson @ ^6.20.1
     mathertel/OneButton @ ^2.0.3
-    256dpi/MQTT @ ^2.5.0
+    256dpi/MQTT @ ^2.5.1
     ricmoo/QRCode @ ^0.0.1
 build_flags_basic =
     -include "src/paxcounter.conf"

diff --git a/src/display.cpp b/src/display.cpp
@@ -37,7 +37,6 @@ MY_FONT_LARGE:     16x32px = 8 chars / line @ 2 lines
 #include "globals.h"
 #include "display.h"
 
-
 static uint8_t plotbuf[PLOTBUFFERSIZE] = {0};
 uint8_t DisplayIsOn = 0;
 hw_timer_t *displayIRQ = NULL;
@@ -374,8 +373,8 @@ void dp_refresh(bool nextPage) {
 #ifdef HAS_BUTTON
     dp_clear();
     break;
-#else // skip this page
-    DisplayPage++;
+#else // skip this page and start over
+    DisplayPage = 0;
     break;
 #endif
   } // switch (page)

diff --git a/src/main.cpp b/src/main.cpp
@@ -71,7 +71,7 @@ PMUIRQ          <- GPIO <- PMU chip
 Application IRQs fired by software:
 TIMESYNC_IRQ    <- setTimeSyncIRQ() <- Ticker.h
 CYCLIC_IRQ      <- setCyclicIRQ() <- Ticker.h
-SENDCYCLE_IRQ   <- setSendIRQ() <- xTimer or libpax callback
+SENDCYCLE_IRQ   <- setSendIRQ() <- libpax callback
 BME_IRQ         <- setBMEIRQ() <- Ticker.h
 
 */

diff --git a/src/senddata.cpp b/src/senddata.cpp
@@ -1,12 +1,13 @@
 // Basic Config
 #include "senddata.h"
 
+// void setSendIRQ(TimerHandle_t xTimer) {
+//  xTaskNotify(irqHandlerTask, SENDCYCLE_IRQ, eSetBits);
+//}
 
-void setSendIRQ(TimerHandle_t xTimer) {
-  xTaskNotify(irqHandlerTask, SENDCYCLE_IRQ, eSetBits);
-}
+// void setSendIRQ(void) { setSendIRQ(NULL); }
 
-void setSendIRQ(void) { setSendIRQ(NULL); }
+void setSendIRQ(void) { xTaskNotify(irqHandlerTask, SENDCYCLE_IRQ, eSetBits); }
 
 // put data to send in RTos Queues used for transmit over channels Lora and SPI
 void SendPayload(uint8_t port) {