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

Merge remote-tracking branch 'origin/Over_The_Air_Update' into

Browse Source 
Over_The_Air_Update

Conflicts:
	components/wifi-manager/http_server.c
	components/wifi-manager/wifi_manager.c
This commit is contained in:
Sebastien
2019-09-22 22:35:22 -04:00
parent 3cb3050257 de76b8372e
commit 215477e798
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,7 +355,6 @@ 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); //200ok netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); //200ok
} }
} }
else{ else{
netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY); netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY);

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

@@ -56,6 +56,7 @@ Contains the freeRTOS task and all necessary support
#include "lwip/ip4_addr.h" #include "lwip/ip4_addr.h"
#include "app_update/include/esp_ota_ops.h" #include "app_update/include/esp_ota_ops.h"
#ifndef SQUEEZELITE_ESP32_RELEASE_URL #ifndef SQUEEZELITE_ESP32_RELEASE_URL
#define SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases" #define SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
#endif #endif
@@ -408,7 +409,6 @@ void wifi_manager_generate_ip_info_json(update_reason_code_t update_reason_code)
const char ip_info_json_format[] = ",\"ip\":\"%s\",\"netmask\":\"%s\",\"gw\":\"%s\",\"urc\":%d,\"project_name\":\"%s\",\"version\":\"%s\""; const char ip_info_json_format[] = ",\"ip\":\"%s\",\"netmask\":\"%s\",\"gw\":\"%s\",\"urc\":%d,\"project_name\":\"%s\",\"version\":\"%s\"";
#if RECOVERY_APPLICATION #if RECOVERY_APPLICATION
"\"ota_dsc\":\"%s\", \"ota_pct\":%d"; "\"ota_dsc\":\"%s\", \"ota_pct\":%d";
#endif
"}\n"; "}\n";
memset(ip_info_json, 0x00, JSON_IP_INFO_SIZE); memset(ip_info_json, 0x00, JSON_IP_INFO_SIZE);