Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-08 12:37:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix: rebooting to squeezelite now works

Browse Source
This commit is contained in:
Sebastien
2019-10-03 22:45:46 -04:00
parent 5cf92a40f7
commit aa81f39712
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/cmd_system/cmd_system.c
View File

@@ -142,6 +142,12 @@ static int restart(int argc, char **argv)
guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY); guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY);
return 0; // return fail. This should never return... we're rebooting! return 0; // return fail. This should never return... we're rebooting!
} }
esp_err_t guided_restart_ota(){
guided_boot(ESP_PARTITION_SUBTYPE_APP_OTA_0);
// If we're still alive, then there may not be an ota partition to boot from
guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY);
return ESP_FAIL; // return fail. This should never return... we're rebooting!
}
esp_err_t guided_factory(){ esp_err_t guided_factory(){
guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY); guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY);
return ESP_FAIL; // return fail. This should never return... we're rebooting! return ESP_FAIL; // return fail. This should never return... we're rebooting!

1
components/cmd_system/cmd_system.h
View File

@@ -15,6 +15,7 @@ extern "C" {
// Register system functions // Register system functions
void register_system(); void register_system();
esp_err_t guided_factory(); esp_err_t guided_factory();
esp_err_t guided_restart_ota();
#ifdef __cplusplus #ifdef __cplusplus
} }

2
components/wifi-manager/http_server.c
View File

@@ -480,7 +480,7 @@ void http_server_netconn_serve(struct netconn *conn) {
netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); /* 200 ok */ netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); /* 200 ok */
} }
else if(strstr(line, "POST /reboot.json ")){ else if(strstr(line, "POST /reboot.json ")){
esp_restart(); guided_restart_ota();
} }
else if(strstr(line, "POST /recovery.json ")){ else if(strstr(line, "POST /recovery.json ")){
guided_factory(); guided_factory();