github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-05-04 15:16:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed factory reset

Browse Source
This commit is contained in:
Gunnar Skjold
2020-09-05 20:03:06 +02:00
parent a2c1c8fc61
commit 644a3fa40b
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/AmsConfiguration.cpp
View File

@@ -84,6 +84,7 @@ void AmsConfiguration::clearWifi() {
setWifiSsid(""); setWifiSsid("");
setWifiPassword(""); setWifiPassword("");
setWifiHostname(""); setWifiHostname("");
setMdnsEnable(true);
clearWifiIp(); clearWifiIp();
} }
@@ -305,12 +306,14 @@ void AmsConfiguration::setSendUnknown(bool sendUnknown) {
} }
void AmsConfiguration::clearMeter() { void AmsConfiguration::clearMeter() {
uint8_t blankKey[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
setMeterType(0); setMeterType(0);
setDistributionSystem(0); setDistributionSystem(0);
setMainFuse(0); setMainFuse(0);
setProductionCapacity(0); setProductionCapacity(0);
setMeterEncryptionKey(nullptr); setMeterEncryptionKey(blankKey);
setMeterAuthenticationKey(nullptr); setMeterAuthenticationKey(blankKey);
setSubstituteMissing(false); setSubstituteMissing(false);
setSendUnknown(false); setSendUnknown(false);
} }

4
src/AmsConfiguration.h
View File

@@ -327,8 +327,8 @@ private:
0, // Distribution system 0, // Distribution system
0, // Main fuse 0, // Main fuse
0, // Production capacity 0, // Production capacity
{}, // Encryption key { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // Encryption key
{}, // Authentication key { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // Authentication key
false, // Substitute false, // Substitute
false, // Send unknown false, // Send unknown
false, // Debug telnet false, // Debug telnet

4
src/web/AmsWebServer.cpp
View File

@@ -1403,9 +1403,13 @@ void AmsWebServer::factoryResetHtml() {
} }
void AmsWebServer::factoryResetPost() { void AmsWebServer::factoryResetPost() {
printD("Performing factory reset");
if(server.hasArg("perform") && server.arg("perform") == "true") { if(server.hasArg("perform") && server.arg("perform") == "true") {
printD("Formatting SPIFFS");
SPIFFS.format(); SPIFFS.format();
printD("Clearing configuration");
config->clear(); config->clear();
printD("Setting restart flag and redirecting");
performRestart = true; performRestart = true;
server.sendHeader("Location","/restart-wait"); server.sendHeader("Location","/restart-wait");
server.send(303); server.send(303);