diff --git a/Software/data_src/index.htm b/Software/data_src/index.htm
index 59e1dc7..b93875e 100644
--- a/Software/data_src/index.htm
+++ b/Software/data_src/index.htm
@@ -163,16 +163,16 @@
Akku-Variante
@@ -251,15 +251,15 @@
faction_1_timer |
- %FACTION_1_TIMER% |
+ %POINTS_FAC_1% |
faction_2_timer |
- %FACTION_2_TIMER% |
+ %POINTS_FAC_2% |
faction_3_timer |
- %FACTION_3_TIMER% |
+ %POINTS_FAC_3% |
checksum |
diff --git a/Software/data_src/static/tt_dtc/dtc_12.json b/Software/data_src/static/tt_dtc/dtc_12.json
index 82a459e..a72dbd3 100644
--- a/Software/data_src/static/tt_dtc/dtc_12.json
+++ b/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!"
}
\ No newline at end of file
diff --git a/Software/data_src/version b/Software/data_src/version
index b123147..96aeaa6 100644
--- a/Software/data_src/version
+++ b/Software/data_src/version
@@ -1 +1 @@
-1.1
\ No newline at end of file
+1.01
\ No newline at end of file
diff --git a/Software/include/dtc.h b/Software/include/dtc.h
index abd9994..78ab1af 100644
--- a/Software/include/dtc.h
+++ b/Software/include/dtc.h
@@ -3,7 +3,7 @@
#include
-#define MAX_DTC_STORAGE 6
+#define MAX_DTC_STORAGE 12
typedef enum DTCNums_e
{
diff --git a/Software/platformio.ini b/Software/platformio.ini
index d981129..d44a439 100644
--- a/Software/platformio.ini
+++ b/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
diff --git a/Software/src/main.cpp b/Software/src/main.cpp
index bd8f764..17c2ab9 100644
--- a/Software/src/main.cpp
+++ b/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);
diff --git a/Software/src/webui.cpp b/Software/src/webui.cpp
index f74b1a8..a7aab47 100644
--- a/Software/src/webui.cpp
+++ b/Software/src/webui.cpp
@@ -177,14 +177,8 @@ String processor(const String &var)
return String(buff);
}
- if (var == "STATUS_FAC_1")
- return PersistenceData.activeFaction == FACTION_1 ? "ACTIVE" : "INACTIVE";
-
- 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 == "ACTIVE_FACTION")
+ return String(PersistenceData.activeFaction);
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
}