minor changes

Author: tctlrd

bin/deploydebug.bin

@@ -143,6 +143,7 @@ AsyncWebSocket ws("/ws");
 #define BEEPERon LOW
 
 // Variables for whole scope
+bool configured = false;
 unsigned long cooldown = 0;
 unsigned long currentMillis = 0;
 unsigned long deltaTime = 0;
@@ -282,7 +283,6 @@ void setup()
 	delay(700);
 	io2.setRelay(RELAY2, OFF);
 #endif
-	bool configured = false;
 	configured = loadConfiguration(config);
 	// ethernet setup
 	setupEth();

src/main.cpp

@@ -39,7 +39,6 @@ void addWsMessageToQueue(AsyncWebSocketClient *client, int messageSize)
 void processWsMessage(WsMessage *incomingMessage)
 {
 	// We should always get a JSON object (stringfied) from browser, so parse it
-	// DynamicJsonDocument root(2448);
 	JsonDocument root;
 	AsyncWebSocketClient *client = incomingMessage->client;
 	// cast to const char * to avoid in-place editing of serializedMessage
@@ -217,8 +216,9 @@ void processWsMessage(WsMessage *incomingMessage)
 		lastNTPepoch = t;
 		sendTime(client);
 	}
-	else if (strcmp(command, "getconf") == 0)
+	else if (strcmp(command, "getconf") == 0 && configured)
 	{
+		Serial.println(F("[ WARN ] getconf executing"));
 		File configFile = LittleFS.open("/config.json", "r");
 		if (configFile)
 		{
@@ -232,6 +232,7 @@ void processWsMessage(WsMessage *incomingMessage)
 			configFile.close();
 		}
 	}
+	
 	free(incomingMessage->serializedMessage);
 	free(incomingMessage);
 	yield();

src/websocket.esp

@@ -191,9 +191,9 @@ void sendStatus(AsyncWebSocketClient *client)
 	root["dnseth"] = printIP(dnseth);
 	root["maceth"] = config.ethmac;
 	root["speedeth"] = config.ethlink;
-
 	size_t len = measureJson(root);
 	AsyncWebSocketMessageBuffer *buffer = ws.makeBuffer(len);
+
 	if (buffer)
 	{
 		serializeJson(root, (char *)buffer->get(), len + 1);