From bb3f296cdcee098833631113021fbc7451d8b8e2 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Wed, 2 Oct 2019 16:42:42 -0400 Subject: [PATCH] Jenkins build fix --- components/wifi-manager/CMakeLists.txt | 2 +- components/wifi-manager/wifi_manager.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/components/wifi-manager/CMakeLists.txt b/components/wifi-manager/CMakeLists.txt index 499a6593..a41f9f8f 100644 --- a/components/wifi-manager/CMakeLists.txt +++ b/components/wifi-manager/CMakeLists.txt @@ -1,7 +1,7 @@ idf_component_register(SRCS "dns_server.c" "http_server.c" "json.c" "wifi_manager.c" INCLUDE_DIRS . REQUIRES esp_common - PRIV_REQUIRES newlib freertos spi_flash nvs_flash mdns pthread wpa_supplicant cmd_system + PRIV_REQUIRES newlib freertos spi_flash nvs_flash mdns pthread wpa_supplicant cmd_system json EMBED_FILES style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz ) diff --git a/components/wifi-manager/wifi_manager.c b/components/wifi-manager/wifi_manager.c index a3ae36ec..57d2be1d 100644 --- a/components/wifi-manager/wifi_manager.c +++ b/components/wifi-manager/wifi_manager.c @@ -419,11 +419,8 @@ void wifi_manager_generate_ip_info_json(update_reason_code_t update_reason_code) } - -#if RECOVERY_APPLICATION cJSON_AddItemToObject(ip_info_cjson, "ota_dsc", cJSON_CreateString(ota_get_status())); cJSON_AddNumberToObject(ip_info_cjson,"ota_pct", ota_get_pct_complete() ); -#endif cJSON_AddItemToObject(ip_info_cjson, "Jack", cJSON_CreateString(JACK_LEVEL)); cJSON_AddNumberToObject(ip_info_cjson,"Voltage", adc1_get_raw(ADC1_CHANNEL_7) / 4095. * (10+174)/10. * 1.1);