more fixes

Software/data_src/index.htm

@@ -163,16 +163,16 @@
         <h4>Akku-Variante</h4>
         <form action="post.htm" method="POST" class="form-horizontal">
           <div class="form-group row">
-            <label for="sourceselect" class="control-label col-4">Akku</label>
+            <label for="battery_select" class="control-label col-4">Akku</label>
             <div class="col-8">
-              <select id="sourceselect" name="sourceselect" class="select form-control">
+              <select id="battery_select" name="battery_select" class="select form-control">
                 %BATTERY_SELECT_OPTIONS%
               </select>
             </div>
           </div>
           <div class="form-group row">
             <div class="col text-center">
-              <button name="sourcesave" type="submit" class="btn btn-outline-primary">&Uuml;bernehmen</button>
+              <button name="settingssave" type="submit" class="btn btn-outline-primary">&Uuml;bernehmen</button>
             </div>
           </div>
         </form>
@@ -251,15 +251,15 @@
             </tr>
             <tr>
               <td>faction_1_timer</td>
-              <td>%FACTION_1_TIMER%</td>
+              <td>%POINTS_FAC_1%</td>
             </tr>
             <tr>
               <td>faction_2_timer</td>
-              <td>%FACTION_2_TIMER%</td>
+              <td>%POINTS_FAC_2%</td>
             </tr>
             <tr>
               <td>faction_3_timer</td>
-              <td>%FACTION_3_TIMER%</td>
+              <td>%POINTS_FAC_3%</td>
             </tr>
             <tr>
               <td>checksum</td>

Software/data_src/static/tt_dtc/dtc_12.json

@@ -1,4 +1,4 @@
 {
     "title": "Akku-Spannung kritisch",
-    "description": "Die Akkuspannung ist sehr niedrig. Bitte Akku umgehend ersetzen um eine schändliche Tiefentladung zu vermeiden!"
+    "description": "Die Akkuspannung ist sehr niedrig. Bitte Akku umgehend ersetzen um eine schädliche Tiefentladung zu vermeiden!"
 }

Software/data_src/version

@@ -1 +1 @@
-1.1
+1.01

Software/include/dtc.h

@@ -3,11 +3,11 @@
 
 #include <Arduino.h>
 
-#define MAX_DTC_STORAGE 6
+#define MAX_DTC_STORAGE 12
 
 typedef enum DTCNums_e
 {
-  DTC_NO_EEPROM_FOUND,
+  DTC_NO_EEPROM_FOUND = 1,
   DTC_EEPROM_CFG_BAD,
   DTC_EEPROM_PDS_BAD,
   DTC_EEPROM_PDSADRESS_BAD,

Software/platformio.ini

@@ -27,7 +27,7 @@ upload_speed = 921600
 build_flags=
   !python git_rev_macro.py
   -DATOMIC_FS_UPDATE
-  -DFEATURE_ENABLE_WIFI_CLIENT
+  ;-DFEATURE_ENABLE_WIFI_CLIENT
   ;-DFEATURE_ENABLE_LORA
   ;-DCAPTIVE
   -DWIFI_AP_IP_GW=10,0,1,1

Software/src/debugger.cpp

@@ -124,31 +124,6 @@ void Debug_pushMessage(const char *format, ...)
     }
 }
 
