attempting to solve heap poisoning issue

Author: tctlrd

src/config.esp

@@ -3,6 +3,8 @@ bool loadConfiguration(Config &config)
 	File configFile = LittleFS.open("/config.json", "r");
 	if (!configFile)
 	{
+		File configFile = LittleFS.open("/config.json", "w");
+		configFile.close();
 #ifdef DEBUG
 		Serial.println(F("[ WARN ] Failed to open config file!"));
 #endif

src/ethernet.esp

@@ -49,7 +49,7 @@ void WiFiEvent(WiFiEvent_t event)
 	}
 }
 
-void setupEth(bool configured)
+void setupEth()
 {
 	// Add a handler for network events. This is misnamed "WiFi" because the ESP32 is historically WiFi only,
 	// but in our case, this will react to Ethernet events.

src/main.cpp

@@ -27,8 +27,6 @@ SOFTWARE.
 
 #define VERSION "0.3.0"
 
-bool eth_connected = false;
-
 #include "Arduino.h"
 #include "Wire.h"
 #include <SPI.h>
@@ -54,12 +52,13 @@ IO2 io2 = IO2(); // set I2C address of MOD-IO2
 #include <Update.h>
 #include "magicnumbers.h"
 #include "config.h"
-Config config;
+
 #include <WiegandNG.h>
 
+Config config;
 File fsUploadFile;
-
 WiegandNG wg;
+Desfire desfire;
 
 // relay specific variables
 #if MAX_NUM_RELAYS == 4
@@ -79,8 +78,6 @@ bool activateRelay[MAX_NUM_RELAYS] = {false};
 bool deactivateRelay[MAX_NUM_RELAYS] = {false};
 #endif
 
-Desfire desfire;
-
 // The PICC master key.
 // This 3K3DES or AES key is the "god key".
 // It allows to format the card and erase ALL it's content (except the PICC master key itself).
@@ -151,6 +148,7 @@ unsigned long currentMillis = 0;
 unsigned long deltaTime = 0;
 bool doEnableWifi = false;
 bool doEnableEth = false;
+bool eth_connected = false;
 bool formatreq = false;
 const char *httpUsername = "admin";
 unsigned long keyTimer = 0;
@@ -287,10 +285,7 @@ void setup()
 	bool configured = false;
 	configured = loadConfiguration(config);
 	// ethernet setup
-	bool configuredeth = false;
-	configuredeth = configured;
-	eth_connected = false;
-	setupEth(configuredeth);
+	setupEth();
 	config.ipAddressEth = ETH.localIP();
 	config.gatewayIpEth = ETH.gatewayIP();
 	config.subnetIpEth = ETH.subnetMask();
@@ -354,7 +349,6 @@ void IRAM_ATTR loop()
 	}
 
 	// relay
-
 	for (int currentRelay = 0; currentRelay < config.numRelays; currentRelay++)
 	{
 		if (config.lockType[currentRelay] == LOCKTYPE_CONTINUOUS) // Continuous relay mode

src/wifi.esp

@@ -226,7 +226,7 @@ void setupWifi(bool configured)
 {
     if (!configured)
     {
-        WiFi.hostname("esp32-actl");
+        WiFi.hostname(config.deviceHostname);
         fallbacktoAPMode();
     }
     else

src/wsResponses.esp

@@ -102,8 +102,7 @@ void sendStatus(AsyncWebSocketClient *client)
 {
 	JsonDocument root;
 	root["command"] = "status";
-	bool ethenabled = false;
-	ethenabled = true;
+	bool ethenabled = true;
 	root["ethernet"] = ethenabled;
 	root["heap"] = ESP.getFreeHeap();
 	root["heapsize"] = ESP.getHeapSize();