From 90ac468c8eb31d83132ae4bf11eacec1511b2dad Mon Sep 17 00:00:00 2001
From: anschrammh <bugreport@laposte.net>
Date: Sun, 1 Sep 2019 21:36:43 +0200
Subject: [PATCH] Modified the main app

---
 src/app/app.ino | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/app/app.ino b/src/app/app.ino
index 00091cd..885ff31 100644
--- a/src/app/app.ino
+++ b/src/app/app.ino
@@ -10,9 +10,9 @@
 
 SAB sab;
 
-unsigned long currentMs = 0, batteryMs = 0, buttonMs = 0;
+unsigned long currentMs = 0, buttonMs = 0;
 volatile boolean ioStateChange(false);
-View1Packet v1p = {sab.getRtcManager().getDateTime(), sab.getSdCardManager().getSize(GBYTE), sab.getPowerInfo(),0, sab.getSoftVersion()};
+View1Packet v1p = {sab.getRtcManager().getDateTime(), sab.getSdCardManager().getSize(GBYTE), sab.getPowerInfo(),0, sab.getSoftVersion(), &sab};
 ViewAPPacket vap = {sab.getConnectivityManager().softAPmacAddress(), sab.getConnectivityManager().softAPSSID(), sab.getConnectivityManager().softAPIP(), sab.getConnectivityManager().softAPgetStationNum()};
 ViewSTAPacket vstap = {sab.getConnectivityManager().macAddress(), sab.getConnectivityManager().localIP(), sab.getConnectivityManager().RSSI()};
 ViewIoInfoPacket vio = {{0},{0}};
@@ -64,8 +64,8 @@ void setup()
   sab.getWebServerManager().addApiRoutine("/sab/sdcard/unmount", &(sdCardUnmountApi), &sdCardApiPacket, WEBServerManager::GET);
   sab.getWebServerManager().addApiRoutine("/sab/sdcard/mount", &(sdCardMountApi), &sdCardApiPacket, WEBServerManager::GET);
   
-  sab.getWebServerManager().addApiRoutine("/esp/restart", &(espRestartApi), NULL, WEBServerManager::GET);
-  sab.getWebServerManager().addApiRoutine("/esp/reset", &(espResetApi), NULL, WEBServerManager::GET);
+  sab.getWebServerManager().addApiRoutine("/esp/restart", &(espRestartApi), &sab, WEBServerManager::GET);
+  sab.getWebServerManager().addApiRoutine("/esp/reset", &(espResetApi), &sab, WEBServerManager::GET);
   sab.getWebServerManager().addApiRoutine("/sab/wifi/stainfo", &(staWifiInfoApi), &sab, WEBServerManager::GET);
   sab.getWebServerManager().addApiRoutine("/sab/systeminfo", &(systemInfoApi), &sab, WEBServerManager::GET);
   sab.getWebServerManager().addApiRoutine("/sab/power/info", &(powerInfoApi), &sab, WEBServerManager::GET);
@@ -79,6 +79,7 @@ void setup()
   sab.getTaskSchedulerManager().addTask(1, TaskSchedulerManagerHelper::Schedule::scheduleBuilder()->setEnabled(false), &(task1));
   sab.getTaskSchedulerManager().addTask(2, TaskSchedulerManagerHelper::Schedule::scheduleBuilder()->setMillis(5000)->setEnabled(false), &(task2));
   sab.getTaskSchedulerManager().addTask(3, TaskSchedulerManagerHelper::Schedule::scheduleBuilder()->setMillis(5000), &(task_blink), &sab);
+  sab.getTaskSchedulerManager().addTask(4, TaskSchedulerManagerHelper::Schedule::scheduleBuilder()->setSeconds(10), &(task_batt_sensing), &v1p);
   
   Serial.println("End setup");
 }
@@ -106,17 +107,7 @@ void loop()
     if(ioStateChange) Serial.println(F("ISR triggered"));
     ioStateChange = false;
   }
-
-  if(millis() - batteryMs >= 10000)
-  {
-    batteryMs = millis();
-    v1p.powerInfo = sab.getPowerInfo();
-    #ifdef DEBUG
-    Serial.print(F("Running : "));Serial.println(millis()/1000);
-    #endif
-  }
-    
-
+  
   if(digitalRead(GPIO_0) == 0 && millis() - buttonMs > 500)
   {
     buttonMs = millis();