Update xdrv_01_webserver.ino

This commit is contained in:
Jason2866 2019-10-15 12:34:16 +02:00 committed by GitHub
parent 3a9e937ae8
commit 5cc8cd979e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -1046,6 +1046,7 @@ void HandleRoot(void)
#endif // USE_SONOFF_IFAN #endif // USE_SONOFF_IFAN
WSContentSend_P(PSTR("</tr></table>")); WSContentSend_P(PSTR("</tr></table>"));
} }
#ifdef USE_RF_BRIDGE
if (SONOFF_BRIDGE == my_module_type) { if (SONOFF_BRIDGE == my_module_type) {
WSContentSend_P(HTTP_TABLE100); WSContentSend_P(HTTP_TABLE100);
WSContentSend_P(PSTR("<tr>")); WSContentSend_P(PSTR("<tr>"));
@ -1059,7 +1060,8 @@ void HandleRoot(void)
} }
WSContentSend_P(PSTR("</tr></table>")); WSContentSend_P(PSTR("</tr></table>"));
} }
#endif // USE_RF_BRIDGE
#ifndef FIRMWARE_MINIMAL #ifndef FIRMWARE_MINIMAL
XdrvCall(FUNC_WEB_ADD_MAIN_BUTTON); XdrvCall(FUNC_WEB_ADD_MAIN_BUTTON);
XsnsCall(FUNC_WEB_ADD_MAIN_BUTTON); XsnsCall(FUNC_WEB_ADD_MAIN_BUTTON);
@ -2100,7 +2102,7 @@ void HandleUploadLoop(void)
Web.config_block_count = 0; Web.config_block_count = 0;
} }
else { else {
#ifdef USE_RF_FLASH #if (defined (USE_RF_FLASH) && defined(USE_RF_BRIDGE))
if ((SONOFF_BRIDGE == my_module_type) && (upload.buf[0] == ':')) { // Check if this is a RF bridge FW file if ((SONOFF_BRIDGE == my_module_type) && (upload.buf[0] == ':')) { // Check if this is a RF bridge FW file
Update.end(); // End esp8266 update session Update.end(); // End esp8266 update session
Web.upload_file_type = UPL_EFM8BB1; Web.upload_file_type = UPL_EFM8BB1;