diff --git a/components/mesh_ota/include/mesh_network.h b/components/mesh_ota/include/mesh_network.h index 6aee496..33c0d18 100644 --- a/components/mesh_ota/include/mesh_network.h +++ b/components/mesh_ota/include/mesh_network.h @@ -16,7 +16,7 @@ static bool bIsMeshConnected; static int32_t i32MeshLayer; static mesh_addr_t mesh_parent_addr; -static esp_netif_t* netif_sta; +static esp_netif_t *netif_sta = NULL; esp_err_t errMeshNetworkInitialize(); esp_err_t errMeshNetworkInitializeWiFi(); diff --git a/components/mesh_ota/mesh_network.c b/components/mesh_ota/mesh_network.c index 96498b8..6e06344 100644 --- a/components/mesh_ota/mesh_network.c +++ b/components/mesh_ota/mesh_network.c @@ -13,7 +13,7 @@ esp_err_t errMeshNetworkInitialize() esp_err_t err; bIsMeshConnected = false; i32MeshLayer = -1; - netif_sta = NULL; + //netif_sta = NULL; err = nvs_flash_init(); //init non-volatile storage diff --git a/components/mesh_ota/mesh_network_handler.c b/components/mesh_ota/mesh_network_handler.c index 532a28f..3af8e6e 100644 --- a/components/mesh_ota/mesh_network_handler.c +++ b/components/mesh_ota/mesh_network_handler.c @@ -76,22 +76,19 @@ void vMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventI mesh_event_connected_t *connected = (mesh_event_connected_t *)vpEventData; esp_mesh_get_id(&id); i32MeshLayer = connected->self_layer; - memcpy(&mesh_parent_addr.addr, connected->connected.bssid, 6); - - //WTF + memcpy(&mesh_parent_addr.addr, connected->connected.bssid, 6); ESP_LOGI(LOG_TAG, "layer:%d-->%d, parent:"MACSTR"%s, ID:"MACSTR", duty:%d", - last_layer, i32MeshLayer, MAC2STR(mesh_parent_addr.addr), - esp_mesh_is_root() ? "" : - (i32MeshLayer == 2) ? "" : "", MAC2STR(id.addr), connected->duty); - - - + last_layer, i32MeshLayer, MAC2STR(mesh_parent_addr.addr), + esp_mesh_is_root() ? "" : (i32MeshLayer == 2) ? "" : "", //print own node title + MAC2STR(id.addr), connected->duty); last_layer = i32MeshLayer; - //mesh_connected_indicator(i32MeshLayer); bIsMeshConnected = true; if (esp_mesh_is_root()) { - esp_netif_dhcpc_start(netif_sta); //get a IP from router + ESP_LOGE(LOG_TAG, "addr %p", netif_sta); + + + //ESP_ERROR_CHECK(esp_netif_dhcpc_start(netif_sta)); //get a IP from router } errStartReceiveTask();//start receiving } @@ -101,7 +98,6 @@ void vMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventI mesh_event_disconnected_t *disconnected = (mesh_event_disconnected_t *)vpEventData; ESP_LOGI(LOG_TAG, "reason:%d", disconnected->reason); bIsMeshConnected = false; - // mesh_disconnected_indicator(); i32MeshLayer = esp_mesh_get_layer(); } break; @@ -109,16 +105,10 @@ void vMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventI { mesh_event_layer_change_t *layer_change = (mesh_event_layer_change_t *)vpEventData; i32MeshLayer = layer_change->new_layer; - - //WTF ESP_LOGI(LOG_TAG, "layer:%d-->%d%s", last_layer, i32MeshLayer, - esp_mesh_is_root() ? "" : - (i32MeshLayer == 2) ? "" : ""); - - + esp_mesh_is_root() ? "" : (i32MeshLayer == 2) ? "" : ""); last_layer = i32MeshLayer; - //mesh_connected_indicator(i32MeshLayer); } break; case MESH_EVENT_ROOT_ADDRESS: @@ -174,9 +164,7 @@ void vMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventI { mesh_event_root_conflict_t *root_conflict = (mesh_event_root_conflict_t *)vpEventData; ESP_LOGI(LOG_TAG, ""MACSTR", rssi:%d, capacity:%d", - MAC2STR(root_conflict->addr), - root_conflict->rssi, - root_conflict->capacity); + MAC2STR(root_conflict->addr), root_conflict->rssi, root_conflict->capacity); } break; case MESH_EVENT_CHANNEL_SWITCH: