Skip to content

Rename conflicting variable 'filename' to uploadFilename #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harish2704 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename conflicting variable 'filename' to uploadFilename #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions esppic/esppic.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

ESP8266WebServer server(80);
WebSocketsServer webSocket = WebSocketsServer(81);
String filename;
String uploadFilename;
File fsUploadFile;
char resetflag=0;
uint8_t wsNum;
Expand Down Expand Up @@ -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:
Expand All @@ -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) {
Expand All @@ -97,7 +97,7 @@ void handleFileUpload() {
Serial.println("Success");
webSocket.sendTXT(wsNum, "pFile uploaded" );
delay(250);
PicFlash(filename);
PicFlash(uploadFilename);
}
}

Expand Down Expand Up @@ -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);
Expand Down