Merge pull request #947 from cyberman54/development

v3.4.7

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)

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
 
 */

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) {