浏览代码

Jenkins build fix

Sebastien 5 年之前
父节点
当前提交
4ca8bf2e76
共有 2 个文件被更改,包括 2 次插入5 次删除
  1. 1 1
      components/wifi-manager/CMakeLists.txt
  2. 1 4
      components/wifi-manager/wifi_manager.c

+ 1 - 1
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
 
 )

+ 1 - 4
components/wifi-manager/wifi_manager.c

@@ -58,7 +58,7 @@ Contains the freeRTOS task and all necessary support
 #include "esp_app_format.h"
 #include "driver/gpio.h"
 #include "driver/adc.h"
-#include "CJson.h"
+#include "cJSON.h"
 
 #ifndef RECOVERY_APPLICATION
 #define RECOVERY_APPLICATION 0
@@ -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);