mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into pre-release-850

This commit is contained in:
Theo Arends 2020-09-02 15:00:36 +02:00
parent 69765f5706 79c52ce1ef
commit efd4a6b542
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tasmota/xdrv_23_zigbee_9a_upload.ino
View File

@ -491,28 +491,25 @@ const char HTTP_SCRIPT_XFER_STATE[] PROGMEM =
"if(x.readyState==4&&x.status==200){" "if(x.readyState==4&&x.status==200){"
"var s=x.responseText;" "var s=x.responseText;"
"if(s!=7){" // ZBU_UPLOAD "if(s!=7){" // ZBU_UPLOAD
"location.href='/u3';" "location.href='/u3';" // Load page HandleUploadDone()
"}" "}"
"}" "}"
"};" "};"
"x.open('GET','" WEB_HANDLE_ZIGBEE_XFER "?m=1',true);" // ?m related to Webserver->hasArg("m") "x.open('GET','" WEB_HANDLE_ZIGBEE_XFER "?z=1',true);" // ?z related to Webserver->hasArg("z")
"x.send();" "x.send();"
"if(pc==1){" "lt=setTimeout(z9,950);" // Poll every 0.95 second
"lt=setTimeout(z9,950);" // Poll every 0.95 second
"}"
"}" "}"
"pc=1;" "wl(z9);"; // Execute z9() on page load
"wl(z9);";
void HandleZigbeeXfer(void) { void HandleZigbeeXfer(void) {
if (!HttpCheckPriviledgedAccess()) { return; } if (!HttpCheckPriviledgedAccess()) { return; }
if (Webserver->hasArg("m")) { // Status refresh requested if (Webserver->hasArg("z")) { // Status refresh requested
WSContentBegin(200, CT_PLAIN); WSContentBegin(200, CT_PLAIN);
WSContentSend_P(PSTR("%d"), ZbUpload.state); WSContentSend_P(PSTR("%d"), ZbUpload.state);
WSContentEnd(); WSContentEnd();
if (ZBU_ERROR == ZbUpload.state) { if (ZBU_ERROR == ZbUpload.state) {
Web.upload_error = 7; // Upload aborted (failed) Web.upload_error = 7; // Upload aborted (xmodem transfer failed)
} }
return; return;
} }
@ -522,7 +519,7 @@ void HandleZigbeeXfer(void) {
WSContentStart_P(S_INFORMATION); WSContentStart_P(S_INFORMATION);
WSContentSend_P(HTTP_SCRIPT_XFER_STATE); WSContentSend_P(HTTP_SCRIPT_XFER_STATE);
WSContentSendStyle(); WSContentSendStyle();
WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD_TRANSFER "...</b></div>")); WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPLOAD_TRANSFER " ...</b></div>"));
WSContentSpaceButton(BUTTON_MAIN); WSContentSpaceButton(BUTTON_MAIN);
WSContentStop(); WSContentStop();
} }