-void pushCANDebug(uint32_t id, uint8_t dlc, uint8_t *data)
-{
-    if ((DebuggerStatus[dbg_Serial] == enabled) || (DebuggerStatus[dbg_Webui] == enabled))
-    {
-        char buff[100];
-        char *p = buff;
-        p += snprintf(p, sizeof(buff), "CAN: 0x%08X | %d | ", id, dlc);
-        for (int i = 0; i < dlc; i++)
-        {
-            p += snprintf(p, sizeof(buff) - (p - buff), "%02X ", data[i]);
-        }
-        *(p++) = '\n';
-        *p = '\0';
-
-        if (DebuggerStatus[dbg_Serial] == enabled)
-        {
-            Serial.print(buff);
-        }
-        if (DebuggerStatus[dbg_Webui] == enabled)
-        {
-            Websocket_PushLiveDebug(String(buff));
-        }
-    }
-}
-
 void processCmdDebug(String command)
 {
     if (command == "help")
@@ -199,7 +174,6 @@ void Debug_formatPersistence()
 
 void Debug_printSystemInfo()
 {
-    Debug_pushMessage("Souko's ChainOiler Mk1\n");
     Debug_pushMessage("Hostname: %s\n", globals.DeviceName);
 
     FlashMode_t ideMode = ESP.getFlashChipMode();

Software/src/main.cpp

@@ -135,6 +135,7 @@ void setup()
 	WiFi.setHostname(globals.DeviceName);
 	wifiMulti.addAP(QUOTE(WIFI_SSID_CLIENT), QUOTE(WIFI_PASSWORD_CLIENT));
 	tmrWiFiMaintainConnection.start();
+	Serial.print("WiFi-Client Initialized\n");
 #else
 	WiFi.mode(WIFI_OFF);
 #endif
@@ -412,8 +413,8 @@ void tmrCallback_PowerMonitor()
 		break;
 	}
 
-	MaintainDTC(DTC_BAT_CRITICAL, DTC_CRITICAL, (battery_level < 5 ? true : false), battery_level);
 	MaintainDTC(DTC_BAT_LOW, DTC_WARN, (battery_level < 15 ? true : false), battery_level);
+	MaintainDTC(DTC_BAT_CRITICAL, DTC_CRITICAL, (battery_level < 5 ? true : false), battery_level);
 
 	// Serial.printf("Battery Level: %d %%\n", globals.battery_level);
 	// Serial.printf("Bus Voltage: %f V\n", busvoltage);

Software/src/webui.cpp

@@ -177,14 +177,8 @@ String processor(const String &var)
     return String(buff);
   }
 
-  if (var == "STATUS_FAC_1")
+  if (var == "ACTIVE_FACTION")
-    return PersistenceData.activeFaction == FACTION_1 ? "ACTIVE" : "INACTIVE";
+    return String(PersistenceData.activeFaction);
-
-  if (var == "STATUS_FAC_2")
-    return PersistenceData.activeFaction == FACTION_2 ? "ACTIVE" : "INACTIVE";
-
-  if (var == "STATUS_FAC_3")
-    return PersistenceData.activeFaction == FACTION_3 ? "ACTIVE" : "INACTIVE";
 
   if (var == "NAME_FAC_1")
     return FACTION_1_NAME;
@@ -225,8 +219,36 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
     AsyncWebParameter *p = request->getParam(i);
     Debug_pushMessage("%s : %s\n", p->name().c_str(), p->value().c_str());
 
+    // begin: POST Form Maintenance
+    if (p->name() == "reset_ee_btn")
+    {
+      if (request->hasParam("reset_ee_pds", true))
+      {
+        AsyncWebParameter *param = request->getParam("reset_ee_pds", true);
+        if (param->value() == "on")
+          globals.requestEEAction = globals.requestEEAction == EE_CFG_FORMAT ? EE_FORMAT_ALL : EE_PDS_FORMAT;
+      }
+      if (request->hasParam("reset_ee_cfg", true))
+      {
+        AsyncWebParameter *param = request->getParam("reset_ee_cfg", true);
+        if (param->value() == "on")
+          globals.requestEEAction = globals.requestEEAction == EE_PDS_FORMAT ? EE_FORMAT_ALL : EE_CFG_FORMAT;
+      }
+    }
+    if (p->name() == "reboot")
+    {
+      globals.systemStatus = sysStat_Shutdown;
+    }
+    // end: POST Form Maintenance
+
     // begin: POST Form Settings
-    if (p->name() == "cmdsubmit")
+    if (p->name() == "battery_select")
+    {
+      batteryType_t temp = (batteryType_t)p->value().toInt();
+      ConfigData.batteryType = temp;
+    }
+
+    if (p->name() == "settingssave")
       globals.requestEEAction = EE_CFG_SAVE;
     // end: POST Form Settings
   }