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

recovery mode detection

Browse Source
This commit is contained in:
Christian Herzog
2019-09-18 21:03:59 +02:00
parent fd235df8fb
commit 560c9c2d81
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/wifi-manager/code.js
View File

@@ -11,7 +11,7 @@ if (!String.prototype.format) {
}; };
} }
var recovery = 0; var recovery = false;
var enableTimers = true; var enableTimers = true;
var commandHeader = 'squeezelite -b 500:2000 -d all=info '; var commandHeader = 'squeezelite -b 500:2000 -d all=info ';
@@ -187,16 +187,6 @@ $(document).ready(function(){
selectOutput(this); selectOutput(this);
}); });
if (recovery) {
$("#recoverydiv").hide();
$("#otadiv").show();
$("#command_line").hide();
$("#wifi").hide();
} else {
$("#recoverydiv").show();
$("#otadiv").hide();
}
//first time the page loads: attempt to get the connection status and start the wifi scan //first time the page loads: attempt to get the connection status and start the wifi scan
refreshAP(); refreshAP();
getConfig(); getConfig();
@@ -379,6 +369,19 @@ function getConfig() {
$("#autoexec-cb")[0].checked=false; $("#autoexec-cb")[0].checked=false;
$("#autoexec-command").hide(200); $("#autoexec-command").hide(200);
} }
}
if (data.hasOwnProperty('recovery')) {
if (data["recovery"] === 1) {
recovery = true;
$("#recoverydiv").hide();
$("#otadiv").show();
$("#command_line").hide();
$("#wifi").hide();
} else {
recovery = false;
$("#recoverydiv").show();
$("#otadiv").hide();
}
} }
if (data.hasOwnProperty('list')) { if (data.hasOwnProperty('list')) {
data.list.forEach(function(line) { data.list.forEach(function(line) {

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

@@ -37,7 +37,7 @@ function to process requests, decode URLs, serve files, etc. etc.
/* @brief tag used for ESP serial console messages */ /* @brief tag used for ESP serial console messages */
static const char TAG[] = "http_server"; static const char TAG[] = "http_server";
static const char json_start[] = "{ \"autoexec\": %u, \"list\": ["; static const char json_start[] = "{ \"recovery\": %u, \"autoexec\": %u, \"list\": [";
static const char json_end[] = "]}"; static const char json_end[] = "]}";
static const char template[] = "{ \"%s\": \"%s\" }"; static const char template[] = "{ \"%s\": \"%s\" }";
static const char array_separator[]=","; static const char array_separator[]=",";
@@ -45,6 +45,9 @@ static const char array_separator[]=",";
/* @brief task handle for the http server */ /* @brief task handle for the http server */
static TaskHandle_t task_http_server = NULL; static TaskHandle_t task_http_server = NULL;
#ifndef CONFIG_IS_RECOVERY_MODE
#define CONFIG_IS_RECOVERY_MODE 0
#endif
/** /**
* @brief embedded binary data. * @brief embedded binary data.
@@ -222,7 +225,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); netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY);
autoexec_flag = wifi_manager_get_flag(); autoexec_flag = wifi_manager_get_flag();
snprintf(buff,buflen-1, json_start, autoexec_flag); snprintf(buff,buflen-1, json_start, CONFIG_IS_RECOVERY_MODE, autoexec_flag);
netconn_write(conn, buff, strlen(buff), NETCONN_NOCOPY); netconn_write(conn, buff, strlen(buff), NETCONN_NOCOPY);
do { do {
snprintf(autoexec_name,sizeof(autoexec_name)-1,"autoexec%u",i); snprintf(autoexec_name,sizeof(autoexec_name)-1,"autoexec%u",i);