feat: update the HTTP weather information retrieval API

Fix the issue of getting stuck when the network connection fails.

Author: liangshuzhi5193

examples/ulp/lp_cpu/lp_environment_sensor/components/app_epaper/app_epaper.c

@@ -557,7 +557,7 @@ esp_err_t epaper_display(epaper_handle_t paper, epaper_display_data_t display_da
     epaper_print_string(paper, 30, 78, "Humidity", 12, BLACK);
     epaper_draw_line(paper, 1, 92, 119, 92, BLACK);
 
-#if CONFIG_REGION_OVERSEAS
+#if CONFIG_REGION_INTERNATIONAL
     if (strstr(display_data.text, "Sunny") != NULL) {
         epaper_print_string(paper, 145, 5, "Sunny", 16, BLACK);
         epaper_display_picture(paper, 141, 25, 48, 48, SUNNY, WHITE);
@@ -577,7 +577,7 @@ esp_err_t epaper_display(epaper_handle_t paper, epaper_display_data_t display_da
         epaper_print_string(paper, 150, 5, "Haze", 16, BLACK);
         epaper_display_picture(paper, 141, 25, 48, 48, HAZE, WHITE);
     } else {
-        epaper_print_string(paper, 140, 5, "No data", 16, BLACK);
+        epaper_print_string(paper, 140, 5, "No Wifi", 16, BLACK);
         epaper_display_picture(paper, 141, 25, 48, 48, NO_WEATHER, WHITE);
     }
 #else
@@ -600,7 +600,7 @@ esp_err_t epaper_display(epaper_handle_t paper, epaper_display_data_t display_da
         epaper_print_string(paper, 150, 5, "Haze", 16, BLACK);
         epaper_display_picture(paper, 141, 25, 48, 48, HAZE, WHITE);
     } else {
-        epaper_print_string(paper, 140, 5, "No data", 16, BLACK);
+        epaper_print_string(paper, 140, 5, "No Wifi", 16, BLACK);
         epaper_display_picture(paper, 141, 25, 48, 48, NO_WEATHER, WHITE);
     }
 #endif
@@ -629,7 +629,7 @@ esp_err_t epaper_display(epaper_handle_t paper, epaper_display_data_t display_da
     wind_speed[strlen(wind_speed) + 1] = '\0';
     epaper_print_string(paper, 214, 19, wind_speed, 12, BLACK);
 
-#if CONFIG_REGION_OVERSEAS
+#if CONFIG_REGION_INTERNATIONAL
     int wind_dir_len = strlen(display_data.wind_dir);
     epaper_print_string(paper, 254 - (wind_dir_len * 3), 32, display_data.wind_dir, 12, BLACK);
 #else
@@ -659,7 +659,7 @@ esp_err_t epaper_display(epaper_handle_t paper, epaper_display_data_t display_da
 
     epaper_draw_rectangle(paper, 212, 1, 296, 46, BLACK, 0);
 
-#if CONFIG_REGION_OVERSEAS
+#if CONFIG_REGION_INTERNATIONAL
     int week_len = strlen(display_data.week);
     epaper_print_string(paper, 254 - (week_len * 4), 48, display_data.week, 16, BLACK);
 #else

examples/ulp/lp_cpu/lp_environment_sensor/components/app_wifi/app_http.c

@@ -108,18 +108,19 @@ esp_err_t _http_event_handler(esp_http_client_event_t *evt)
     return ESP_OK;
 }
 
-esp_err_t http_rest_with_url(char *district_id, char *city, char *name, char *text, char *wind_class,
-                             char *wind_dir, char *uptime, char *week, int *high, int *low)
+esp_err_t get_http_weather_data_with_url(http_weather_data_t *weather_data)
 {
+    esp_err_t ret = ESP_OK;
     char local_response_buffer[MAX_HTTP_OUTPUT_BUFFER] = {0};
     char weather_http_url[120] = {0};
-#ifdef CONFIG_REGION_OVERSEAS
+    snprintf(weather_data->district_id, sizeof(weather_data->district_id), "%s", CONFIG_CITY_DISTRICT_ID);
+#ifdef CONFIG_REGION_INTERNATIONAL
     strcat(weather_http_url, "https://api.map.baidu.com/weather_abroad/v1/?district_id=");
-    strcat(weather_http_url, district_id);
+    strcat(weather_http_url, weather_data->district_id);
     strcat(weather_http_url, "&data_type=all&language=en&ak=uKBj61fKPRDbXzv5w3ecFaVove3ZqwlT");
-#elif CONFIG_REGION_DOMESTIC
+#elif CONFIG_REGION_CHINA
     strcat(weather_http_url, "https://api.map.baidu.com/weather/v1/?district_id=");
-    strcat(weather_http_url, district_id);
+    strcat(weather_http_url, weather_data->district_id);
     strcat(weather_http_url, "&data_type=all&ak=uKBj61fKPRDbXzv5w3ecFaVove3ZqwlT");
 #endif
     esp_http_client_config_t config = {
@@ -130,7 +131,11 @@ esp_err_t http_rest_with_url(char *district_id, char *city, char *name, char *te
     };
     esp_http_client_handle_t client = esp_http_client_init(&config);
 
-    esp_http_client_perform(client);
+    ret = esp_http_client_perform(client);
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "HTTP GET request failed: %s", esp_err_to_name(ret));
+        return ret;
+    }
 
     cJSON *root = cJSON_Parse(local_response_buffer);
     cJSON *result = cJSON_GetObjectItem(root, "result");
@@ -145,19 +150,25 @@ esp_err_t http_rest_with_url(char *district_id, char *city, char *name, char *te
     char *pre_wind_class = cJSON_GetObjectItem(now, "wind_class")->valuestring;
     char *pre_wind_dir = cJSON_GetObjectItem(now, "wind_dir")->valuestring;
     char *pre_uptime = cJSON_GetObjectItem(now, "uptime")->valuestring;
-    *high = cJSON_GetObjectItem(first_forecast, "high")->valueint;
-    *low = cJSON_GetObjectItem(first_forecast, "low")->valueint;
     char *pre_week = cJSON_GetObjectItem(first_forecast, "week")->valuestring;
+    int pre_high = cJSON_GetObjectItem(first_forecast, "high")->valueint;
+    int pre_low = cJSON_GetObjectItem(first_forecast, "low")->valueint;
 
-    memcpy(city, pre_city, strlen(pre_city));
-    memcpy(name, pre_name, strlen(pre_name));
-    memcpy(text, pre_text, strlen(pre_text));
-    memcpy(wind_class, pre_wind_class, strlen(pre_wind_class));
-    memcpy(wind_dir, pre_wind_dir, strlen(pre_wind_dir));
-    memcpy(uptime, pre_uptime, strlen(pre_uptime));
-    memcpy(week, pre_week, strlen(pre_week));
+    snprintf(weather_data->city_name, sizeof(weather_data->city_name), "%s", pre_city);
+    snprintf(weather_data->district_name, sizeof(weather_data->district_name), "%s", pre_name);
+    snprintf(weather_data->text, sizeof(weather_data->text), "%s", pre_text);
+    snprintf(weather_data->wind_class, sizeof(weather_data->wind_class), "%s", pre_wind_class);
+    snprintf(weather_data->wind_dir, sizeof(weather_data->wind_dir), "%s", pre_wind_dir);
+    snprintf(weather_data->uptime, sizeof(weather_data->uptime), "%s", pre_uptime);
+    snprintf(weather_data->week, sizeof(weather_data->week), "%s", pre_week);
+    weather_data->temp_high = pre_high;
+    weather_data->temp_low = pre_low;
 
     cJSON_Delete(root);
-    esp_http_client_cleanup(client);
+    ret = esp_http_client_cleanup(client);
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "HTTP cleanup failed: %s", esp_err_to_name(ret));
+        return ret;
+    }
     return ESP_OK;
 }

examples/ulp/lp_cpu/lp_environment_sensor/components/app_wifi/app_wifi.c

@@ -40,10 +40,12 @@
 
 ESP_EVENT_DEFINE_BASE(APP_WIFI_EVENT);
 static const char *TAG = "app_wifi";
-static const int WIFI_CONNECTED_EVENT = BIT0;
-static int s_retry_num = 0;
-static EventGroupHandle_t wifi_event_group;
-static EventGroupHandle_t second_wifi_event_group = NULL;
+
+static EventGroupHandle_t wifi_event_group = NULL;
+
+#define EXAMPLE_ESP_MAXIMUM_RETRY   3
+#define WIFI_CONNECT_SUCCESS_EVENT  BIT0
+#define WIFI_CONNECT_FAIL_EVENT     BIT1
 
 #define PROV_QR_VERSION "v1"
 
@@ -153,6 +155,7 @@ static void app_wifi_print_qr(const char *name, const char *pop, const char *tra
 static void event_handler(void* arg, esp_event_base_t event_base,
                           int32_t event_id, void* event_data)
 {
+    static int retry_cnt = 0;
 #ifdef CONFIG_APP_WIFI_RESET_PROV_ON_FAILURE
     static int retries = 0;
 #endif
@@ -219,11 +222,17 @@ static void event_handler(void* arg, esp_event_base_t event_base,
     } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
         ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
         ESP_LOGI(TAG, "Connected with IP Address:" IPSTR, IP2STR(&event->ip_info.ip));
+        retry_cnt = 0;
         /* Signal main application to continue execution */
-        xEventGroupSetBits(wifi_event_group, WIFI_CONNECTED_EVENT);
+        xEventGroupSetBits(wifi_event_group, WIFI_CONNECT_SUCCESS_EVENT);
     } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {
         ESP_LOGI(TAG, "Disconnected. Connecting to the AP again...");
-        esp_wifi_connect();
+        retry_cnt++;
+        if (retry_cnt >= EXAMPLE_ESP_MAXIMUM_RETRY) {
+            xEventGroupSetBits(wifi_event_group, WIFI_CONNECT_FAIL_EVENT);
+        } else {
+            esp_wifi_connect();
+        }
     }
 }
 
@@ -415,6 +424,7 @@ esp_err_t app_wifi_start_timer(void)
 
 esp_err_t app_first_time_wifi_start(app_wifi_pop_type_t pop_type)
 {
+    esp_err_t err = ESP_OK;
     /* Configuration for the provisioning manager */
     wifi_prov_mgr_config_t config = {
         /* What is the Provisioning Scheme that we want ?
@@ -547,35 +557,47 @@ esp_err_t app_first_time_wifi_start(app_wifi_pop_type_t pop_type)
         custom_mfg_data_len = 0;
     }
     /* Wait for Wi-Fi connection */
-    xEventGroupWaitBits(wifi_event_group, WIFI_CONNECTED_EVENT, false, true, portMAX_DELAY);
-    return ESP_OK;
+    EventBits_t uxBits;
+    uxBits = xEventGroupWaitBits(wifi_event_group,
+                                 WIFI_CONNECT_SUCCESS_EVENT | WIFI_CONNECT_FAIL_EVENT,
+                                 pdFALSE,
+                                 pdFALSE,
+                                 portMAX_DELAY);
+    if (uxBits & WIFI_CONNECT_SUCCESS_EVENT) {
+        ESP_LOGI(TAG, "Wi-Fi connected successfully!");
+        err = ESP_OK;
+    } else if (uxBits & WIFI_CONNECT_FAIL_EVENT) {
+        ESP_LOGE(TAG, "Wi-Fi connection failed!");
+        err = ESP_FAIL;
+    }
+    return err;
 }
 
 static void second_time_event_handler(void* arg, esp_event_base_t event_base,
                                       int32_t event_id, void* event_data)
 {
+    static int retry_cnt = 0;
     if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) {
         esp_wifi_connect();
     } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {
-        if (s_retry_num < EXAMPLE_ESP_MAXIMUM_RETRY) {
+        if (retry_cnt < EXAMPLE_ESP_MAXIMUM_RETRY) {
             esp_wifi_connect();
-            s_retry_num++;
+            retry_cnt++;
             ESP_LOGI(TAG, "retry to connect to the AP");
         } else {
-            xEventGroupSetBits(second_wifi_event_group, WIFI_FAIL_BIT);
+            xEventGroupSetBits(wifi_event_group, WIFI_CONNECT_FAIL_EVENT);
         }
-        ESP_LOGI(TAG, "connect to the AP fail");
     } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
         ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
         ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
-        s_retry_num = 0;
-        xEventGroupSetBits(second_wifi_event_group, WIFI_CONNECTED_BIT);
+        retry_cnt = 0;
+        xEventGroupSetBits(wifi_event_group, WIFI_CONNECT_SUCCESS_EVENT);
     }
 }
 
 void app_second_time_wifi_init(void)
 {
-    second_wifi_event_group = xEventGroupCreate();
+    wifi_event_group = xEventGroupCreate();
 
     ESP_ERROR_CHECK(esp_netif_init());
 
@@ -630,21 +652,21 @@ esp_err_t app_second_time_wifi_start(void)
     esp_wifi_set_ps(WIFI_PS_NONE);
     ESP_LOGI(TAG, "wifi_init_sta finished.");
 
-    /* Waiting until either the connection is established (WIFI_CONNECTED_BIT) or connection failed for the maximum
+    /* Waiting until either the connection is established (WIFI_CONNECT_SUCCESS_EVENT) or connection failed for the maximum
      * number of re-tries (WIFI_FAIL_BIT). The bits are set by event_handler() (see above) */
-    EventBits_t bits = xEventGroupWaitBits(second_wifi_event_group,
-                                           WIFI_CONNECTED_BIT | WIFI_FAIL_BIT,
+    EventBits_t bits = xEventGroupWaitBits(wifi_event_group,
+                                           WIFI_CONNECT_SUCCESS_EVENT | WIFI_CONNECT_FAIL_EVENT,
                                            pdFALSE,
                                            pdFALSE,
                                            portMAX_DELAY);
 
     /* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually
      * happened. */
-    if (bits & WIFI_CONNECTED_BIT) {
+    if (bits & WIFI_CONNECT_SUCCESS_EVENT) {
         ret = ESP_OK;
         ESP_LOGI(TAG, "connected to ap SSID:%s password:%s",
                  wifi_config.sta.ssid, wifi_config.sta.password);
-    } else if (bits & WIFI_FAIL_BIT) {
+    } else if (bits & WIFI_CONNECT_FAIL_EVENT) {
         ret = ESP_FAIL;
         ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s",
                  wifi_config.sta.ssid, wifi_config.sta.password);

examples/ulp/lp_cpu/lp_environment_sensor/components/app_wifi/include/app_http.h

@@ -12,8 +12,33 @@ extern "C" {
 
 #define MAX_HTTP_OUTPUT_BUFFER      2048
 
-esp_err_t http_rest_with_url(char *district_id, char *city, char *name, char *text, char *wind_class,
-                             char *wind_dir, char *uptime, char *week, int *high, int *low);
+typedef struct {
+    char district_id[20];     // Unique identifier for the district
+    char city_name[10];       // City name for weather information retrieval
+    char district_name[10];   // District name for weather information retrieval
+    char text[10];            // Weather description (e.g., sunny, cloudy)
+    char wind_class[10];      // Classification of wind speed
+    char wind_dir[15];        // Wind direction (e.g., north, south)
+    char uptime[15];          // Timestamp of the last weather data update
+    char week[10];            // Day of the week (e.g., Monday, Tuesday)
+    int temp_high;            // High temperature of the day in Celsius
+    int temp_low;             // Low temperature of the day in Celsius
+} http_weather_data_t;
+
+/**
+ * @brief Retrieve weather data via HTTP request using the provided URL
+ *
+ * This function sends an HTTP request to the specified URL to retrieve weather data and stores the
+ * data in the provided `weather_data` structure.
+ *
+ * @param[in] weather_data Pointer to an `http_weather_data_t` structure where the retrieved weather data will be stored
+ *
+ * @return
+ * - ESP_OK: Successfully retrieved and stored weather data
+ * - ESP_FAIL on error
+ */
+esp_err_t get_http_weather_data_with_url(http_weather_data_t *weather_data);
+
 #ifdef __cplusplus
 }
 #endif

examples/ulp/lp_cpu/lp_environment_sensor/components/app_wifi/include/app_wifi.h

@@ -25,10 +25,6 @@ extern "C" {
 
 #define MFG_DATA_DEVICE_EXTRA_CODE          0x00
 
-#define EXAMPLE_ESP_MAXIMUM_RETRY           3
-#define WIFI_CONNECTED_BIT                  BIT0
-#define WIFI_FAIL_BIT                       BIT1
-
 /** ESP RainMaker Event Base */
 ESP_EVENT_DECLARE_BASE(APP_WIFI_EVENT);
 

examples/ulp/lp_cpu/lp_environment_sensor/main/Kconfig.projbuild

@@ -26,14 +26,14 @@ menu "LP Environment Sensor Configuration"
 
 choice
     prompt "Select Region Type"
-    default REGION_DOMESTIC
+    default REGION_CHINA
     depends on UPDATE_WEATHER_DATA
 
-    config REGION_OVERSEAS
-        bool "Overseas"
+    config REGION_INTERNATIONAL
+        bool "International"
 
-    config REGION_DOMESTIC
-        bool "Domestic"
+    config REGION_CHINA
+        bool "China"
 endchoice
 
     config CITY_DISTRICT_ID
@@ -43,16 +43,16 @@ endchoice
         help
         Specify the district ID to get weather data from HTTP.
 
-    config DOMESTIC_CITY_NAME
-        string "Domestic City Name"
-        depends on REGION_DOMESTIC
+    config CHINA_CITY_NAME
+        string "China City Name"
+        depends on REGION_CHINA
         default "Shanghai"
         help
         Specify the name of the domestic city (e.g., Shanghai).
 
-    config DOMESTIC_DISTRICT_NAME
-        string "Domestic District Name"
-        depends on REGION_DOMESTIC
+    config CHINA_DISTRICT_NAME
+        string "China District Name"
+        depends on REGION_CHINA
         default "Pudong"
         help
         Specify the name of the domestic district (e.g., Pudong).