comparison: main/task_wifi.c
main/task_wifi.c
- changeset 5
- b1f38105ca7e
- parent 4
- d0155c16e992
- child 6
- bad3414f7bc4
equal
deleted
inserted
replaced
| 4:d0155c16e992 | 5:b1f38105ca7e |
|---|---|
| 102 //wifi_state->STA_rssi = 0; | 102 //wifi_state->STA_rssi = 0; |
| 103 xSemaphoreGive(xSemaphoreWiFi); | 103 xSemaphoreGive(xSemaphoreWiFi); |
| 104 } else { | 104 } else { |
| 105 ESP_LOGE(TAG, "wifi_event_handler() lock error WIFI_EVENT_STA_DISCONNECTED"); | 105 ESP_LOGE(TAG, "wifi_event_handler() lock error WIFI_EVENT_STA_DISCONNECTED"); |
| 106 } | 106 } |
| 107 // connect_mqtt(false); | 107 connect_mqtt(false); |
| 108 xEventGroupClearBits(xEventGroupWifi, TASK_WIFI_STA_CONNECTED); | 108 xEventGroupClearBits(xEventGroupWifi, TASK_WIFI_STA_CONNECTED); |
| 109 xEventGroupSetBits(xEventGroupWifi, TASK_WIFI_STA_DISCONNECTED); | 109 xEventGroupSetBits(xEventGroupWifi, TASK_WIFI_STA_DISCONNECTED); |
| 110 break; | 110 break; |
| 111 } | 111 } |
| 112 | 112 |
| 133 snprintf(wifi_state->STA_gw, 16, IPSTR, IP2STR(&event->ip_info.gw)); | 133 snprintf(wifi_state->STA_gw, 16, IPSTR, IP2STR(&event->ip_info.gw)); |
| 134 xSemaphoreGive(xSemaphoreWiFi); | 134 xSemaphoreGive(xSemaphoreWiFi); |
| 135 } else { | 135 } else { |
| 136 ESP_LOGE(TAG, "got_ip_event_handler() lock error IP_EVENT_STA_GOT_IP"); | 136 ESP_LOGE(TAG, "got_ip_event_handler() lock error IP_EVENT_STA_GOT_IP"); |
| 137 } | 137 } |
| 138 // connect_mqtt(true); | 138 connect_mqtt(true); |
| 139 break; | 139 break; |
| 140 | 140 |
| 141 case IP_EVENT_STA_LOST_IP: | 141 case IP_EVENT_STA_LOST_IP: |
| 142 ESP_LOGW(TAG, "Lost IP address"); | 142 ESP_LOGW(TAG, "Lost IP address"); |
| 143 xEventGroupClearBits(xEventGroupWifi, TASK_WIFI_HAS_IP); | 143 xEventGroupClearBits(xEventGroupWifi, TASK_WIFI_HAS_IP); |
| 148 wifi_state->STA_online = false; | 148 wifi_state->STA_online = false; |
| 149 xSemaphoreGive(xSemaphoreWiFi); | 149 xSemaphoreGive(xSemaphoreWiFi); |
| 150 } else { | 150 } else { |
| 151 ESP_LOGE(TAG, "got_ip_event_handler() lock error IP_EVENT_STA_LOST_IP"); | 151 ESP_LOGE(TAG, "got_ip_event_handler() lock error IP_EVENT_STA_LOST_IP"); |
| 152 } | 152 } |
| 153 // connect_mqtt(false); | 153 connect_mqtt(false); |
| 154 break; | 154 break; |
| 155 | 155 |
| 156 case IP_EVENT_AP_STAIPASSIGNED: | 156 case IP_EVENT_AP_STAIPASSIGNED: |
| 157 ESP_LOGI(TAG, "IP_EVENT_AP_STAIPASSIGNED"); | 157 ESP_LOGI(TAG, "IP_EVENT_AP_STAIPASSIGNED"); |
| 158 break; | 158 break; |
| 225 | 225 |
| 226 if (uxBits & TASK_WIFI_REQUEST_STA_DISCONNECT) { | 226 if (uxBits & TASK_WIFI_REQUEST_STA_DISCONNECT) { |
| 227 /* | 227 /* |
| 228 * user requested a disconnect, this will in effect disconnect the wifi | 228 * user requested a disconnect, this will in effect disconnect the wifi |
| 229 */ | 229 */ |
| 230 // connect_mqtt(false); | 230 connect_mqtt(false); |
| 231 ESP_LOGI(TAG, "Request STA disconnect"); | 231 ESP_LOGI(TAG, "Request STA disconnect"); |
| 232 ESP_ERROR_CHECK(esp_wifi_disconnect()); | 232 ESP_ERROR_CHECK(esp_wifi_disconnect()); |
| 233 xEventGroupWaitBits(xEventGroupWifi, TASK_WIFI_STA_DISCONNECTED, pdFALSE, pdTRUE, portMAX_DELAY ); | 233 xEventGroupWaitBits(xEventGroupWifi, TASK_WIFI_STA_DISCONNECTED, pdFALSE, pdTRUE, portMAX_DELAY ); |
| 234 | 234 |
| 235 /* finally: release the request bit */ | 235 /* finally: release the request bit */ |
