Airsoft/DarkEmergency-Timer
Airsoft/DarkEmergency-Timer
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

more fixes

Browse Source
This commit is contained in:
Marcel Peterkau 2023-04-13 01:28:41 +02:00
parent 5a6dc524ad
commit ca9409e328
7 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Software/data_src/index.htm
View File

@ -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>

2
Software/data_src/static/tt_dtc/dtc_12.json
View File

@ -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!"
}

2
Software/data_src/version
View File

@ -1 +1 @@
1.1
1.01

2
Software/include/dtc.h
View File

@ -3,7 +3,7 @@
#include <Arduino.h>
#define MAX_DTC_STORAGE 6
#define MAX_DTC_STORAGE 12
typedef enum DTCNums_e
{

2
Software/platformio.ini
View File

@ -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

3
Software/src/main.cpp
View File

@ -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);

40
Software/src/webui.cpp
View File

@ -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
}