From 9f2909d49006e7a4311315c13a15607a5eeb9a90 Mon Sep 17 00:00:00 2001
From: Harish Karumuthil <harish2704@gmail.com>
Date: Mon, 14 Feb 2022 01:49:32 +0530
Subject: [PATCH 1/2] Rename conflicting variable 'filename' to uploadFilename
 Fixes #2

---
 esppic/esppic.ino | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/esppic/esppic.ino b/esppic/esppic.ino
index d9abf7b..09a8237 100644
--- a/esppic/esppic.ino
+++ b/esppic/esppic.ino
@@ -21,7 +21,7 @@
 
 ESP8266WebServer server(80);
 WebSocketsServer webSocket = WebSocketsServer(81);
-String filename;
+String uploadFilename;
 File fsUploadFile;
 char resetflag=0;
 uint8_t wsNum;
@@ -49,7 +49,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
       if (payload[0]=='R') resetflag=payload[1];
       if (payload[0]=='F' && payload[1]=='L') {
         Serial.println("[flash]");
-        PicFlash(filename);
+        PicFlash(uploadFilename);
       }
       break;
     case WStype_BIN:
@@ -72,16 +72,16 @@ void handleFileUpload() {
   HTTPUpload& upload = server.upload();
   if(upload.status == UPLOAD_FILE_START){
     bytesSoFar=0;
-    filename = upload.filename;
-    sprintf(tmps,"f%s",filename.c_str());
+    uploadFilename = upload.filename;
+    sprintf(tmps,"f%s",uploadFilename.c_str());
     webSocket.sendTXT(wsNum, tmps);
     sprintf(tmps,"s%d/%d bytes uploaded",bytesSoFar,upload.totalSize);
     webSocket.sendTXT(wsNum, tmps);
     webSocket.sendTXT(wsNum, "pUploading file");
-    if (filename.endsWith(".hex")) filename = "/hex/"+filename;
-    else filename="/"+filename;
-    Serial.printf("Receiving file %s\n",filename.c_str()); 
-    fsUploadFile = SPIFFS.open(filename, "w");
+    if (uploadFilename.endsWith(".hex")) uploadFilename = "/hex/"+uploadFilename;
+    else uploadFilename="/"+uploadFilename;
+    Serial.printf("Receiving file %s\n",uploadFilename.c_str()); 
+    fsUploadFile = SPIFFS.open(uploadFilename, "w");
   }
   else if(upload.status == UPLOAD_FILE_WRITE){
     if(fsUploadFile) {
@@ -97,7 +97,7 @@ void handleFileUpload() {
     Serial.println("Success");
     webSocket.sendTXT(wsNum, "pFile uploaded" );
     delay(250);
-    PicFlash(filename);
+    PicFlash(uploadFilename);
   }
 }
 
@@ -243,7 +243,7 @@ void setup() {
 
   server.on("/flash", HTTP_GET, []() {
     Serial.println("HTTP_GET /flash");
-    PicFlash(filename);
+    PicFlash(uploadFilename);
     char *html=(char *)malloc(10000);
     strcpy(html,"<h1>FLASH DONE</h1><a href=\"/\">Back</a>");
     server.send(200, "text/html", html);

From e9096c4dc0f8d8b7727da5b3a42da1844523dd4b Mon Sep 17 00:00:00 2001
From: Harish Karumuthil <harish2704@gmail.com>
Date: Mon, 14 Feb 2022 01:56:28 +0530
Subject: [PATCH 2/2] Remove unwanted code which is preventing access to other
 pages Fixes #3

---
 esppic/espconnect.ino | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/esppic/espconnect.ino b/esppic/espconnect.ino
index aaa3800..542e9d8 100644
--- a/esppic/espconnect.ino
+++ b/esppic/espconnect.ino
@@ -65,11 +65,6 @@ void ConnectToWifi() {
         content += "</html>";
         server.send(200, "text/html", content);  
   });
-  server.begin();
-  while (1) {
-    server.handleClient();
-    delay(1);
-  }
 }