Merge branch 'master' into feature/mesh_network

added WIP info

README.md

@@ -1,2 +1,19 @@
 # ESP32-Mesh-OTA
 
+## Work in progress  
+<img src="https://patenschaft.bienenweide.org/img/loading.gif" alt="code_example_output" width="50"/>
+
+## Todo for first release
+
+### Refactoring
+- architecture
+- full error handling through all functions
+- export as a component library
+
+### Features
+- root node: Download new Firmware from HTTPS server instead using newest ota partition
+- add example main app
+
+
+
+

components/mesh_ota/CMakeLists.txt

@@ -1,4 +1,4 @@
-idf_component_register(SRCS "https_client.c" "mesh_ota.c"
+idf_component_register(SRCS "Mesh_network_handler.c" "Mesh_network.c" "Mesh_OTA.c"
                     INCLUDE_DIRS "include" 
                     REQUIRES nvs_flash
                     esp_http_client

components/mesh_ota/Mesh_OTA.c

@@ -0,0 +1,237 @@
+#include "Mesh_OTA.h"
+
+/*
+ * 999.999.999
+ * Return true if remote version is newer (higher) than local version
+*/
+bool bNewerVersion(const char* pu8Local, const  char* pu8Remote) 
+{
+    char u8LocalTmp[12]; //local version
+    char u8RemoteTmp[12]; //remote version
+    char* pu8saveptrLocal; //context for strok_r 
+    char* pu8saveptrRemote; //context for strok_r 
+    bool bReturn = false; //flag to stop loop
+    uint8_t u8Index = 0; //numbers counter in version string
+
+    strcpy(u8LocalTmp, pu8Local); //copy in tmp
+    strcpy(u8RemoteTmp, pu8Remote); //copy in tmp
+
+    char* pu8TokenLocal = strtok_r(u8LocalTmp, ".", &pu8saveptrLocal); //split tokens
+    char* pu8TokenRemote = strtok_r(u8RemoteTmp, ".", &pu8saveptrRemote); //split tokens
+
+    while( (u8Index <= 2) && (bReturn == false)) //loop through tokens
+    {
+        u8Index++;
+        if(atoi(pu8TokenLocal) < atoi(pu8TokenRemote))
+        {
+            bReturn = true; //version number difference --> stop loop
+        }
+        pu8TokenLocal = strtok_r(NULL, ".", &pu8saveptrLocal); //split tokens
+        pu8TokenRemote = strtok_r(NULL, ".", &pu8saveptrRemote); //split tokens
+    }
+    return bReturn;
+}
+
+esp_err_t errFindImageStart(const char* pu8Data, uint32_t* pu32DataLenght, uint32_t* pu32StartOffset)
+{
+    /*
+    Offset  value
+    0      = 0xE9 (first byte in image --> magic byte)
+    48     = first digit of version number
+    */
+
+    esp_err_t errReturn = ESP_OK;
+    bool bImageStartOffsetFound = false;
+    uint32_t u32DataIndex = 0;
+    uint32_t u32FirstDotOffset = 0;
+    uint32_t u32SecondDotOffset = 0;
+    uint8_t u8FirstDotIndex = 0;
+    uint8_t u8SecondDotIndex = 0;
+
+    *pu32StartOffset = 0U; //reset offset to zero
+    
+    while((u32DataIndex < *pu32DataLenght) &&  (bImageStartOffsetFound == false))
+    {
+        //search for magic byte
+        if(pu8Data[u32DataIndex] == 0xe9)
+        {
+            //magic byte found
+            while ((u8FirstDotIndex < 3) && (u32FirstDotOffset == 0))
+            {
+                //search first dot in version number
+                if((u32DataIndex+49+u8FirstDotIndex) < *pu32DataLenght)
+                {
+                    if((pu8Data[(u32DataIndex+49+u8FirstDotIndex)] == 0x2e))
+                    {
+                        //first dot found
+                        u32FirstDotOffset = (u32DataIndex+49+u8FirstDotIndex);
+                    }
+                }
+             u8FirstDotIndex++;
+            }
+
+            while ((u8SecondDotIndex < 3) && (u32SecondDotOffset == 0) && (u32FirstDotOffset != 0))
+            {
+                //search first dot in version number
+                if((u32FirstDotOffset+(u8SecondDotIndex+2)) < *pu32DataLenght)
+                {
+                    if((pu8Data[(u32FirstDotOffset+(u8SecondDotIndex+2))] == 0x2e))
+                    {
+                        //second dot found
+                        u32SecondDotOffset = (u32FirstDotOffset+(u8SecondDotIndex+2));
+                    }
+                }
+                u8SecondDotIndex++;
+            }
+
+            if((u32FirstDotOffset != 0) && (u32SecondDotOffset != 0))
+            {
+                //image start found based on magic byte and version number systax
+                *pu32StartOffset = u32DataIndex; //store image start offset
+                bImageStartOffsetFound = true;
+            }
+            else
+            {
+                // this is propably not the magic byte --> reset
+                u32FirstDotOffset = 0;
+                u32SecondDotOffset = 0;
+                u8FirstDotIndex = 0;
+                u8SecondDotIndex = 0;
+            }
+        }
+        u32DataIndex++;
+    }
+
+    if(bImageStartOffsetFound == false)
+    {
+        errReturn = ESP_ERR_NOT_FOUND;
+    }
+
+    return errReturn;
+}
+
+esp_err_t errExtractVersionNumber(const char* pu8Data, uint32_t* pu32DataLenght, char* pc8RemoteVersionNumber)
+{
+    uint32_t u32StartOffset;
+    esp_err_t err = ESP_OK;
+
+    strcpy(pc8RemoteVersionNumber, "999.999.999"); //init value
+    err = errFindImageStart(pu8Data, pu32DataLenght, &u32StartOffset); //get image start offset
+
+    if(err == ESP_OK)
+    {
+        //image found
+        strncpy(pc8RemoteVersionNumber, pu8Data+(u32StartOffset+48), 11); //copy version number
+        pc8RemoteVersionNumber[12] = '\0';
+    }
+    return err;
+}
+
+/*
+
+
+esp_err_t esp_mesh_ota_send(mesh_addr_t* dest)
+{
+    esp_err_t err = ESP_OK;
+
+    static uint32_t u32index;
+
+    const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
+
+    if((*currentPartition).subtype == 0)
+    {
+
+        int data_read = 0;
+
+        struct ota_mesh_packet packet;
+        packet.type=OTA_Data;
+
+        if(u32index == 1024)
+        {
+            //all data read
+            data_read = 0;
+            u32index = 0;
+        }
+        else
+        {
+            ESP_LOGI(MESH_TAG, "OTA-Data read: %i", u32index);
+            err =  esp_partition_read(currentPartition, (1024*u32index), packet.au8Payload, 1024 );
+            ESP_ERROR_CHECK(err);
+            data_read = 1024;
+            u32index++;
+        }
+
+        if (data_read > 0)
+        {
+            //send ota fragemnt to node
+            esp_mesh_send_packet(dest, &packet);
+        }
+
+        ESP_ERROR_CHECK(err);
+    }
+    else
+    {
+        ESP_LOGI(MESH_TAG, "Subtype: %d",  (*currentPartition).subtype);
+    }
+    return err;
+}
+
+esp_err_t esp_mesh_ota_receive(mesh_addr_t* dest, struct ota_mesh_packet* packet)
+{
+    esp_err_t err = ESP_OK;
+    static esp_ota_handle_t otaHandle;
+    static uint32_t u32index;
+
+    const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
+    const esp_partition_t * otaPartition =  esp_ota_get_next_update_partition(currentPartition);
+
+    if(u32index == 0)
+    {
+        //first run
+
+        err = esp_ota_begin(otaPartition, OTA_SIZE_UNKNOWN, &otaHandle);
+        ESP_ERROR_CHECK(err);
+    }
+
+    ESP_LOGI(MESH_TAG, "OTA-Data write: %i", u32index);
+    err = esp_ota_write(otaHandle, packet->au8Payload, 1024);
+
+    if(err != ESP_OK)
+    {
+        ESP_LOGE(MESH_TAG, "OTA-Data write error: %i at %i", err, u32index);
+    }
+
+    ESP_ERROR_CHECK(err);
+
+
+
+    if(u32index >= 1023)
+    {
+        //ota update complete
+
+        ESP_LOGI(MESH_TAG, "OTA-Data complete arrived: %i", u32index);
+        err = esp_ota_end(otaHandle);
+        ESP_ERROR_CHECK(err);
+        esp_app_desc_t otaPartitionDesc;
+        err = esp_ota_get_partition_description(otaPartition, &otaPartitionDesc);
+        ESP_ERROR_CHECK(err);
+        ESP_LOGI(MESH_TAG, "otaPartition project_name: %s",  (otaPartitionDesc).project_name);
+
+        err = esp_ota_set_boot_partition(otaPartition);
+        ESP_ERROR_CHECK(err);
+
+        struct ota_mesh_packet retPacket;
+        retPacket.type=OTA_Complete;
+        ESP_ERROR_CHECK (esp_mesh_send_packet(dest, &retPacket)); //send back to parent
+
+        //check if this node has children --> Update them
+
+        esp_restart();
+    }
+
+    u32index++;
+
+
+    return err;
+}
+*/

components/mesh_ota/Mesh_network.c

@@ -0,0 +1,247 @@
+
+#include "Mesh_OTA.h"
+
+static const char *LOG_TAG = "mesh_network";
+static uint8_t tx_buf[CONFIG_MESH_MESSAGE_SIZE] = { 0, };
+static uint8_t rx_buf[CONFIG_MESH_MESSAGE_SIZE] = { 0, };
+static uint8_t u8NodeMAC[6];
+esp_netif_t* netif_sta;
+bool bIsMeshConnected;
+int32_t i32MeshLayer;
+mesh_addr_t mesh_parent_addr;
+
+esp_err_t errMeshNetworkInitialize()
+{
+    //init module variables
+    esp_err_t err;
+    bIsMeshConnected = false;
+    i32MeshLayer = -1;
+    netif_sta = NULL;
+
+    err = nvs_flash_init(); //init non-volatile storage
+
+#ifdef ERASE_NVS
+    if(err == ESP_ERR_NVS_NO_FREE_PAGES) //check if storage is full
+    {
+        ERROR_CHECK(nvs_flash_erase());
+    }
+#endif
+
+    // tcpip initialization
+    ERROR_CHECK(esp_netif_init());
+
+    //event initialization
+    ERROR_CHECK(esp_event_loop_create_default());
+
+    //create network interfaces for mesh (only station instance saved for further manipulation, soft AP instance ignored
+    ERROR_CHECK(esp_netif_create_default_wifi_mesh_netifs(&netif_sta, NULL));
+
+    //wifi initialization
+    ERROR_CHECK(errMeshNetworkInitializeWiFi());
+
+    //mesh initialization
+    ERROR_CHECK(esp_mesh_init());
+
+    //mesh initialization
+    ERROR_CHECK(esp_event_handler_register(MESH_EVENT, ESP_EVENT_ANY_ID, &vMeshEventHandler, NULL));
+
+    //set mesh topology
+    ERROR_CHECK(esp_mesh_set_topology(CONFIG_MESH_TOPOLOGY));
+
+    //set mesh max layer according to the topology
+    ERROR_CHECK(esp_mesh_set_max_layer(CONFIG_MESH_MAX_LAYER));
+    ERROR_CHECK(esp_mesh_set_vote_percentage(1));
+    ERROR_CHECK(esp_mesh_set_xon_qsize(128));
+
+    //Disable mesh PS function
+    ERROR_CHECK(esp_mesh_disable_ps());
+    ERROR_CHECK(esp_mesh_set_ap_assoc_expire(10));
+
+    mesh_cfg_t cfg = MESH_INIT_CONFIG_DEFAULT();
+
+    /* mesh ID */
+    memcpy((uint8_t *) &cfg.mesh_id, CONFIG_MESH_ID, 6);
+
+    ERROR_CHECK(errMeshNetworkInitializeRouter(&cfg));
+
+    /* mesh softAP */
+    ERROR_CHECK(esp_mesh_set_ap_authmode(CONFIG_MESH_AP_AUTHMODE));
+    cfg.mesh_ap.max_connection = CONFIG_MESH_AP_CONNECTIONS;
+    memcpy((uint8_t *) &cfg.mesh_ap.password, CONFIG_MESH_AP_PASSWD,
+           strlen(CONFIG_MESH_AP_PASSWD));
+    ERROR_CHECK(esp_mesh_set_config(&cfg));
+
+    /* mesh start */
+    ERROR_CHECK(esp_mesh_start());
+
+    ERROR_CHECK(esp_base_mac_addr_get(u8NodeMAC))
+
+    //debug info
+    ESP_LOGD(LOG_TAG, "mesh starts successfully, heap:%d, %s<%d>%s, ps:%d\n",  esp_get_minimum_free_heap_size(),
+             esp_mesh_is_root_fixed() ? "root fixed" : "root not fixed",
+             esp_mesh_get_topology(), esp_mesh_get_topology() ? "(chain)":"(tree)", esp_mesh_is_ps_enabled());
+
+
+    ESP_LOGI(LOG_TAG, "Node MAC: \"%x:%x:%x:%x:%x:%x\" ", u8NodeMAC[0], u8NodeMAC[1], u8NodeMAC[2], u8NodeMAC[3], u8NodeMAC[4], u8NodeMAC[5]);
+
+    return ESP_OK;
+}
+
+esp_err_t errMeshNetworkInitializeWiFi()
+{
+//wifi initialization
+    esp_err_t err = ESP_OK;
+    wifi_init_config_t config = WIFI_INIT_CONFIG_DEFAULT();
+    ERROR_CHECK(esp_wifi_init(&config));
+    ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &vIPEventHandler, NULL));
+    ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_FLASH));
+    ERROR_CHECK(esp_wifi_start());
+    return err;
+
+}
+
+esp_err_t errMeshNetworkInitializeRouter(mesh_cfg_t* cfg)
+{
+//router initialization
+    esp_err_t err = ESP_OK;
+    (*cfg).channel = CONFIG_MESH_CHANNEL;
+    (*cfg).router.ssid_len = strlen(CONFIG_MESH_ROUTER_SSID);
+    memcpy((uint8_t *) &(*cfg).router.ssid, CONFIG_MESH_ROUTER_SSID, (*cfg).router.ssid_len);
+    memcpy((uint8_t *) &(*cfg).router.password, CONFIG_MESH_ROUTER_PASSWD,
+           strlen(CONFIG_MESH_ROUTER_PASSWD));
+    return err;
+}
+
+//returns true if MAC address is equal
+bool bCheckMACEquality(uint8_t* pu8aMAC,  uint8_t* pu8bMAC)
+{
+    bool bRet = true;
+    uint8_t index = 0;
+
+    while ((index < 6) && (bRet == true))
+    {
+        if(pu8aMAC[index] != pu8bMAC[index])
+        {
+            bRet = false;
+        }
+        index++;
+    }
+    return bRet;
+}
+
+esp_err_t errGetChildren(mesh_addr_t* pChildren, uint16_t* pu16ChildrenSize)
+{
+    esp_err_t err = ESP_OK;
+    int route_table_size = 0;
+    *pu16ChildrenSize = 0;
+    mesh_addr_t route_table[CONFIG_MESH_ROUTE_TABLE_SIZE];
+    ERROR_CHECK(esp_mesh_get_routing_table((mesh_addr_t *) &route_table, (CONFIG_MESH_ROUTE_TABLE_SIZE * 6), &route_table_size));
+
+    if (err == ESP_OK)
+    {
+        for(uint16_t index = 0; index < esp_mesh_get_routing_table_size(); index++)
+        {
+            if(! (bCheckMACEquality(u8NodeMAC, route_table[index].addr))  )
+            {
+                //child node
+                //ESP_LOGI(MESH_TAG, "adding Node: \"0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\" ", route_table[index].addr[0], route_table[index].addr[1], route_table[index].addr[2], route_table[index].addr[3], route_table[index].addr[4], route_table[index].addr[5]);
+                pChildren[*pu16ChildrenSize] = route_table[index];
+                *pu16ChildrenSize = (*pu16ChildrenSize)+1;
+            }
+        }
+    }
+    return err;
+}
+
+esp_err_t errSendMeshPacket(mesh_addr_t* pAddrDest, MESH_PACKET_t* pPacket)
+{
+    esp_err_t err;
+    mesh_data_t data;
+    data.data = tx_buf;
+    data.size = sizeof(tx_buf);
+    data.proto = MESH_PROTO_BIN;
+    data.tos = MESH_TOS_P2P;
+    memcpy(tx_buf, (uint8_t *)pPacket, sizeof(MESH_PACKET_t));
+    err = esp_mesh_send(pAddrDest, &data, MESH_DATA_P2P, NULL, 0);
+    return err;
+}
+
+
+esp_err_t errStartReceiveTask()
+{
+    esp_err_t err = ESP_OK;
+    BaseType_t xReturned;
+
+    xReturned = xTaskCreate(vTaskReceiveMeshData, "ReceiveMeshData", 7000, NULL, 5, NULL);
+
+    if(xReturned != pdPASS)
+    {
+        err = ESP_FAIL;
+    }
+    return err;
+}
+
+void vTaskReceiveMeshData(void *arg)
+{
+    esp_err_t err;
+    mesh_addr_t from;
+    mesh_data_t data;
+    int flag = 0;
+    data.data = rx_buf;
+    data.size = CONFIG_MESH_MESSAGE_SIZE;
+
+    while (true)
+    {
+        data.size = CONFIG_MESH_MESSAGE_SIZE;
+        err = esp_mesh_recv(&from, &data, portMAX_DELAY, &flag, NULL, 0);
+        if (err != ESP_OK || !data.size)
+        {
+            ESP_LOGE(LOG_TAG, "err:0x%x, size:%d", err, data.size);
+            continue;
+        }
+
+        
+/*
+        struct ota_mesh_packet packet;
+        memcpy(&packet, (uint8_t *)rx_buf, sizeof(struct ota_mesh_packet));
+
+        switch (packet.type)
+        {
+        case APP_Version_Request:
+            ESP_LOGI(LOG_TAG, "recv: APP_Version_Request");
+            packet.type=APP_Version_Response;
+            packet.au8Payload[0] = 42; //TODO get current running version
+            // ESP_ERROR_CHECK (esp_mesh_send_packet(&from, &packet)); //send back to parent
+            break;
+        case APP_Version_Response:
+            ESP_LOGI(LOG_TAG, "recv: APP_Version_Response - App Version %i: ", packet.au8Payload[0]);
+            //check if node is out-dated
+            // esp_mesh_ota_send(&from);
+            break;
+        case OTA_Data:
+            ESP_LOGI(LOG_TAG, "recv: OTA_Data");
+            //esp_mesh_ota_receive(&from, &packet);
+            packet.type=OTA_ACK;
+            //ESP_ERROR_CHECK (esp_mesh_send_packet(&from, &packet)); //send back to parent
+            break;
+        case OTA_ACK:
+            ESP_LOGI(LOG_TAG, "recv: OTA_ACK");
+            //esp_mesh_ota_send(&from);
+            break;
+        case OTA_Complete:
+            ESP_LOGI(LOG_TAG, "recv: OTA_Complete");
+            break;
+        default:
+            ESP_LOGE(LOG_TAG, "recv: something");
+            break;
+        }//end switch
+
+        */
+
+    } //end while
+}
+
+
+
+
+

components/mesh_ota/Mesh_network_handler.c

@@ -0,0 +1,221 @@
+
+#include "Mesh_OTA.h"
+
+static const char *LOG_TAG = "mesh_network_handler";
+
+void vIPEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void *vpEventData)
+{
+    ip_event_got_ip_t *event = (ip_event_got_ip_t *) vpEventData;
+    ESP_LOGI(LOG_TAG, "<IP_EVENT_STA_GOT_IP>IP:" IPSTR, IP2STR(&event->ip_info.ip));
+}
+
+void vMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void* vpEventData)
+{
+    mesh_addr_t id = {0,};
+    static uint16_t last_layer = 0;
+
+    switch (i32EventID)
+        {
+        case MESH_EVENT_STARTED:
+        {
+            esp_mesh_get_id(&id);
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_MESH_STARTED>ID:"MACSTR"", MAC2STR(id.addr));
+            bIsMeshConnected = false;
+            i32MeshLayer = esp_mesh_get_layer();
+        }
+        break;
+        case MESH_EVENT_STOPPED: 
+        {
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_STOPPED>");
+            bIsMeshConnected = false;
+            i32MeshLayer = esp_mesh_get_layer();
+        }
+        break;
+        case MESH_EVENT_CHILD_CONNECTED: 
+        {
+            mesh_event_child_connected_t *child_connected = (mesh_event_child_connected_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHILD_CONNECTED>aid:%d, "MACSTR"",
+            child_connected->aid,
+            MAC2STR(child_connected->mac));
+        }
+        break;
+        case MESH_EVENT_CHILD_DISCONNECTED: 
+        {
+            mesh_event_child_disconnected_t *child_disconnected = (mesh_event_child_disconnected_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHILD_DISCONNECTED>aid:%d, "MACSTR"",
+            child_disconnected->aid,
+            MAC2STR(child_disconnected->mac));
+        }
+        break;
+        case MESH_EVENT_ROUTING_TABLE_ADD: 
+        {
+            mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)vpEventData;
+            ESP_LOGW(LOG_TAG, "<MESH_EVENT_ROUTING_TABLE_ADD>add %d, new:%d, layer:%d",
+            routing_table->rt_size_change,
+            routing_table->rt_size_new, i32MeshLayer);
+        }
+        break;
+        case MESH_EVENT_ROUTING_TABLE_REMOVE: 
+        {   
+            mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)vpEventData;
+            ESP_LOGW(LOG_TAG, "<MESH_EVENT_ROUTING_TABLE_REMOVE>remove %d, new:%d, layer:%d",
+            routing_table->rt_size_change,
+            routing_table->rt_size_new, i32MeshLayer);
+        }
+        break;
+        case MESH_EVENT_NO_PARENT_FOUND: 
+        {
+            mesh_event_no_parent_found_t *no_parent = (mesh_event_no_parent_found_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_NO_PARENT_FOUND>scan times:%d",
+            no_parent->scan_times);
+            /* TODO handler for the failure, maybe nominate themselves */
+        }
+        break;
+        case MESH_EVENT_PARENT_CONNECTED: 
+        {
+            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); 
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_PARENT_CONNECTED>layer:%d-->%d, parent:"MACSTR"%s, ID:"MACSTR", duty:%d",
+            last_layer, i32MeshLayer, MAC2STR(mesh_parent_addr.addr),
+            esp_mesh_is_root() ? "<ROOT>" : (i32MeshLayer == 2) ? "<layer2>" : "", //print own node title
+            MAC2STR(id.addr), connected->duty);
+            last_layer = i32MeshLayer;
+            bIsMeshConnected = true;
+            if (esp_mesh_is_root()) 
+            {
+                ESP_ERROR_CHECK(esp_netif_dhcpc_start(netif_sta)); //get a IP from router
+            }
+            errStartReceiveTask();//start receiving
+        }
+        break;
+        case MESH_EVENT_PARENT_DISCONNECTED: 
+        {
+            mesh_event_disconnected_t *disconnected = (mesh_event_disconnected_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_PARENT_DISCONNECTED>reason:%d", disconnected->reason);
+            bIsMeshConnected = false;
+            i32MeshLayer = esp_mesh_get_layer();
+        }
+        break;
+        case MESH_EVENT_LAYER_CHANGE: 
+        {
+            mesh_event_layer_change_t *layer_change = (mesh_event_layer_change_t *)vpEventData;
+            i32MeshLayer = layer_change->new_layer;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_LAYER_CHANGE>layer:%d-->%d%s",
+            last_layer, i32MeshLayer,
+            esp_mesh_is_root() ? "<ROOT>" : (i32MeshLayer == 2) ? "<layer2>" : "");
+            last_layer = i32MeshLayer;
+        }
+        break;
+        case MESH_EVENT_ROOT_ADDRESS: 
+        {
+            mesh_event_root_address_t *root_addr = (mesh_event_root_address_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_ADDRESS>root address:"MACSTR"",
+            MAC2STR(root_addr->addr));
+        }
+        break;
+        case MESH_EVENT_VOTE_STARTED: 
+        {
+            mesh_event_vote_started_t *vote_started = (mesh_event_vote_started_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_VOTE_STARTED>attempts:%d, reason:%d, rc_addr:"MACSTR"",
+            vote_started->attempts,
+            vote_started->reason,
+            MAC2STR(vote_started->rc_addr.addr));
+        }
+        break;
+        case MESH_EVENT_VOTE_STOPPED: 
+        {
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_VOTE_STOPPED>");
+        }
+        break;
+        case MESH_EVENT_ROOT_SWITCH_REQ: 
+        {
+            mesh_event_root_switch_req_t *switch_req = (mesh_event_root_switch_req_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_SWITCH_REQ>reason:%d, rc_addr:"MACSTR"", switch_req->reason,
+            MAC2STR( switch_req->rc_addr.addr));
+        }
+        break;
+        case MESH_EVENT_ROOT_SWITCH_ACK: 
+        {
+            //new root
+            i32MeshLayer = esp_mesh_get_layer();
+            esp_mesh_get_parent_bssid(&mesh_parent_addr);
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_SWITCH_ACK>layer:%d, parent:"MACSTR"", i32MeshLayer, MAC2STR(mesh_parent_addr.addr));
+        }
+        break;
+        case MESH_EVENT_TODS_STATE: 
+        {
+            mesh_event_toDS_state_t *toDs_state = (mesh_event_toDS_state_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_TODS_REACHABLE>state:%d", *toDs_state);
+        }
+        break;
+        case MESH_EVENT_ROOT_FIXED: 
+        {
+            mesh_event_root_fixed_t *root_fixed = (mesh_event_root_fixed_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_FIXED>%s",
+            root_fixed->is_fixed ? "fixed" : "not fixed");
+        }
+        break;
+        case MESH_EVENT_ROOT_ASKED_YIELD: 
+        {
+            mesh_event_root_conflict_t *root_conflict = (mesh_event_root_conflict_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_ASKED_YIELD>"MACSTR", rssi:%d, capacity:%d",
+            MAC2STR(root_conflict->addr), root_conflict->rssi, root_conflict->capacity);
+        }
+        break;
+        case MESH_EVENT_CHANNEL_SWITCH: 
+        {
+            mesh_event_channel_switch_t *channel_switch = (mesh_event_channel_switch_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHANNEL_SWITCH>new channel:%d", channel_switch->channel);
+        }
+        break;
+        case MESH_EVENT_SCAN_DONE: 
+        {
+        mesh_event_scan_done_t *scan_done = (mesh_event_scan_done_t *)vpEventData;
+        ESP_LOGI(LOG_TAG, "<MESH_EVENT_SCAN_DONE>number:%d", scan_done->number);
+        }
+        break;
+        case MESH_EVENT_NETWORK_STATE: 
+        {
+            mesh_event_network_state_t *network_state = (mesh_event_network_state_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_NETWORK_STATE>is_rootless:%d", network_state->is_rootless);
+        }
+        break;
+        case MESH_EVENT_STOP_RECONNECTION: 
+        {
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_STOP_RECONNECTION>");    
+        }
+        break;
+        case MESH_EVENT_FIND_NETWORK: 
+        {
+            mesh_event_find_network_t *find_network = (mesh_event_find_network_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_FIND_NETWORK>new channel:%d, router BSSID:"MACSTR"",
+            find_network->channel, MAC2STR(find_network->router_bssid));
+        }
+        break;
+        case MESH_EVENT_ROUTER_SWITCH: 
+        {
+            mesh_event_router_switch_t *router_switch = (mesh_event_router_switch_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROUTER_SWITCH>new router:%s, channel:%d, "MACSTR"",
+            router_switch->ssid, router_switch->channel, MAC2STR(router_switch->bssid));
+        }
+        break;
+        case MESH_EVENT_PS_PARENT_DUTY: 
+        {
+            mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_PS_PARENT_DUTY>duty:%d", ps_duty->duty);
+        }
+        break;
+        case MESH_EVENT_PS_CHILD_DUTY: 
+        {
+            mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)vpEventData;
+            ESP_LOGI(LOG_TAG, "<MESH_EVENT_PS_CHILD_DUTY>cidx:%d, "MACSTR", duty:%d", ps_duty->child_connected.aid-1,
+            MAC2STR(ps_duty->child_connected.mac), ps_duty->duty);
+        }
+        break;
+        default:
+            ESP_LOGI(LOG_TAG, "unknown id:%d", i32EventID);
+        break;
+    }
+}

components/mesh_ota/https_client.c

@@ -1,293 +0,0 @@
-#include "https_client.h"
-
-static const char *TAG = "https_client";
-
-static const char *REQUEST = "GET " CONFIG_OTA_HTTPS_URL " HTTP/1.1\r\n"
-                             "Host: "CONFIG_OTA_HTTPS_SERVER_COMMON_NAME"\r\n"
-                             "User-Agent: esp-idf/1.0 esp32\r\n"
-                             "Authorization: Basic " CONFIG_OTA_HTTPS_AUTH "\r\n"
-                             "\r\n";
-
-
-static HTTPS_Client_t sHTTPS_ClientConfig;
-
-https_client_ret_t https_clientInitEmbedTLS();
-https_client_ret_t https_clientConnectToServer();
-https_client_ret_t https_clientValidateServer();
-https_client_ret_t https_clientSendRequest();
-
-https_client_ret_t https_clientInitialize()
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-
-    i32RetHTTPClient = https_clientInitEmbedTLS();
-
-    if(i32RetHTTPClient == HTTPS_CLIENT_OK)
-    {
-        i32RetHTTPClient = https_clientConnectToServer();
-    }
-
-    if(i32RetHTTPClient == HTTPS_CLIENT_OK)
-    {
-        i32RetHTTPClient = https_clientValidateServer();
-    }
-
-    if(i32RetHTTPClient == HTTPS_CLIENT_OK)
-    {
-        i32RetHTTPClient = https_clientSendRequest();
-    }
-
-    switch (i32RetHTTPClient)
-    {
-    case HTTPS_CLIENT_ERROR_INIT_EMBEDTLS:
-        ESP_LOGE(TAG, "Unable to initialize EmbedTLS");
-        i32RetHTTPClient = HTTPS_CLIENT_ERROR;
-        break;
-    case HTTPS_CLIENT_ERROR_INIT_CONNECT_TWO_SERVER:
-        ESP_LOGE(TAG, "Unable to connect to server");
-        i32RetHTTPClient = HTTPS_CLIENT_ERROR;
-        break;
-    case HTTPS_CLIENT_ERROR_INIT_VALIDATE_SERVER:
-        ESP_LOGE(TAG, "Unable to validate the server");
-        i32RetHTTPClient = HTTPS_CLIENT_ERROR;
-        break;
-    case HTTPS_CLIENT_ERROR_INIT_SEND_REQUEST:
-        ESP_LOGE(TAG, "Unable to send request to server");
-        i32RetHTTPClient = HTTPS_CLIENT_ERROR;
-        break;
-    case HTTPS_CLIENT_OK:
-        ESP_LOGI(TAG, "HTTPS Client successfully initialized");
-        i32RetHTTPClient = HTTPS_CLIENT_OK;
-        break;
-    default:
-        i32RetHTTPClient = HTTPS_CLIENT_ERROR;
-        ESP_LOGE(TAG, "Unknown error while init");
-        break;
-    }
-
-    return i32RetHTTPClient;
-}
-
-https_client_ret_t https_clientRetrieveData(char* pu8Data, uint32_t* pu32DataLenght, uint32_t* pu32BytesRead)
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-    int32_t i32RetRetrieveData = ESP_OK;
-    bzero(pu8Data, *pu32DataLenght);
-    bool bRetriveData = true;
-    *pu32BytesRead = 0U;
-
-    while (bRetriveData)
-    {
-        //Reading HTTP response
-        i32RetRetrieveData = mbedtls_ssl_read(&sHTTPS_ClientConfig.ssl, (unsigned char *)(pu8Data+(*pu32BytesRead)), ((*pu32DataLenght)-(*pu32BytesRead)));
-
-        if(i32RetRetrieveData > 0)
-        {
-            //Data received
-            *pu32BytesRead = *pu32BytesRead + i32RetRetrieveData;
-
-            if(*pu32DataLenght > 0)
-            {
-                //buffer not full yet --> read some more
-                bRetriveData = true;
-            }
-            else
-            {
-                //buffer full --> stop reading
-                bRetriveData = false;
-            }
-        }
-
-        if(i32RetRetrieveData == 0)
-        {
-            //all data read --> stop reading
-            bRetriveData = false;
-            pu32BytesRead = 0;
-            
-        }
-
-        if(i32RetRetrieveData == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY)
-        {
-            //connection is going to be closed
-            i32RetHTTPClient = HTTPS_CLIENT_ERROR;
-            bRetriveData = false;
-        }
-    }
-    return i32RetHTTPClient;
-}
-
-https_client_ret_t https_clientDeinitialize()
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-
-    i32RetHTTPClient = mbedtls_ssl_close_notify(&sHTTPS_ClientConfig.ssl);
-
-    if(i32RetHTTPClient != ESP_OK)
-    {
-        ESP_LOGE(TAG, "mbedtls_ssl_close_notify returned 0x%x", i32RetHTTPClient);
-    }
-
-    mbedtls_ssl_session_reset(&sHTTPS_ClientConfig.ssl);
-    mbedtls_net_free(&sHTTPS_ClientConfig.server_fd);
-
-    return i32RetHTTPClient;
-}
-
-https_client_ret_t https_clientInitEmbedTLS() {
-
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-    int32_t i32RetEmbedTLS = ESP_OK;
-
-    mbedtls_ssl_init(&sHTTPS_ClientConfig.ssl);
-    mbedtls_x509_crt_init(&sHTTPS_ClientConfig.cacert);
-    mbedtls_ctr_drbg_init(&sHTTPS_ClientConfig.ctr_drbg);
-    mbedtls_ssl_config_init(&sHTTPS_ClientConfig.conf);
-    mbedtls_entropy_init(&sHTTPS_ClientConfig.entropy);
-
-    i32RetEmbedTLS = mbedtls_ctr_drbg_seed(&sHTTPS_ClientConfig.ctr_drbg, mbedtls_entropy_func, &sHTTPS_ClientConfig.entropy, NULL, 0);
-
-    if(i32RetEmbedTLS!= ESP_OK)
-    {
-        ESP_LOGE(TAG, "mbedtls_ctr_drbg_seed returned %d", i32RetEmbedTLS);
-    }
-
-    if(i32RetEmbedTLS == ESP_OK)
-    {
-        //Attaching the certificate bundle
-        i32RetEmbedTLS = esp_crt_bundle_attach(&sHTTPS_ClientConfig.conf);
-        if(i32RetEmbedTLS != ESP_OK)
-        {
-            ESP_LOGE(TAG, "esp_crt_bundle_attach returned 0x%x\n\n", i32RetEmbedTLS);
-        }
-    }
-
-    if(i32RetEmbedTLS == ESP_OK)
-    {
-        //Setting hostname for TLS session.
-        i32RetEmbedTLS = mbedtls_ssl_set_hostname(&sHTTPS_ClientConfig.ssl, CONFIG_OTA_HTTPS_SERVER_COMMON_NAME);
-        // Hostname set here should match CN in server certificate
-        if(i32RetEmbedTLS != ESP_OK)
-        {
-            ESP_LOGE(TAG, "mbedtls_ssl_set_hostname returned 0x%x", i32RetEmbedTLS);
-        }
-    }
-    if(i32RetEmbedTLS == ESP_OK)
-    {
-        //Setting up the SSL/TLS structure
-        i32RetEmbedTLS = mbedtls_ssl_config_defaults(&sHTTPS_ClientConfig.conf,
-                         MBEDTLS_SSL_IS_CLIENT,
-                         MBEDTLS_SSL_TRANSPORT_STREAM,
-                         MBEDTLS_SSL_PRESET_DEFAULT);
-
-        if(i32RetEmbedTLS != ESP_OK)
-        {
-            ESP_LOGE(TAG, "mbedtls_ssl_config_defaults returned %d", i32RetEmbedTLS);
-        }
-    }
-
-    if(i32RetEmbedTLS == ESP_OK)
-    {
-        mbedtls_ssl_conf_authmode(&sHTTPS_ClientConfig.conf, MBEDTLS_SSL_VERIFY_REQUIRED);
-        mbedtls_ssl_conf_ca_chain(&sHTTPS_ClientConfig.conf, &sHTTPS_ClientConfig.cacert, NULL);
-        mbedtls_ssl_conf_rng(&sHTTPS_ClientConfig.conf, mbedtls_ctr_drbg_random, &sHTTPS_ClientConfig.ctr_drbg);
-
-        i32RetEmbedTLS = mbedtls_ssl_setup(&sHTTPS_ClientConfig.ssl, &sHTTPS_ClientConfig.conf);
-        if(i32RetEmbedTLS != ESP_OK)
-        {
-            ESP_LOGE(TAG, "mbedtls_ssl_setup returned -0x%x\n\n", i32RetEmbedTLS);
-        }
-    }
-
-    if(i32RetEmbedTLS == ESP_OK)
-    {
-        mbedtls_net_init(&sHTTPS_ClientConfig.server_fd);
-    }
-
-    if (i32RetEmbedTLS != ESP_OK)
-    {
-        i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_EMBEDTLS;
-    }
-
-    return i32RetHTTPClient;
-}
-
-https_client_ret_t https_clientConnectToServer()
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-    int32_t i32RetServerConnect = ESP_OK;
-
-    //Connecting to server
-    i32RetServerConnect = mbedtls_net_connect(&sHTTPS_ClientConfig.server_fd, CONFIG_OTA_HTTPS_SERVER_COMMON_NAME, CONFIG_OTA_HTTPS_SERVER_PORT, MBEDTLS_NET_PROTO_TCP);
-    if (i32RetServerConnect != ESP_OK)
-    {
-        ESP_LOGE(TAG, "mbedtls_net_connect returned %x", i32RetServerConnect);
-    }
-
-    if(i32RetServerConnect == ESP_OK)
-    {
-        mbedtls_ssl_set_bio(&sHTTPS_ClientConfig.ssl, &sHTTPS_ClientConfig.server_fd, mbedtls_net_send, mbedtls_net_recv, NULL);
-
-        //Performing the SSL/TLS handshake
-        while ((i32RetServerConnect = mbedtls_ssl_handshake(&sHTTPS_ClientConfig.ssl)) != 0)
-        {
-            if ((i32RetServerConnect != MBEDTLS_ERR_SSL_WANT_READ) && (i32RetServerConnect != MBEDTLS_ERR_SSL_WANT_WRITE))
-            {
-                ESP_LOGE(TAG, "mbedtls_ssl_handshake returned 0x%x", i32RetServerConnect);
-            }
-        }
-    }
-
-    if(i32RetServerConnect != ESP_OK)
-    {
-        i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_CONNECT_TWO_SERVER;
-    }
-    return i32RetHTTPClient;
-}
-
-https_client_ret_t https_clientValidateServer()
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-    int32_t i32RetValidateServer = ESP_OK;
-
-    //Verifying peer X.509 certificate
-    if ((i32RetValidateServer = mbedtls_ssl_get_verify_result(&sHTTPS_ClientConfig.ssl)) != 0)
-    {
-        ESP_LOGE(TAG, "Failed to verify peer certificate!");
-    }
-
-    if(i32RetValidateServer != ESP_OK)
-    {
-        i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_VALIDATE_SERVER;
-    }
-    return i32RetHTTPClient;
-}
-
-https_client_ret_t https_clientSendRequest()
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-    int32_t i32RetSendRequest = ESP_OK;
-    uint32_t u32WrittenBytes = 0;
-    bool bWrite = true;
-
-    //Writing HTTP request
-    while((u32WrittenBytes < strlen(REQUEST)) && bWrite)
-    {
-        i32RetSendRequest = mbedtls_ssl_write(&sHTTPS_ClientConfig.ssl,
-                                              (const unsigned char *)REQUEST + u32WrittenBytes,
-                                              strlen(REQUEST) - u32WrittenBytes);
-        if (i32RetSendRequest >= 0)
-        {
-            //bytes written
-            u32WrittenBytes += i32RetSendRequest;
-        } else if (i32RetSendRequest != MBEDTLS_ERR_SSL_WANT_WRITE && i32RetSendRequest != MBEDTLS_ERR_SSL_WANT_READ) {
-            ESP_LOGE(TAG, "mbedtls_ssl_write returned 0x%x", i32RetSendRequest);
-            bWrite = false;
-        }
-    }
-
-    if(bWrite == false)
-    {
-        i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_SEND_REQUEST;
-    }
-    return i32RetHTTPClient;
-}

components/mesh_ota/include/Mesh_OTA.h

@@ -0,0 +1,45 @@
+#ifndef H_MESH_OTA
+#define H_MESH_OTA
+
+#include <string.h>
+#include "esp_wifi.h"
+#include "esp_system.h"
+#include "esp_event.h"
+#include "esp_log.h"
+#include "esp_mesh.h"
+#include "esp_mesh_internal.h"
+#include "nvs_flash.h"
+#include "driver/gpio.h"
+#include "esp_ota_ops.h"
+#include "esp_partition.h"
+
+#include "Mesh_network.h"
+
+#define ERASE_NVS //erase non volatile storage if full
+
+/*
+enum ota_packet_type
+    {
+        APP_Version_Request,
+        APP_Version_Response,
+        OTA_Data,
+        OTA_ACK,
+        OTA_Complete
+    };
+*/
+
+#define ERROR_CHECK(x) if (err == ESP_OK)                                                               \
+    {                                                                                                   \
+        err = (x);                                                                                      \
+        if (err != ESP_OK)                                                                              \
+            {                                                                                           \
+                ESP_LOGE(LOG_TAG,  "%s failed with error: %d -> %s", #x,  err, esp_err_to_name(err));   \
+            }                                                                                           \
+    }                                                                                                   \
+                                                
+
+bool bNewerVersion(const char* pu8Local, const char* pu8Remote);
+esp_err_t errExtractVersionNumber(const  char* pu8Data, uint32_t* pu32DataLenght, char* pc8RemoteVersionNumber);
+esp_err_t errFindImageStart(const  char* pu8Data, uint32_t* pu32DataLenght, uint32_t* pu32StartOffset);
+
+#endif /* H_MESH_OTA */

components/mesh_ota/include/Mesh_network.h

@@ -0,0 +1,83 @@
+#ifndef H_MESH_NETWORK
+#define H_MESH_NETWORK
+
+#include <string.h>
+#include "esp_wifi.h"
+#include "esp_system.h"
+#include "esp_event.h"
+#include "esp_log.h"
+#include "esp_mesh.h"
+#include "esp_mesh_internal.h"
+
+#ifndef CONFIG_MESH_MESSAGE_SIZE
+#define CONFIG_MESH_MESSAGE_SIZE 1500
+#endif
+#ifndef CONFIG_MESH_TOPOLOGY
+#define CONFIG_MESH_TOPOLOGY MESH_TOPO_TREE
+#endif
+#ifndef CONFIG_MESH_MAX_LAYER
+#define CONFIG_MESH_MAX_LAYER 6
+#endif
+#ifndef CONFIG_MESH_ID
+#define CONFIG_MESH_ID "00, 00, 00, 00, 00, 00"
+#endif
+#ifndef CONFIG_MESH_AP_AUTHMODE
+#define CONFIG_MESH_AP_AUTHMODE WIFI_AUTH_WPA2_PSK
+#endif
+#ifndef CONFIG_MESH_AP_CONNECTIONS
+#define CONFIG_MESH_AP_CONNECTIONS 6
+#endif
+#ifndef CONFIG_MESH_AP_PASSWD
+#define CONFIG_MESH_AP_PASSWD "MAP_PASSWD"
+#endif
+#ifndef CONFIG_MESH_CHANNEL
+#define CONFIG_MESH_CHANNEL 0
+#endif
+
+#ifndef CONFIG_MESH_ROUTER_SSID
+#define CONFIG_MESH_ROUTER_SSID "ROUTER_SSID"
+#endif
+
+#ifndef CONFIG_MESH_ROUTER_PASSWD
+#define CONFIG_MESH_ROUTER_PASSWD "ROUTER_PASSWD"
+#endif
+
+#ifndef CONFIG_MESH_ROUTE_TABLE_SIZE
+#define CONFIG_MESH_ROUTE_TABLE_SIZE 50
+#endif
+
+
+struct mesh_packet
+{
+    enum ota_mesh_packet_type {
+        APP_Data,            //data for application 
+        OTA_Version_Request, //send own version in payload
+        OTA_Version_Respone, //send own version in payload
+        OTA_Data,            //send image segment
+        OTA_ACK,             //ack image segment
+        OTA_Complete         //signal end of image
+    } type;
+    uint8_t au8Payload[1024];
+};
+
+typedef struct mesh_packet MESH_PACKET_t;
+
+extern bool bIsMeshConnected;
+extern int32_t i32MeshLayer;
+extern mesh_addr_t mesh_parent_addr;
+extern esp_netif_t* netif_sta;
+
+esp_err_t errMeshNetworkInitialize();
+esp_err_t errMeshNetworkInitializeWiFi();
+esp_err_t errMeshNetworkInitializeRouter(mesh_cfg_t* cfg);
+
+bool bCheckMACEquality(uint8_t* pu8aMAC,  uint8_t* pu8bMAC);
+esp_err_t errGetChildren(mesh_addr_t* pChildren, uint16_t* pu16ChildrenSize);
+void vMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void* vpEventData);
+void vIPEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void *event_data);
+esp_err_t errStartReceiveTask();
+void vTaskReceiveMeshData(void *arg);
+esp_err_t errSendMeshPacket(mesh_addr_t* pAddrDest, MESH_PACKET_t* pPacket);
+
+#endif /* H_MESH_NETWORK */
+ 

components/mesh_ota/include/https_client.h

@@ -1,76 +0,0 @@
-#ifndef H_HTTPS_CLIENT
-#define H_HTTPS_CLIENT
-
-#include <string.h>
-#include <stdlib.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "esp_wifi.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "esp_system.h"
-#include "nvs_flash.h"
-#include "esp_netif.h"
-
-#include "lwip/err.h"
-#include "lwip/sockets.h"
-#include "lwip/sys.h"
-#include "lwip/netdb.h"
-#include "lwip/dns.h"
-
-#include "mbedtls/platform.h"
-#include "mbedtls/net_sockets.h"
-#include "mbedtls/esp_debug.h"
-#include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
-#include "mbedtls/error.h"
-#include "mbedtls/certs.h"
-#include "esp_crt_bundle.h" 
-
-#ifndef CONFIG_OTA_HTTPS_URL
-#define CONFIG_OTA_HTTPS_URL "https://exmaple.com/theImage.bin"
-#endif
-
-#ifndef CONFIG_OTA_HTTPS_SERVER_PORT
-#define CONFIG_OTA_HTTPS_SERVER_PORT "443"
-#endif
-
-#ifndef CONFIG_OTA_HTTPS_AUTH
-#define CONFIG_OTA_HTTPS_AUTH "base64(user:password)"
-#endif
-
-#ifndef CONFIG_OTA_HTTPS_SERVER_COMMON_NAME
-#define CONFIG_OTA_HTTPS_SERVER_COMMON_NAME "exmaple.com"
-#endif
-
-
-#define HTTPS_CLIENT_OK 0
-#define HTTPS_CLIENT_ERROR -1
-#define HTTPS_CLIENT_ERROR_INIT_EMBEDTLS -2
-#define HTTPS_CLIENT_ERROR_INIT_CONNECT_TWO_SERVER -3
-#define HTTPS_CLIENT_ERROR_INIT_VALIDATE_SERVER -4
-#define HTTPS_CLIENT_ERROR_INIT_SEND_REQUEST -5
-
-struct HTTPS_Client
-{
-    mbedtls_entropy_context entropy;
-    mbedtls_ctr_drbg_context ctr_drbg;
-    mbedtls_ssl_context ssl;
-    mbedtls_x509_crt cacert;
-    mbedtls_ssl_config conf;
-    mbedtls_net_context server_fd;
-};
-
-typedef int32_t https_client_ret_t;
-typedef struct HTTPS_Client HTTPS_Client_t;
- 
-https_client_ret_t https_clientInitialize();
-https_client_ret_t https_clientRetrieveData(char* pu8Data, uint32_t* pu32DataLenght, uint32_t* pu32BytesRead);
-https_client_ret_t https_clientDeinitialize();
-
-#endif /* H_HTTPS_CLIENT */
-
-
-
-

components/mesh_ota/include/mesh_ota.h

@@ -1,23 +0,0 @@
-#ifndef H_MESH_OTA
-#define H_MESH_OTA
-
-#include <string.h>
-#include "esp_wifi.h"
-#include "esp_system.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "esp_mesh.h"
-#include "esp_mesh_internal.h"
-#include "nvs_flash.h"
-#include "driver/gpio.h"
-#include "esp_ota_ops.h"
-#include "esp_partition.h"
-
-#include "https_client.h"
-
-bool bNewerVersion(const char* pu8Local, const char* pu8Remote);
-
-esp_err_t errExtractVersionNumber(const  char* pu8Data, uint32_t* pu32DataLenght, char* pc8RemoteVersionNumber);
-esp_err_t errFindImageStart(const  char* pu8Data, uint32_t* pu32DataLenght, uint32_t* pu32StartOffset);
-
-#endif /* H_MESH_OTA */

components/mesh_ota/mesh_ota.c

@@ -1,155 +0,0 @@
-#include "mesh_ota.h"
-
-
-
-/*
- * 999.999.999
- * Return true if remote version is newer (higher) than local version
-*/
-bool bNewerVersion(const char* pu8Local, const  char* pu8Remote) {
-
-    char u8LocalTmp[12];
-    char u8RemoteTmp[12];
-
-    char* pu8saveptrLocal;
-    char* pu8saveptrRemote;
-
-    strcpy(u8LocalTmp, pu8Local);
-    strcpy(u8RemoteTmp, pu8Remote);
-
-    char* pu8TokenLocal = strtok_r(u8LocalTmp, ".", &pu8saveptrLocal);
-    char* pu8TokenRemote = strtok_r(u8RemoteTmp, ".", &pu8saveptrRemote) ;
-
-
-    bool bReturn = false;
-
-    uint8_t u8Index = 0;
-
-    while( (u8Index <= 2) && (bReturn == false)) {
-
-        u8Index++;
-
-        if(atoi(pu8TokenLocal) < atoi(pu8TokenRemote))
-        {
-            bReturn = true;
-        }
-
-        pu8TokenLocal = strtok_r(NULL, ".", &pu8saveptrLocal);
-        pu8TokenRemote = strtok_r(NULL, ".", &pu8saveptrRemote) ;
-    }
-
-    return bReturn;
-}
-
-esp_err_t errFindImageStart(const char* pu8Data, uint32_t* pu32DataLenght, uint32_t* pu32StartOffset)
-{
-    /*
-    Offset  value
-    0      = E9
-    48     = first digit of version number
-    */
-
-    esp_err_t errReturn = ESP_OK;
-
-    bool bImageStartOffsetFound = false;
-    
-    *pu32StartOffset = 0U;
-    
-    uint32_t u32DataIndex = 0;
-    uint32_t u32FirstDotOffset = 0;
-    uint32_t u32SecondDotOffset = 0;
-    uint8_t u8FirstDotIndex = 0;
-    uint8_t u8SecondDotIndex = 0;
-    
-    while((u32DataIndex < *pu32DataLenght) &&  (bImageStartOffsetFound == false))
-    {
-        //search for magic byte
-        
-        if(pu8Data[u32DataIndex] == 0xe9)
-        {
-            //magic byte found
-            printf("\n magic byte found: %i\n", u32DataIndex);
-            while ((u8FirstDotIndex < 3) && (u32FirstDotOffset == 0))
-            {
-                //search first dot in version number
-                if((u32DataIndex+49+u8FirstDotIndex) < *pu32DataLenght)
-                {
-                    if((pu8Data[(u32DataIndex+49+u8FirstDotIndex)] == 0x2e))
-                    {
-                        //first do found
-                        u32FirstDotOffset = (u32DataIndex+49+u8FirstDotIndex);
-                        //printf("First dot offset: %i\n", u32FirstDotOffset);
-                    }
-                }
-             u8FirstDotIndex++;
-            }
-
-            while ((u8SecondDotIndex < 3) && (u32SecondDotOffset == 0) && (u32FirstDotOffset != 0))
-            {
-                
-                //search first dot in version number
-                if((u32FirstDotOffset+(u8SecondDotIndex+2)) < *pu32DataLenght)
-                {
-                    if((pu8Data[(u32FirstDotOffset+(u8SecondDotIndex+2))] == 0x2e))
-                    {
-                        //second do found
-                        u32SecondDotOffset = (u32FirstDotOffset+(u8SecondDotIndex+2));
-                        //printf("Second dot offset: %i\n", u32SecondDotOffset);
-                    }
-                }
-                u8SecondDotIndex++;
-            }
-
-            if((u32FirstDotOffset != 0) && (u32SecondDotOffset != 0))
-            {
-                //image start found based on magic byte and version number systax
-                *pu32StartOffset = u32DataIndex; //store image start offset
-                bImageStartOffsetFound = true;
-            }
-            else
-            {
-                // this is propably not the magic byte --> reset
-                u32FirstDotOffset = 0;
-                u32SecondDotOffset = 0;
-                u8FirstDotIndex = 0;
-                u8SecondDotIndex = 0;
-            }
-        }
-
-        u32DataIndex++;
-        //putchar(pu8Data[i]);
-        //printf("%x ", pu8Data[u32DataIndex]);
-    }
-
-    if(bImageStartOffsetFound == false)
-    {
-        errReturn = ESP_ERR_NOT_FOUND;
-    }
-
-    return errReturn;
-}
-
-esp_err_t errExtractVersionNumber(const char* pu8Data, uint32_t* pu32DataLenght, char* pc8RemoteVersionNumber)
-{
-    strcpy(pc8RemoteVersionNumber, "999.999.999"); //init value
-
-    uint32_t u32StartOffset;
-
-    esp_err_t err = errFindImageStart(pu8Data, pu32DataLenght, &u32StartOffset);
-
-    if(err == ESP_OK)
-    {
-
-    printf("\nImage start found: %i\n", u32StartOffset);
-
-    strncpy(pc8RemoteVersionNumber, pu8Data+(u32StartOffset+48),  11);
-    
-    pc8RemoteVersionNumber[12] = '\0';
-    
-    printf("remote version number %s\n\n", pc8RemoteVersionNumber);
-    }
-
-
-
-    return err;
-}

components/mesh_ota/test/test_image_hex.h

@@ -1,7 +1,6 @@
 #ifndef H_TEST_IMAGE_HEX
 #define H_TEST_IMAGE_HEX
 
-
 //with http response +  0.0.1
 char dataWithHttpRespone0_0_1[] = 
 {
@@ -32,7 +31,6 @@ char dataWithHttpRespone0_0_1[] =
 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74
 };
 
-
 //without http response +  0.0.1
 char dataWithoutHttpRespone0_0_1[] = 
 {
@@ -80,7 +78,6 @@ char dataWithoutHttpRespone999_999_999[] =
     
 };
 
-
 //with http response +  999.999.999
 char dataWithHttpRespone999_999_999[] = 
 {
@@ -171,5 +168,4 @@ char dataWithHttpRespone999_99_999[] =
 0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74,
 };
  
-    
 #endif /* H_TEST_IMAGE_HEX */

components/mesh_ota/test/test_mesh_ota.c

@@ -1,8 +1,7 @@
 #include <limits.h>
 #include "unity.h"
 
-#include "mesh_ota.h"
+#include "Mesh_OTA.h"
-
 #include "test_image_hex.h"
 
 // ### ### ###  distinguish newer image version ### ### ###

main/CMakeLists.txt

@@ -1,2 +1,2 @@
-idf_component_register(SRCS "main.c"
+idf_component_register(SRCS "Main.c"
                     INCLUDE_DIRS ".")

main/Kconfig.projbuild

@@ -106,6 +106,12 @@ menu "Mesh OTA Configuration"
         help
             mesh network channel.
             
+    config MESH_ID
+        string "ID for mesh network"
+        default "00, 00, 00, 00, 00, 00"
+        help
+            Mesh network id like MAC addr.
+
     config MESH_ROUTER_SSID
         string "Router SSID"
         default "ROUTER_SSID"
@@ -158,6 +164,13 @@ menu "Mesh OTA Configuration"
         help
             The number of devices over the network(max: 300).
             
+    config MESH_MESSAGE_SIZE
+        int "Mesh network messages size"
+        range 1 65536
+        default 1500
+        help
+            Length of messages deliveres by the mesh network.
+            
     config OTA_HTTPS_SERVER_COMMON_NAME
         string "Common name OTA server"
         default "exmaple.com"

main/Main.c

@@ -0,0 +1,31 @@
+
+#include <string.h>
+#include "esp_wifi.h"
+#include "esp_system.h"
+#include "esp_event.h"
+#include "esp_log.h"
+#include "esp_mesh.h"
+#include "esp_mesh_internal.h"
+#include "nvs_flash.h"
+#include "driver/gpio.h"
+#include "esp_ota_ops.h"
+#include "esp_partition.h"
+
+#include "Mesh_OTA.h"
+
+static const char *LOG_TAG = "esp_main";
+
+void app_main(void)
+{
+    esp_err_t err = ESP_OK;
+    ESP_LOGI(LOG_TAG, "hardcoded: 0.0.1"); 
+    err = errMeshNetworkInitialize();
+    ESP_ERROR_CHECK(err);
+
+    //start ota
+
+    //start app 
+
+}
+
+

main/main.c

@@ -1,697 +0,0 @@
-
-#include <string.h>
-#include "esp_wifi.h"
-#include "esp_system.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "esp_mesh.h"
-#include "esp_mesh_internal.h"
-#include "nvs_flash.h"
-#include "driver/gpio.h"
-#include "esp_ota_ops.h"
-#include "esp_partition.h"
-
-#include "mesh_ota.h"
-
-
-#define RX_SIZE          (1234)
-#define TX_SIZE          (1234)
-
-static const char *MESH_TAG = "mesh_main";
-static const uint8_t MESH_ID[6] = { 0x77, 0x77, 0x77, 0x77, 0x77, 0x77};
-static uint8_t tx_buf[TX_SIZE] = { 0, };
-static uint8_t rx_buf[RX_SIZE] = { 0, };
-static bool is_mesh_connected = false;
-static mesh_addr_t mesh_parent_addr;
-static uint8_t ownMAC[6];
-static int mesh_layer = -1;
-static esp_netif_t *netif_sta = NULL;
-
-struct ota_mesh_packet
-{
-    enum ota_mesh_packet_type
-    {
-        APP_Version_Request,
-        APP_Version_Response,
-        OTA_Data,
-        OTA_ACK,
-        OTA_Complete
-    } type;
-
-    uint8_t au8Payload[1024];
-};
-
-/*******************************************************
- *                Function Declarations
- *******************************************************/
-
-esp_err_t esp_mesh_send_packet(mesh_addr_t* dest, struct ota_mesh_packet* packet);
-
-/*******************************************************
- *                Function Definitions
- *******************************************************/
-
-esp_err_t esp_mesh_ota_send(mesh_addr_t* dest)
-{
-    esp_err_t err = ESP_OK;
-
-    static uint32_t u32index;
-
-    const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
-
-    if((*currentPartition).subtype == 0)
-    {
-
-        int data_read = 0;
-
-        struct ota_mesh_packet packet;
-        packet.type=OTA_Data;
-
-        if(u32index == 1024)
-        {
-            //all data read
-            data_read = 0;
-            u32index = 0;
-        }
-        else
-        {
-            ESP_LOGI(MESH_TAG, "OTA-Data read: %i", u32index);
-            err =  esp_partition_read(currentPartition, (1024*u32index), packet.au8Payload, 1024 );
-            ESP_ERROR_CHECK(err);
-            data_read = 1024;
-            u32index++;
-        }
-
-        if (data_read > 0)
-        {
-            //send ota fragemnt to node
-            esp_mesh_send_packet(dest, &packet);
-        }
-
-        ESP_ERROR_CHECK(err);
-    }
-    else
-    {
-        ESP_LOGI(MESH_TAG, "Subtype: %d",  (*currentPartition).subtype);
-    }
-    return err;
-}
-
-esp_err_t esp_mesh_ota_receive(mesh_addr_t* dest, struct ota_mesh_packet* packet)
-{
-    esp_err_t err = ESP_OK;
-    static esp_ota_handle_t otaHandle;
-    static uint32_t u32index;
-
-    const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
-    const esp_partition_t * otaPartition =  esp_ota_get_next_update_partition(currentPartition);
-
-    if(u32index == 0)
-    {
-        //first run
-
-        err = esp_ota_begin(otaPartition, OTA_SIZE_UNKNOWN, &otaHandle);
-        ESP_ERROR_CHECK(err);
-    }
-
-    ESP_LOGI(MESH_TAG, "OTA-Data write: %i", u32index);
-    err = esp_ota_write(otaHandle, packet->au8Payload, 1024);
-
-    if(err != ESP_OK)
-    {
-        ESP_LOGE(MESH_TAG, "OTA-Data write error: %i at %i", err, u32index);
-    }
-
-    ESP_ERROR_CHECK(err);
-
-
-
-    if(u32index >= 1023)
-    {
-        //ota update complete
-
-        ESP_LOGI(MESH_TAG, "OTA-Data complete arrived: %i", u32index);
-        err = esp_ota_end(otaHandle);
-        ESP_ERROR_CHECK(err);
-        esp_app_desc_t otaPartitionDesc;
-        err = esp_ota_get_partition_description(otaPartition, &otaPartitionDesc);
-        ESP_ERROR_CHECK(err);
-        ESP_LOGI(MESH_TAG, "otaPartition project_name: %s",  (otaPartitionDesc).project_name);
-
-        err = esp_ota_set_boot_partition(otaPartition);
-        ESP_ERROR_CHECK(err);
-
-        struct ota_mesh_packet retPacket;
-        retPacket.type=OTA_Complete;
-        ESP_ERROR_CHECK (esp_mesh_send_packet(dest, &retPacket)); //send back to parent
-
-        //check if this node has children --> Update them
-
-        esp_restart();
-    }
-
-    u32index++;
-
-
-    return err;
-}
-
-//returns true if MAC address is equal
-bool esp_mesh_check_MAC_Equality(uint8_t* aMAC,  uint8_t* bMAC)
-{
-    for (uint8_t index = 0; index < 6; index++)
-    {
-        if(aMAC[index] != bMAC[index])
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-esp_err_t esp_mesh_get_Children(mesh_addr_t children[], uint16_t* pu16ChildrenSize)
-{
-    *pu16ChildrenSize = 0;
-    mesh_addr_t route_table[CONFIG_MESH_ROUTE_TABLE_SIZE];
-    int route_table_size = 0;
-    esp_mesh_get_routing_table((mesh_addr_t *) &route_table, CONFIG_MESH_ROUTE_TABLE_SIZE * 6, &route_table_size);
-    for(uint16_t index = 0; index < esp_mesh_get_routing_table_size(); index++)
-    {
-        if(!    (esp_mesh_check_MAC_Equality(ownMAC, route_table[index].addr))  )
-        {
-            //child node
-            // ESP_LOGI(MESH_TAG, "adding Node: \"0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\" ", route_table[index].addr[0], route_table[index].addr[1], route_table[index].addr[2], route_table[index].addr[3], route_table[index].addr[4], route_table[index].addr[5]);
-            children[*pu16ChildrenSize] = route_table[index];
-            *pu16ChildrenSize = (*pu16ChildrenSize)+1;
-        }
-    }
-    return ESP_OK;
-}
-
-
-esp_err_t esp_mesh_send_packet(mesh_addr_t* dest, struct ota_mesh_packet* packet)
-{
-    esp_err_t err;
-    mesh_data_t data;
-    data.data = tx_buf;
-    data.size = sizeof(tx_buf);
-    data.proto = MESH_PROTO_BIN;
-    data.tos = MESH_TOS_P2P;
-
-    memcpy(tx_buf, (uint8_t *)packet, sizeof(struct ota_mesh_packet));
-
-    err = esp_mesh_send(dest, &data, MESH_DATA_P2P, NULL, 0);
-
-    return err;
-}
-
-void esp_mesh_p2p_rx_main(void *arg)
-{
-    esp_err_t err;
-    mesh_addr_t from;
-    mesh_data_t data;
-    int flag = 0;
-    data.data = rx_buf;
-    data.size = RX_SIZE;
-
-    while (true)
-    {
-        data.size = RX_SIZE;
-        err = esp_mesh_recv(&from, &data, portMAX_DELAY, &flag, NULL, 0);
-        if (err != ESP_OK || !data.size)
-        {
-            ESP_LOGE(MESH_TAG, "err:0x%x, size:%d", err, data.size);
-            continue;
-        }
-
-        struct ota_mesh_packet packet;
-        memcpy(&packet, (uint8_t *)rx_buf, sizeof(struct ota_mesh_packet));
-
-        switch (packet.type)
-        {
-        case APP_Version_Request:
-            ESP_LOGI(MESH_TAG, "recv: APP_Version_Request");
-            packet.type=APP_Version_Response;
-            packet.au8Payload[0] = 42; //TODO get current running version
-            ESP_ERROR_CHECK (esp_mesh_send_packet(&from, &packet)); //send back to parent
-            break;
-        case APP_Version_Response:
-            ESP_LOGI(MESH_TAG, "recv: APP_Version_Response - App Version %i: ", packet.au8Payload[0]);
-            //check if node is out-dated
-            esp_mesh_ota_send(&from);
-            break;
-        case OTA_Data:
-            ESP_LOGI(MESH_TAG, "recv: OTA_Data");
-            esp_mesh_ota_receive(&from, &packet);
-            packet.type=OTA_ACK;
-            ESP_ERROR_CHECK (esp_mesh_send_packet(&from, &packet)); //send back to parent
-            break;
-        case OTA_ACK:
-            ESP_LOGI(MESH_TAG, "recv: OTA_ACK");
-            esp_mesh_ota_send(&from);
-            break;
-        case OTA_Complete:
-            ESP_LOGI(MESH_TAG, "recv: OTA_Complete");
-            break;
-        default:
-            ESP_LOGE(MESH_TAG, "recv: something");
-            break;
-        }
-
-    } //end while
-    vTaskDelete(NULL);
-}
-
-
-esp_err_t esp_mesh_comm_p2p_start(void)
-{
-    static bool is_comm_p2p_started = false;
-    if (!is_comm_p2p_started)
-    {
-        is_comm_p2p_started = true;
-        xTaskCreate(esp_mesh_p2p_rx_main, "MPRX", 7000, NULL, 5, NULL);
-    }
-    return ESP_OK;
-}
-
-void mesh_event_handler(void *arg, esp_event_base_t event_base,
-                        int32_t event_id, void *event_data)
-{
-    mesh_addr_t id = {0,};
-    static uint16_t last_layer = 0;
-
-    switch (event_id)
-    {
-    case MESH_EVENT_STARTED:
-    {
-        esp_mesh_get_id(&id);
-        ESP_LOGI(MESH_TAG, "<MESH_EVENT_MESH_STARTED>ID:"MACSTR"", MAC2STR(id.addr));
-is_mesh_connected = false;
-mesh_layer = esp_mesh_get_layer();
-}
-break;
-    case MESH_EVENT_STOPPED: {
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_STOPPED>");
-is_mesh_connected = false;
-mesh_layer = esp_mesh_get_layer();
-}
-break;
-    case MESH_EVENT_CHILD_CONNECTED: {
-mesh_event_child_connected_t *child_connected = (mesh_event_child_connected_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_CHILD_CONNECTED>aid:%d, "MACSTR"",
- child_connected->aid,
- MAC2STR(child_connected->mac));
-}
-break;
-    case MESH_EVENT_CHILD_DISCONNECTED: {
-mesh_event_child_disconnected_t *child_disconnected = (mesh_event_child_disconnected_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_CHILD_DISCONNECTED>aid:%d, "MACSTR"",
- child_disconnected->aid,
- MAC2STR(child_disconnected->mac));
-}
-break;
-    case MESH_EVENT_ROUTING_TABLE_ADD: {
-mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)event_data;
-ESP_LOGW(MESH_TAG, "<MESH_EVENT_ROUTING_TABLE_ADD>add %d, new:%d, layer:%d",
- routing_table->rt_size_change,
- routing_table->rt_size_new, mesh_layer);
-}
-break;
-    case MESH_EVENT_ROUTING_TABLE_REMOVE: {
-mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)event_data;
-ESP_LOGW(MESH_TAG, "<MESH_EVENT_ROUTING_TABLE_REMOVE>remove %d, new:%d, layer:%d",
- routing_table->rt_size_change,
- routing_table->rt_size_new, mesh_layer);
-}
-break;
-    case MESH_EVENT_NO_PARENT_FOUND: {
-mesh_event_no_parent_found_t *no_parent = (mesh_event_no_parent_found_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_NO_PARENT_FOUND>scan times:%d",
- no_parent->scan_times);
-}
-    /* TODO handler for the failure */
-break;
-    case MESH_EVENT_PARENT_CONNECTED: {
-mesh_event_connected_t *connected = (mesh_event_connected_t *)event_data;
-esp_mesh_get_id(&id);
-mesh_layer = connected->self_layer;
-memcpy(&mesh_parent_addr.addr, connected->connected.bssid, 6);
-ESP_LOGI(MESH_TAG,
- "<MESH_EVENT_PARENT_CONNECTED>layer:%d-->%d, parent:"MACSTR"%s, ID:"MACSTR", duty:%d",
- last_layer, mesh_layer, MAC2STR(mesh_parent_addr.addr),
- esp_mesh_is_root() ? "<ROOT>" :
- (mesh_layer == 2) ? "<layer2>" : "", MAC2STR(id.addr), connected->duty);
-last_layer = mesh_layer;
- //  mesh_connected_indicator(mesh_layer);
-is_mesh_connected = true;
-if (esp_mesh_is_root()) {
-esp_netif_dhcpc_start(netif_sta);
-}
-esp_mesh_comm_p2p_start();//start receiving
-}
-break;
-    case MESH_EVENT_PARENT_DISCONNECTED: {
-mesh_event_disconnected_t *disconnected = (mesh_event_disconnected_t *)event_data;
-ESP_LOGI(MESH_TAG,
- "<MESH_EVENT_PARENT_DISCONNECTED>reason:%d",
- disconnected->reason);
-is_mesh_connected = false;
-   // mesh_disconnected_indicator();
-mesh_layer = esp_mesh_get_layer();
-}
-break;
-    case MESH_EVENT_LAYER_CHANGE: {
-mesh_event_layer_change_t *layer_change = (mesh_event_layer_change_t *)event_data;
-mesh_layer = layer_change->new_layer;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_LAYER_CHANGE>layer:%d-->%d%s",
- last_layer, mesh_layer,
- esp_mesh_is_root() ? "<ROOT>" :
- (mesh_layer == 2) ? "<layer2>" : "");
-last_layer = mesh_layer;
-  //  mesh_connected_indicator(mesh_layer);
-}
-break;
-    case MESH_EVENT_ROOT_ADDRESS: {
-mesh_event_root_address_t *root_addr = (mesh_event_root_address_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_ROOT_ADDRESS>root address:"MACSTR"",
- MAC2STR(root_addr->addr));
-}
-break;
-    case MESH_EVENT_VOTE_STARTED: {
-mesh_event_vote_started_t *vote_started = (mesh_event_vote_started_t *)event_data;
-ESP_LOGI(MESH_TAG,
- "<MESH_EVENT_VOTE_STARTED>attempts:%d, reason:%d, rc_addr:"MACSTR"",
- vote_started->attempts,
- vote_started->reason,
- MAC2STR(vote_started->rc_addr.addr));
-}
-break;
-    case MESH_EVENT_VOTE_STOPPED: {
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_VOTE_STOPPED>");
-break;
-}
-    case MESH_EVENT_ROOT_SWITCH_REQ: {
-mesh_event_root_switch_req_t *switch_req = (mesh_event_root_switch_req_t *)event_data;
-ESP_LOGI(MESH_TAG,
- "<MESH_EVENT_ROOT_SWITCH_REQ>reason:%d, rc_addr:"MACSTR"",
- switch_req->reason,
- MAC2STR( switch_req->rc_addr.addr));
-}
-break;
-    case MESH_EVENT_ROOT_SWITCH_ACK: {
-/* new root */
-mesh_layer = esp_mesh_get_layer();
-esp_mesh_get_parent_bssid(&mesh_parent_addr);
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_ROOT_SWITCH_ACK>layer:%d, parent:"MACSTR"", mesh_layer, MAC2STR(mesh_parent_addr.addr));
-}
-break;
-    case MESH_EVENT_TODS_STATE: {
-mesh_event_toDS_state_t *toDs_state = (mesh_event_toDS_state_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_TODS_REACHABLE>state:%d", *toDs_state);
-}
-break;
-    case MESH_EVENT_ROOT_FIXED: {
-mesh_event_root_fixed_t *root_fixed = (mesh_event_root_fixed_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_ROOT_FIXED>%s",
- root_fixed->is_fixed ? "fixed" : "not fixed");
-}
-break;
-    case MESH_EVENT_ROOT_ASKED_YIELD: {
-mesh_event_root_conflict_t *root_conflict = (mesh_event_root_conflict_t *)event_data;
-ESP_LOGI(MESH_TAG,
- "<MESH_EVENT_ROOT_ASKED_YIELD>"MACSTR", rssi:%d, capacity:%d",
- MAC2STR(root_conflict->addr),
- root_conflict->rssi,
- root_conflict->capacity);
-}
-break;
-    case MESH_EVENT_CHANNEL_SWITCH: {
-mesh_event_channel_switch_t *channel_switch = (mesh_event_channel_switch_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_CHANNEL_SWITCH>new channel:%d", channel_switch->channel);
-}
-break;
-    case MESH_EVENT_SCAN_DONE: {
-mesh_event_scan_done_t *scan_done = (mesh_event_scan_done_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_SCAN_DONE>number:%d",
- scan_done->number);
-}
-break;
-    case MESH_EVENT_NETWORK_STATE: {
-mesh_event_network_state_t *network_state = (mesh_event_network_state_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_NETWORK_STATE>is_rootless:%d",
- network_state->is_rootless);
-}
-break;
-    case MESH_EVENT_STOP_RECONNECTION: {
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_STOP_RECONNECTION>");
-}
-break;
-    case MESH_EVENT_FIND_NETWORK: {
-mesh_event_find_network_t *find_network = (mesh_event_find_network_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_FIND_NETWORK>new channel:%d, router BSSID:"MACSTR"",
- find_network->channel, MAC2STR(find_network->router_bssid));
-}
-break;
-    case MESH_EVENT_ROUTER_SWITCH: {
-mesh_event_router_switch_t *router_switch = (mesh_event_router_switch_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_ROUTER_SWITCH>new router:%s, channel:%d, "MACSTR"",
- router_switch->ssid, router_switch->channel, MAC2STR(router_switch->bssid));
-}
-break;
-    case MESH_EVENT_PS_PARENT_DUTY: {
-mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_PS_PARENT_DUTY>duty:%d", ps_duty->duty);
-}
-break;
-    case MESH_EVENT_PS_CHILD_DUTY: {
-mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_PS_CHILD_DUTY>cidx:%d, "MACSTR", duty:%d", ps_duty->child_connected.aid-1,
-MAC2STR(ps_duty->child_connected.mac), ps_duty->duty);
-}
-break;
-    default:
-        ESP_LOGI(MESH_TAG, "unknown id:%d", event_id);
-        break;
-    }
-}
-
-void ip_event_handler(void *arg, esp_event_base_t event_base,
-                      int32_t event_id, void *event_data)
-{
-    ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;
-    ESP_LOGI(MESH_TAG, "<IP_EVENT_STA_GOT_IP>IP:" IPSTR, IP2STR(&event->ip_info.ip));
-
-}
-
-
-static void test(void *pvParameters)
-{
-    esp_err_t err;
-    uint32_t u32BufferLenght = 1024U;
-    char buffer[1024U];
-    uint32_t u32BytesRead = 0;
-    char pcRemoteVersionNumber[12];
-
-    ESP_LOGI(MESH_TAG, "Hello World");
-    const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
-    ESP_LOGI(MESH_TAG, "Type: %d",  (*currentPartition).subtype);
-    ESP_LOGI(MESH_TAG, "Start address: %d",  (*currentPartition).address);
-    ESP_LOGI(MESH_TAG, "Size: %d",  (*currentPartition).size);
-    ESP_LOGI(MESH_TAG, "Encrypted: %d",  (*currentPartition).encrypted);
-
-    esp_app_desc_t curPartitionDesc;
-    err = esp_ota_get_partition_description(currentPartition, &curPartitionDesc);
-    ESP_ERROR_CHECK(err);
-    ESP_LOGI(MESH_TAG, "currentPartition project_name: %s",  (curPartitionDesc).project_name);
-    ESP_LOGI(MESH_TAG, "currentPartition version: %s",  (curPartitionDesc).version);
-    ESP_LOGI(MESH_TAG, "currentPartition Timestamp: %s %s",  (curPartitionDesc).date, (curPartitionDesc).time);
-
-    https_clientInitialize();
-
-    https_clientRetrieveData(buffer, &u32BufferLenght, &u32BytesRead);
-
-    ESP_LOGI(MESH_TAG, "Data received: %i", u32BytesRead);
-    
-    err = errExtractVersionNumber(buffer, &u32BytesRead, pcRemoteVersionNumber);
-
-    if(err == ESP_OK)
-    {
-         if(bNewerVersion((curPartitionDesc).version, pcRemoteVersionNumber))
-         {
-        ESP_LOGI(MESH_TAG, "Newer Version available");
-            //write ota
-        
-            const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
-            const esp_partition_t * otaPartition =  esp_ota_get_next_update_partition(currentPartition);
-        
-        static esp_ota_handle_t otaHandle;
-            uint32_t u32StartOffset = 305; //TODO fix this
-            
-            /*
-          //esp_err_t err = errFindImageStart(pu8Data, pu32DataLenght, &u32StartOffset);
-            esp_err_t err = errFindImageStart(buffer, &u32BufferLenght, &u32StartOffset);
-        
-            
-            if(err != ESP_OK)
-            {
-                ESP_LOGI(MESH_TAG, "errFindImageStart failed: %i", err);
-            }
-            */
-                        
-            ESP_LOGI(MESH_TAG, "first byte offset: %i", u32StartOffset);
-            ESP_LOGI(MESH_TAG, "first byte: %x", buffer[u32StartOffset]);
-            
-                    
-            err = esp_ota_begin(otaPartition, OTA_SIZE_UNKNOWN, &otaHandle);
-        ESP_ERROR_CHECK(err);
-            /*
-            bool stop = false;
-            
-            while(stop == false)
-            {
-                https_clientRetrieveData(buffer, &u32BufferLenght, &u32BytesRead);  
-                ESP_LOGI(MESH_TAG, "OTA-Data written: %i", u32BytesRead);  
-                if(u32BytesRead == 0)
-                {
-                    stop = true; 
-                }
-            }
-
-            ESP_LOGI(MESH_TAG, "END");  
-            
-    */
-            
-            do {
-                
-            ESP_LOGI(MESH_TAG, "OTA-Data written: %i", u32BytesRead);
-            err = esp_ota_write(otaHandle, (const void*) buffer+u32StartOffset, (u32BytesRead-u32StartOffset));
-            u32StartOffset = 0U;
-            
-            https_clientRetrieveData(buffer, &u32BufferLenght, &u32BytesRead);
-                
-            } while (u32BytesRead > 0);
-            
-            err = esp_ota_end(otaHandle);
-            ESP_ERROR_CHECK(err);
-            
-            esp_app_desc_t otaPartitionDesc;
-            err = esp_ota_get_partition_description(otaPartition, &otaPartitionDesc);
-            ESP_ERROR_CHECK(err);
-            ESP_LOGI(MESH_TAG, "otaPartition project_name: %s",  (otaPartitionDesc).project_name);
-
-            err = esp_ota_set_boot_partition(otaPartition);
-            ESP_ERROR_CHECK(err);
-
-            //esp_restart();
-    
-         }
-         else
-         {
-           ESP_LOGI(MESH_TAG, "NO newer Version available");  
-         }
-         
-    }
-    else
-    {
-        ESP_LOGI(MESH_TAG, "errExtractVersionNumber failed: %i", err);
-    }
-
-    https_clientDeinitialize();
-
-    while(1)
-    {
-        vTaskDelay(1000 / portTICK_PERIOD_MS);
-    }
-}
-
-
-void app_main(void)
-{
-        
-/*
-    err = nvs_flash_erase();
-    if(err != ESP_OK){
-        ESP_LOGI(MESH_TAG, "Error: %x", err);
-        while(1){
-
-        }
-    }
-    */
-
-    ESP_ERROR_CHECK(nvs_flash_init());
-
-    /*  tcpip initialization */
-    ESP_ERROR_CHECK(esp_netif_init());
-
-    /*  event initialization */
-    ESP_ERROR_CHECK(esp_event_loop_create_default());
-
-    /*  create network interfaces for mesh (only station instance saved for further manipulation, soft AP instance ignored */
-    ESP_ERROR_CHECK(esp_netif_create_default_wifi_mesh_netifs(&netif_sta, NULL));
-
-    /*  wifi initialization */
-    wifi_init_config_t config = WIFI_INIT_CONFIG_DEFAULT();
-    ESP_ERROR_CHECK(esp_wifi_init(&config));
-    ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &ip_event_handler, NULL));
-    ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_FLASH));
-    ESP_ERROR_CHECK(esp_wifi_start());
-
-    /*  mesh initialization */
-    ESP_ERROR_CHECK(esp_mesh_init());
-    ESP_ERROR_CHECK(esp_event_handler_register(MESH_EVENT, ESP_EVENT_ANY_ID, &mesh_event_handler, NULL));
-
-    /*  set mesh topology */
-    ESP_ERROR_CHECK(esp_mesh_set_topology(CONFIG_MESH_TOPOLOGY));
-
-    /*  set mesh max layer according to the topology */
-    ESP_ERROR_CHECK(esp_mesh_set_max_layer(CONFIG_MESH_MAX_LAYER));
-    ESP_ERROR_CHECK(esp_mesh_set_vote_percentage(1));
-    ESP_ERROR_CHECK(esp_mesh_set_xon_qsize(128));
-
-    /* Disable mesh PS function */
-    ESP_ERROR_CHECK(esp_mesh_disable_ps());
-    ESP_ERROR_CHECK(esp_mesh_set_ap_assoc_expire(10));
-
-    mesh_cfg_t cfg = MESH_INIT_CONFIG_DEFAULT();
-
-    /* mesh ID */
-    memcpy((uint8_t *) &cfg.mesh_id, MESH_ID, 6);
-
-    /* router */
-    cfg.channel = CONFIG_MESH_CHANNEL;
-    cfg.router.ssid_len = strlen(CONFIG_MESH_ROUTER_SSID);
-    memcpy((uint8_t *) &cfg.router.ssid, CONFIG_MESH_ROUTER_SSID, cfg.router.ssid_len);
-    memcpy((uint8_t *) &cfg.router.password, CONFIG_MESH_ROUTER_PASSWD,
-           strlen(CONFIG_MESH_ROUTER_PASSWD));
-
-    /* mesh softAP */
-    ESP_ERROR_CHECK(esp_mesh_set_ap_authmode(CONFIG_MESH_AP_AUTHMODE));
-    cfg.mesh_ap.max_connection = CONFIG_MESH_AP_CONNECTIONS;
-    memcpy((uint8_t *) &cfg.mesh_ap.password, CONFIG_MESH_AP_PASSWD,
-           strlen(CONFIG_MESH_AP_PASSWD));
-    ESP_ERROR_CHECK(esp_mesh_set_config(&cfg));
-
-    ESP_ERROR_CHECK(esp_base_mac_addr_get(ownMAC));
-
-    ESP_LOGI(MESH_TAG, "Own MAC: \"0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\" ", ownMAC[0], ownMAC[1], ownMAC[2], ownMAC[3], ownMAC[4], ownMAC[5]);
-
-    /* mesh start */
-    ESP_ERROR_CHECK(esp_mesh_start());
-
-    ESP_LOGI(MESH_TAG, "mesh starts successfully, heap:%d, %s<%d>%s, ps:%d\n",  esp_get_minimum_free_heap_size(),
-             esp_mesh_is_root_fixed() ? "root fixed" : "root not fixed",
-             esp_mesh_get_topology(), esp_mesh_get_topology() ? "(chain)":"(tree)", esp_mesh_is_ps_enabled());
-
-    
-        for(;;) {
-            if(gpio_get_level(0) == 0){
-                break;
-            }
-            vTaskDelay(1000 / portTICK_PERIOD_MS);
-    }
-
-      xTaskCreate(&test, "test_task", 8192, NULL, 5, NULL);
-
-}
-
-

main/main.c.orig

@@ -1,699 +0,0 @@
-
-#include <string.h>
-#include "esp_wifi.h"
-#include "esp_system.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "esp_mesh.h"
-#include "esp_mesh_internal.h"
-#include "nvs_flash.h"
-#include "driver/gpio.h"
-#include "esp_ota_ops.h"
-#include "esp_partition.h"
-
-#include "mesh_ota.h"
-
-
-#define RX_SIZE          (1234)
-#define TX_SIZE          (1234)
-
-static const char *MESH_TAG = "mesh_main";
-static const uint8_t MESH_ID[6] = { 0x77, 0x77, 0x77, 0x77, 0x77, 0x77};
-static uint8_t tx_buf[TX_SIZE] = { 0, };
-static uint8_t rx_buf[RX_SIZE] = { 0, };
-static bool is_mesh_connected = false;
-static mesh_addr_t mesh_parent_addr;
-static uint8_t ownMAC[6];
-static int mesh_layer = -1;
-static esp_netif_t *netif_sta = NULL;
-
-struct ota_mesh_packet
-{
-    enum ota_mesh_packet_type
-    {
-        APP_Version_Request,
-        APP_Version_Response,
-        OTA_Data,
-        OTA_ACK,
-        OTA_Complete
-    } type;
-
-    uint8_t au8Payload[1024];
-};
-
-/*******************************************************
- *                Function Declarations
- *******************************************************/
-
-esp_err_t esp_mesh_send_packet(mesh_addr_t* dest, struct ota_mesh_packet* packet);
-
-/*******************************************************
- *                Function Definitions
- *******************************************************/
-
-esp_err_t esp_mesh_ota_send(mesh_addr_t* dest)
-{
-    esp_err_t err = ESP_OK;
-
-    static uint32_t u32index;
-
-    const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
-
-    if((*currentPartition).subtype == 0)
-        {
-
-            int data_read = 0;
-
-            struct ota_mesh_packet packet;
-            packet.type=OTA_Data;
-
-            if(u32index == 1024)
-                {
-                    //all data read
-                    data_read = 0;
-                    u32index = 0;
-                }
-            else
-                {
-                    ESP_LOGI(MESH_TAG, "OTA-Data read: %i", u32index);
-                    err =  esp_partition_read(currentPartition, (1024*u32index), packet.au8Payload, 1024 );
-                    ESP_ERROR_CHECK(err);
-                    data_read = 1024;
-                    u32index++;
-                }
-
-            if (data_read > 0)
-                {
-                    //send ota fragemnt to node
-                    esp_mesh_send_packet(dest, &packet);
-                }
-
-            ESP_ERROR_CHECK(err);
-        }
-    else
-        {
-            ESP_LOGI(MESH_TAG, "Subtype: %d",  (*currentPartition).subtype);
-        }
-    return err;
-}
-
-esp_err_t esp_mesh_ota_receive(mesh_addr_t* dest, struct ota_mesh_packet* packet)
-{
-    esp_err_t err = ESP_OK;
-    static esp_ota_handle_t otaHandle;
-    static uint32_t u32index;
-
-    const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
-    const esp_partition_t * otaPartition =  esp_ota_get_next_update_partition(currentPartition);
-
-    if(u32index == 0)
-        {
-            //first run
-
-            err = esp_ota_begin(otaPartition, OTA_SIZE_UNKNOWN, &otaHandle);
-            ESP_ERROR_CHECK(err);
-        }
-
-    ESP_LOGI(MESH_TAG, "OTA-Data write: %i", u32index);
-    err = esp_ota_write(otaHandle, packet->au8Payload, 1024);
-
-    if(err != ESP_OK)
-        {
-            ESP_LOGE(MESH_TAG, "OTA-Data write error: %i at %i", err, u32index);
-        }
-
-    ESP_ERROR_CHECK(err);
-
-
-
-    if(u32index >= 1023)
-        {
-            //ota update complete
-
-            ESP_LOGI(MESH_TAG, "OTA-Data complete arrived: %i", u32index);
-            err = esp_ota_end(otaHandle);
-            ESP_ERROR_CHECK(err);
-            esp_app_desc_t otaPartitionDesc;
-            err = esp_ota_get_partition_description(otaPartition, &otaPartitionDesc);
-            ESP_ERROR_CHECK(err);
-            ESP_LOGI(MESH_TAG, "otaPartition project_name: %s",  (otaPartitionDesc).project_name);
-
-            err = esp_ota_set_boot_partition(otaPartition);
-            ESP_ERROR_CHECK(err);
-
-            struct ota_mesh_packet retPacket;
-            retPacket.type=OTA_Complete;
-            ESP_ERROR_CHECK (esp_mesh_send_packet(dest, &retPacket)); //send back to parent
-
-            //check if this node has children --> Update them
-
-            esp_restart();
-        }
-
-    u32index++;
-
-
-    return err;
-}
-
-//returns true if MAC address is equal
-bool esp_mesh_check_MAC_Equality(uint8_t* aMAC,  uint8_t* bMAC)
-{
-    for (uint8_t index = 0; index < 6; index++)
-        {
-            if(aMAC[index] != bMAC[index])
-                {
-                    return false;
-                }
-        }
-    return true;
-}
-
-esp_err_t esp_mesh_get_Children(mesh_addr_t children[], uint16_t* pu16ChildrenSize)
-{
-    *pu16ChildrenSize = 0;
-    mesh_addr_t route_table[CONFIG_MESH_ROUTE_TABLE_SIZE];
-    int route_table_size = 0;
-    esp_mesh_get_routing_table((mesh_addr_t *) &route_table, CONFIG_MESH_ROUTE_TABLE_SIZE * 6, &route_table_size);
-    for(uint16_t index = 0; index < esp_mesh_get_routing_table_size(); index++)
-        {
-            if(!    (esp_mesh_check_MAC_Equality(ownMAC, route_table[index].addr))  )
-                {
-                    //child node
-                    // ESP_LOGI(MESH_TAG, "adding Node: \"0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\" ", route_table[index].addr[0], route_table[index].addr[1], route_table[index].addr[2], route_table[index].addr[3], route_table[index].addr[4], route_table[index].addr[5]);
-                    children[*pu16ChildrenSize] = route_table[index];
-                    *pu16ChildrenSize = (*pu16ChildrenSize)+1;
-                }
-        }
-    return ESP_OK;
-}
-
-
-esp_err_t esp_mesh_send_packet(mesh_addr_t* dest, struct ota_mesh_packet* packet)
-{
-    esp_err_t err;
-    mesh_data_t data;
-    data.data = tx_buf;
-    data.size = sizeof(tx_buf);
-    data.proto = MESH_PROTO_BIN;
-    data.tos = MESH_TOS_P2P;
-
-    memcpy(tx_buf, (uint8_t *)packet, sizeof(struct ota_mesh_packet));
-
-    err = esp_mesh_send(dest, &data, MESH_DATA_P2P, NULL, 0);
-
-    return err;
-}
-
-void esp_mesh_p2p_rx_main(void *arg)
-{
-    esp_err_t err;
-    mesh_addr_t from;
-    mesh_data_t data;
-    int flag = 0;
-    data.data = rx_buf;
-    data.size = RX_SIZE;
-
-    while (true)
-        {
-            data.size = RX_SIZE;
-            err = esp_mesh_recv(&from, &data, portMAX_DELAY, &flag, NULL, 0);
-            if (err != ESP_OK || !data.size)
-                {
-                    ESP_LOGE(MESH_TAG, "err:0x%x, size:%d", err, data.size);
-                    continue;
-                }
-
-            struct ota_mesh_packet packet;
-            memcpy(&packet, (uint8_t *)rx_buf, sizeof(struct ota_mesh_packet));
-
-            switch (packet.type)
-                {
-                case APP_Version_Request:
-                    ESP_LOGI(MESH_TAG, "recv: APP_Version_Request");
-                    packet.type=APP_Version_Response;
-                    packet.au8Payload[0] = 42; //TODO get current running version
-                    ESP_ERROR_CHECK (esp_mesh_send_packet(&from, &packet)); //send back to parent
-                    break;
-                case APP_Version_Response:
-                    ESP_LOGI(MESH_TAG, "recv: APP_Version_Response - App Version %i: ", packet.au8Payload[0]);
-                    //check if node is out-dated
-                    esp_mesh_ota_send(&from);
-                    break;
-                case OTA_Data:
-                    ESP_LOGI(MESH_TAG, "recv: OTA_Data");
-                    esp_mesh_ota_receive(&from, &packet);
-                    packet.type=OTA_ACK;
-                    ESP_ERROR_CHECK (esp_mesh_send_packet(&from, &packet)); //send back to parent
-                    break;
-                case OTA_ACK:
-                    ESP_LOGI(MESH_TAG, "recv: OTA_ACK");
-                    esp_mesh_ota_send(&from);
-                    break;
-                case OTA_Complete:
-                    ESP_LOGI(MESH_TAG, "recv: OTA_Complete");
-                    break;
-                default:
-                    ESP_LOGE(MESH_TAG, "recv: something");
-                    break;
-                }
-
-        } //end while
-    vTaskDelete(NULL);
-}
-
-
-esp_err_t esp_mesh_comm_p2p_start(void)
-{
-    static bool is_comm_p2p_started = false;
-    if (!is_comm_p2p_started)
-        {
-            is_comm_p2p_started = true;
-            xTaskCreate(esp_mesh_p2p_rx_main, "MPRX", 7000, NULL, 5, NULL);
-        }
-    return ESP_OK;
-}
-
-void mesh_event_handler(void *arg, esp_event_base_t event_base,
-                        int32_t event_id, void *event_data)
-{
-    mesh_addr_t id = {0,};
-    static uint16_t last_layer = 0;
-
-    switch (event_id)
-        {
-        case MESH_EVENT_STARTED:
-        {
-            esp_mesh_get_id(&id);
-            ESP_LOGI(MESH_TAG, "<MESH_EVENT_MESH_STARTED>ID:"MACSTR"", MAC2STR(id.addr));
-is_mesh_connected = false;
-mesh_layer = esp_mesh_get_layer();
-}
-break;
-    case MESH_EVENT_STOPPED: {
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_STOPPED>");
-is_mesh_connected = false;
-mesh_layer = esp_mesh_get_layer();
-}
-break;
-    case MESH_EVENT_CHILD_CONNECTED: {
-mesh_event_child_connected_t *child_connected = (mesh_event_child_connected_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_CHILD_CONNECTED>aid:%d, "MACSTR"",
- child_connected->aid,
- MAC2STR(child_connected->mac));
-}
-break;
-    case MESH_EVENT_CHILD_DISCONNECTED: {
-mesh_event_child_disconnected_t *child_disconnected = (mesh_event_child_disconnected_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_CHILD_DISCONNECTED>aid:%d, "MACSTR"",
- child_disconnected->aid,
- MAC2STR(child_disconnected->mac));
-}
-break;
-    case MESH_EVENT_ROUTING_TABLE_ADD: {
-mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)event_data;
-ESP_LOGW(MESH_TAG, "<MESH_EVENT_ROUTING_TABLE_ADD>add %d, new:%d, layer:%d",
- routing_table->rt_size_change,
- routing_table->rt_size_new, mesh_layer);
-}
-break;
-    case MESH_EVENT_ROUTING_TABLE_REMOVE: {
-mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)event_data;
-ESP_LOGW(MESH_TAG, "<MESH_EVENT_ROUTING_TABLE_REMOVE>remove %d, new:%d, layer:%d",
- routing_table->rt_size_change,
- routing_table->rt_size_new, mesh_layer);
-}
-break;
-    case MESH_EVENT_NO_PARENT_FOUND: {
-mesh_event_no_parent_found_t *no_parent = (mesh_event_no_parent_found_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_NO_PARENT_FOUND>scan times:%d",
- no_parent->scan_times);
-}
-    /* TODO handler for the failure */
-break;
-    case MESH_EVENT_PARENT_CONNECTED: {
-mesh_event_connected_t *connected = (mesh_event_connected_t *)event_data;
-esp_mesh_get_id(&id);
-mesh_layer = connected->self_layer;
-memcpy(&mesh_parent_addr.addr, connected->connected.bssid, 6);
-ESP_LOGI(MESH_TAG,
- "<MESH_EVENT_PARENT_CONNECTED>layer:%d-->%d, parent:"MACSTR"%s, ID:"MACSTR", duty:%d",
- last_layer, mesh_layer, MAC2STR(mesh_parent_addr.addr),
- esp_mesh_is_root() ? "<ROOT>" :
- (mesh_layer == 2) ? "<layer2>" : "", MAC2STR(id.addr), connected->duty);
-last_layer = mesh_layer;
- //  mesh_connected_indicator(mesh_layer);
-is_mesh_connected = true;
-if (esp_mesh_is_root()) {
-esp_netif_dhcpc_start(netif_sta);
-}
-esp_mesh_comm_p2p_start();//start receiving
-}
-break;
-    case MESH_EVENT_PARENT_DISCONNECTED: {
-mesh_event_disconnected_t *disconnected = (mesh_event_disconnected_t *)event_data;
-ESP_LOGI(MESH_TAG,
- "<MESH_EVENT_PARENT_DISCONNECTED>reason:%d",
- disconnected->reason);
-is_mesh_connected = false;
-   // mesh_disconnected_indicator();
-mesh_layer = esp_mesh_get_layer();
-}
-break;
-    case MESH_EVENT_LAYER_CHANGE: {
-mesh_event_layer_change_t *layer_change = (mesh_event_layer_change_t *)event_data;
-mesh_layer = layer_change->new_layer;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_LAYER_CHANGE>layer:%d-->%d%s",
- last_layer, mesh_layer,
- esp_mesh_is_root() ? "<ROOT>" :
- (mesh_layer == 2) ? "<layer2>" : "");
-last_layer = mesh_layer;
-  //  mesh_connected_indicator(mesh_layer);
-}
-break;
-    case MESH_EVENT_ROOT_ADDRESS: {
-mesh_event_root_address_t *root_addr = (mesh_event_root_address_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_ROOT_ADDRESS>root address:"MACSTR"",
- MAC2STR(root_addr->addr));
-}
-break;
-    case MESH_EVENT_VOTE_STARTED: {
-mesh_event_vote_started_t *vote_started = (mesh_event_vote_started_t *)event_data;
-ESP_LOGI(MESH_TAG,
- "<MESH_EVENT_VOTE_STARTED>attempts:%d, reason:%d, rc_addr:"MACSTR"",
- vote_started->attempts,
- vote_started->reason,
- MAC2STR(vote_started->rc_addr.addr));
-}
-break;
-    case MESH_EVENT_VOTE_STOPPED: {
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_VOTE_STOPPED>");
-break;
-}
-    case MESH_EVENT_ROOT_SWITCH_REQ: {
-mesh_event_root_switch_req_t *switch_req = (mesh_event_root_switch_req_t *)event_data;
-ESP_LOGI(MESH_TAG,
- "<MESH_EVENT_ROOT_SWITCH_REQ>reason:%d, rc_addr:"MACSTR"",
- switch_req->reason,
- MAC2STR( switch_req->rc_addr.addr));
-}
-break;
-    case MESH_EVENT_ROOT_SWITCH_ACK: {
-/* new root */
-mesh_layer = esp_mesh_get_layer();
-esp_mesh_get_parent_bssid(&mesh_parent_addr);
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_ROOT_SWITCH_ACK>layer:%d, parent:"MACSTR"", mesh_layer, MAC2STR(mesh_parent_addr.addr));
-}
-break;
-    case MESH_EVENT_TODS_STATE: {
-mesh_event_toDS_state_t *toDs_state = (mesh_event_toDS_state_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_TODS_REACHABLE>state:%d", *toDs_state);
-}
-break;
-    case MESH_EVENT_ROOT_FIXED: {
-mesh_event_root_fixed_t *root_fixed = (mesh_event_root_fixed_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_ROOT_FIXED>%s",
- root_fixed->is_fixed ? "fixed" : "not fixed");
-}
-break;
-    case MESH_EVENT_ROOT_ASKED_YIELD: {
-mesh_event_root_conflict_t *root_conflict = (mesh_event_root_conflict_t *)event_data;
-ESP_LOGI(MESH_TAG,
- "<MESH_EVENT_ROOT_ASKED_YIELD>"MACSTR", rssi:%d, capacity:%d",
- MAC2STR(root_conflict->addr),
- root_conflict->rssi,
- root_conflict->capacity);
-}
-break;
-    case MESH_EVENT_CHANNEL_SWITCH: {
-mesh_event_channel_switch_t *channel_switch = (mesh_event_channel_switch_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_CHANNEL_SWITCH>new channel:%d", channel_switch->channel);
-}
-break;
-    case MESH_EVENT_SCAN_DONE: {
-mesh_event_scan_done_t *scan_done = (mesh_event_scan_done_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_SCAN_DONE>number:%d",
- scan_done->number);
-}
-break;
-    case MESH_EVENT_NETWORK_STATE: {
-mesh_event_network_state_t *network_state = (mesh_event_network_state_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_NETWORK_STATE>is_rootless:%d",
- network_state->is_rootless);
-}
-break;
-    case MESH_EVENT_STOP_RECONNECTION: {
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_STOP_RECONNECTION>");
-}
-break;
-    case MESH_EVENT_FIND_NETWORK: {
-mesh_event_find_network_t *find_network = (mesh_event_find_network_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_FIND_NETWORK>new channel:%d, router BSSID:"MACSTR"",
- find_network->channel, MAC2STR(find_network->router_bssid));
-}
-break;
-    case MESH_EVENT_ROUTER_SWITCH: {
-mesh_event_router_switch_t *router_switch = (mesh_event_router_switch_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_ROUTER_SWITCH>new router:%s, channel:%d, "MACSTR"",
- router_switch->ssid, router_switch->channel, MAC2STR(router_switch->bssid));
-}
-break;
-    case MESH_EVENT_PS_PARENT_DUTY: {
-mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_PS_PARENT_DUTY>duty:%d", ps_duty->duty);
-}
-break;
-    case MESH_EVENT_PS_CHILD_DUTY: {
-mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)event_data;
-ESP_LOGI(MESH_TAG, "<MESH_EVENT_PS_CHILD_DUTY>cidx:%d, "MACSTR", duty:%d", ps_duty->child_connected.aid-1,
-MAC2STR(ps_duty->child_connected.mac), ps_duty->duty);
-}
-break;
-    default:
-        ESP_LOGI(MESH_TAG, "unknown id:%d", event_id);
-        break;
-    }
-}
-
-void ip_event_handler(void *arg, esp_event_base_t event_base,
-                      int32_t event_id, void *event_data)
-{
-    ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;
-    ESP_LOGI(MESH_TAG, "<IP_EVENT_STA_GOT_IP>IP:" IPSTR, IP2STR(&event->ip_info.ip));
-
-}
-
-
-static void test(void *pvParameters)
-{
-    esp_err_t err;
-    uint32_t u32BufferLenght = 1024U;
-    char buffer[1024U];
-    uint32_t u32BytesRead = 0;
-    char pcRemoteVersionNumber[12];
-
-    ESP_LOGI(MESH_TAG, "Hello World");
-    const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
-    ESP_LOGI(MESH_TAG, "Type: %d",  (*currentPartition).subtype);
-    ESP_LOGI(MESH_TAG, "Start address: %d",  (*currentPartition).address);
-    ESP_LOGI(MESH_TAG, "Size: %d",  (*currentPartition).size);
-    ESP_LOGI(MESH_TAG, "Encrypted: %d",  (*currentPartition).encrypted);
-
-    esp_app_desc_t curPartitionDesc;
-    err = esp_ota_get_partition_description(currentPartition, &curPartitionDesc);
-    ESP_ERROR_CHECK(err);
-    ESP_LOGI(MESH_TAG, "currentPartition project_name: %s",  (curPartitionDesc).project_name);
-    ESP_LOGI(MESH_TAG, "currentPartition version: %s",  (curPartitionDesc).version);
-    ESP_LOGI(MESH_TAG, "currentPartition Timestamp: %s %s",  (curPartitionDesc).date, (curPartitionDesc).time);
-
-    https_clientInitialize();
-
-    https_clientRetrieveData(buffer, &u32BufferLenght, &u32BytesRead);
-
-    ESP_LOGI(MESH_TAG, "Data received: %i", u32BytesRead);
-    
-    err = errExtractVersionNumber(buffer, &u32BytesRead, pcRemoteVersionNumber);
-
-    if(err == ESP_OK)
-    {
-         if(bNewerVersion((curPartitionDesc).version, pcRemoteVersionNumber))
-         {
-        ESP_LOGI(MESH_TAG, "Newer Version available");
-            //write ota
-        
-            const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
-            const esp_partition_t * otaPartition =  esp_ota_get_next_update_partition(currentPartition);
-        
-            static esp_ota_handle_t otaHandle;
-            uint32_t u32StartOffset = 305; //TODO fix this
-            
-            /*
-          //esp_err_t err = errFindImageStart(pu8Data, pu32DataLenght, &u32StartOffset);
-            esp_err_t err = errFindImageStart(buffer, &u32BufferLenght, &u32StartOffset);
-        
-            
-            if(err != ESP_OK)
-            {
-                ESP_LOGI(MESH_TAG, "errFindImageStart failed: %i", err);
-            }
-            */
-                        
-            ESP_LOGI(MESH_TAG, "first byte offset: %i", u32StartOffset);
-            ESP_LOGI(MESH_TAG, "first byte: %x", buffer[u32StartOffset]);
-            
-                    
-            err = esp_ota_begin(otaPartition, OTA_SIZE_UNKNOWN, &otaHandle);
-            ESP_ERROR_CHECK(err);
-            
-            bool stop = false;
-            
-            while(stop == false )
-            {
-             https_clientRetrieveData(buffer, &u32BufferLenght, &u32BytesRead);  
-             ESP_LOGI(MESH_TAG, "OTA-Data written: %i", u32BytesRead);  
-             
-             
-             if(u32BytesRead == 0)
-             {
-                stop = true; 
-             }
-             
-            }
-
-            ESP_LOGI(MESH_TAG, "END");  
-            
-    /*
-            
-            do {
-                
-            ESP_LOGI(MESH_TAG, "OTA-Data written: %i", u32BytesRead);
-            err = esp_ota_write(otaHandle, (const void*) buffer+u32StartOffset, (u32BytesRead-u32StartOffset));
-            u32StartOffset = 0U;
-            
-            https_clientRetrieveData(buffer, &u32BufferLenght, &u32BytesRead);
-                
-            } while (u32BytesRead > 0);
-            
-            err = esp_ota_end(otaHandle);
-            ESP_ERROR_CHECK(err);
-            
-            esp_app_desc_t otaPartitionDesc;
-            err = esp_ota_get_partition_description(otaPartition, &otaPartitionDesc);
-            ESP_ERROR_CHECK(err);
-            ESP_LOGI(MESH_TAG, "otaPartition project_name: %s",  (otaPartitionDesc).project_name);
-
-            err = esp_ota_set_boot_partition(otaPartition);
-            ESP_ERROR_CHECK(err);
-
-            //esp_restart();
-    */
-         }
-         else
-         {
-           ESP_LOGI(MESH_TAG, "NO newer Version available");  
-         }
-    }
-    else
-    {
-        ESP_LOGI(MESH_TAG, "errExtractVersionNumber failed: %i", err);
-    }
-
-    https_clientDeinitialize();
-
-    while(1)
-    {
-        vTaskDelay(1000 / portTICK_PERIOD_MS);
-    }
-}
-
-
-void app_main(void)
-{
-        
-/*
-    err = nvs_flash_erase();
-    if(err != ESP_OK){
-        ESP_LOGI(MESH_TAG, "Error: %x", err);
-        while(1){
-
-        }
-    }
-    */
-
-    ESP_ERROR_CHECK(nvs_flash_init());
-
-    /*  tcpip initialization */
-    ESP_ERROR_CHECK(esp_netif_init());
-
-    /*  event initialization */
-    ESP_ERROR_CHECK(esp_event_loop_create_default());
-
-    /*  create network interfaces for mesh (only station instance saved for further manipulation, soft AP instance ignored */
-    ESP_ERROR_CHECK(esp_netif_create_default_wifi_mesh_netifs(&netif_sta, NULL));
-
-    /*  wifi initialization */
-    wifi_init_config_t config = WIFI_INIT_CONFIG_DEFAULT();
-    ESP_ERROR_CHECK(esp_wifi_init(&config));
-    ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &ip_event_handler, NULL));
-    ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_FLASH));
-    ESP_ERROR_CHECK(esp_wifi_start());
-
-    /*  mesh initialization */
-    ESP_ERROR_CHECK(esp_mesh_init());
-    ESP_ERROR_CHECK(esp_event_handler_register(MESH_EVENT, ESP_EVENT_ANY_ID, &mesh_event_handler, NULL));
-
-    /*  set mesh topology */
-    ESP_ERROR_CHECK(esp_mesh_set_topology(CONFIG_MESH_TOPOLOGY));
-
-    /*  set mesh max layer according to the topology */
-    ESP_ERROR_CHECK(esp_mesh_set_max_layer(CONFIG_MESH_MAX_LAYER));
-    ESP_ERROR_CHECK(esp_mesh_set_vote_percentage(1));
-    ESP_ERROR_CHECK(esp_mesh_set_xon_qsize(128));
-
-    /* Disable mesh PS function */
-    ESP_ERROR_CHECK(esp_mesh_disable_ps());
-    ESP_ERROR_CHECK(esp_mesh_set_ap_assoc_expire(10));
-
-    mesh_cfg_t cfg = MESH_INIT_CONFIG_DEFAULT();
-
-    /* mesh ID */
-    memcpy((uint8_t *) &cfg.mesh_id, MESH_ID, 6);
-
-    /* router */
-    cfg.channel = CONFIG_MESH_CHANNEL;
-    cfg.router.ssid_len = strlen(CONFIG_MESH_ROUTER_SSID);
-    memcpy((uint8_t *) &cfg.router.ssid, CONFIG_MESH_ROUTER_SSID, cfg.router.ssid_len);
-    memcpy((uint8_t *) &cfg.router.password, CONFIG_MESH_ROUTER_PASSWD,
-           strlen(CONFIG_MESH_ROUTER_PASSWD));
-
-    /* mesh softAP */
-    ESP_ERROR_CHECK(esp_mesh_set_ap_authmode(CONFIG_MESH_AP_AUTHMODE));
-    cfg.mesh_ap.max_connection = CONFIG_MESH_AP_CONNECTIONS;
-    memcpy((uint8_t *) &cfg.mesh_ap.password, CONFIG_MESH_AP_PASSWD,
-           strlen(CONFIG_MESH_AP_PASSWD));
-    ESP_ERROR_CHECK(esp_mesh_set_config(&cfg));
-
-    ESP_ERROR_CHECK(esp_base_mac_addr_get(ownMAC));
-
-    ESP_LOGI(MESH_TAG, "Own MAC: \"0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\" ", ownMAC[0], ownMAC[1], ownMAC[2], ownMAC[3], ownMAC[4], ownMAC[5]);
-
-    /* mesh start */
-    ESP_ERROR_CHECK(esp_mesh_start());
-
-    ESP_LOGI(MESH_TAG, "mesh starts successfully, heap:%d, %s<%d>%s, ps:%d\n",  esp_get_minimum_free_heap_size(),
-             esp_mesh_is_root_fixed() ? "root fixed" : "root not fixed",
-             esp_mesh_get_topology(), esp_mesh_get_topology() ? "(chain)":"(tree)", esp_mesh_is_ps_enabled());
-
-    
-        for(;;) {
-            if(gpio_get_level(0) == 0){
-                break;
-            }
-            vTaskDelay(1000 / portTICK_PERIOD_MS);
-    }
-
-      xTaskCreate(&test, "test_task", 8192, NULL, 5, NULL);
-
-}
-
-

sdkconfig

@@ -32,7 +32,7 @@ CONFIG_APP_COMPILE_TIME_DATE=y
 # CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
 # CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
 CONFIG_APP_PROJECT_VER_FROM_CONFIG=y
-CONFIG_APP_PROJECT_VER="0.0.0"
+CONFIG_APP_PROJECT_VER="0.0.1"
 CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
 # end of Application manager
 
@@ -67,11 +67,12 @@ CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
 #
 # Security features
 #
+CONFIG_SECURE_SIGNED_ON_BOOT=y
 CONFIG_SECURE_SIGNED_ON_UPDATE=y
 CONFIG_SECURE_SIGNED_APPS=y
 CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT=y
 CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME=y
-# CONFIG_SECURE_SIGNED_ON_BOOT_NO_SECURE_BOOT is not set
+CONFIG_SECURE_SIGNED_ON_BOOT_NO_SECURE_BOOT=y
 CONFIG_SECURE_SIGNED_ON_UPDATE_NO_SECURE_BOOT=y
 # CONFIG_SECURE_BOOT is not set
 CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES=y
@@ -127,7 +128,7 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_OFFSET=0x8000
+CONFIG_PARTITION_TABLE_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
 
@@ -149,6 +150,7 @@ CONFIG_MESH_PS_NETWORK_DUTY_APPLIED_ENTIRE=y
 CONFIG_MESH_PS_NWK_DUTY_RULE=0
 CONFIG_MESH_MAX_LAYER=6
 CONFIG_MESH_CHANNEL=13
+CONFIG_MESH_ID="00, 00, 00, 00, 00, 00"
 CONFIG_MESH_ROUTER_SSID="labNet"
 CONFIG_MESH_ROUTER_PASSWD="12345678"
 CONFIG_WIFI_AUTH_WPA2_PSK=y
@@ -157,9 +159,10 @@ CONFIG_MESH_AP_AUTHMODE=3
 CONFIG_MESH_AP_PASSWD="qaws1234"
 CONFIG_MESH_AP_CONNECTIONS=6
 CONFIG_MESH_ROUTE_TABLE_SIZE=50
+CONFIG_MESH_MESSAGE_SIZE=1500
 CONFIG_OTA_HTTPS_SERVER_COMMON_NAME="ota.hendrikschutter.com"
 CONFIG_OTA_HTTPS_SERVER_PORT="443"
-CONFIG_OTA_HTTPS_URL="https://ota.hendrikschutter.com/hello-world.bin"
+CONFIG_OTA_HTTPS_URL="https://ota.hendrikschutter.com/mesh_ota.bin"
 CONFIG_OTA_HTTPS_AUTH="b3RhOnB3"
 # end of Mesh OTA Configuration
 
@@ -361,6 +364,7 @@ CONFIG_ESP_CONSOLE_UART_DEFAULT=y
 # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_NONE is not set
 CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_MULTIPLE_UART=y
 CONFIG_ESP_CONSOLE_UART_NUM=0
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
@@ -604,7 +608,8 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
 CONFIG_FREERTOS_ISR_STACKSIZE=1536
 # CONFIG_FREERTOS_LEGACY_HOOKS is not set
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
-# CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION is not set
+CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
+# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
 CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
@@ -701,7 +706,6 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 #
 # TCP
 #
-CONFIG_LWIP_TCP_ISN_HOOK=y
 CONFIG_LWIP_MAX_ACTIVE_TCP=16
 CONFIG_LWIP_MAX_LISTENING_TCP=16
 CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
@@ -729,6 +733,14 @@ CONFIG_LWIP_MAX_UDP_PCBS=16
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=6
 # end of UDP
 
+#
+# Checksums
+#
+# CONFIG_LWIP_CHECKSUM_CHECK_IP is not set
+# CONFIG_LWIP_CHECKSUM_CHECK_UDP is not set
+CONFIG_LWIP_CHECKSUM_CHECK_ICMP=y
+# end of Checksums
+
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
@@ -761,6 +773,20 @@ CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
+#
+# Hooks
+#
+# CONFIG_LWIP_HOOK_TCP_ISN_NONE is not set
+CONFIG_LWIP_HOOK_TCP_ISN_DEFAULT=y
+# CONFIG_LWIP_HOOK_TCP_ISN_CUSTOM is not set
+CONFIG_LWIP_HOOK_IP6_ROUTE_NONE=y
+# CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT is not set
+# CONFIG_LWIP_HOOK_IP6_ROUTE_CUSTOM is not set
+CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y
+# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set
+# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set
+# end of Hooks
+
 #
 # Debug
 #
@@ -771,8 +797,10 @@ CONFIG_LWIP_ESP_LWIP_ASSERT=y
 # CONFIG_LWIP_SOCKETS_DEBUG is not set
 # CONFIG_LWIP_IP_DEBUG is not set
 # CONFIG_LWIP_ICMP_DEBUG is not set
+# CONFIG_LWIP_DHCP_DEBUG is not set
 # CONFIG_LWIP_IP6_DEBUG is not set
 # CONFIG_LWIP_ICMP6_DEBUG is not set
+# CONFIG_LWIP_TCP_DEBUG is not set
 # end of Debug
 # end of LWIP
 
@@ -1081,6 +1109,7 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # CONFIG_WPA_DEBUG_PRINT is not set
 # CONFIG_WPA_TESTING_OPTIONS is not set
 # CONFIG_WPA_WPS_WARS is not set
+# CONFIG_WPA_11KV_SUPPORT is not set
 # end of Supplicant
 # end of Component config
 
@@ -1203,7 +1232,7 @@ CONFIG_MB_EVENT_QUEUE_TIMEOUT=20
 CONFIG_MB_TIMER_PORT_ENABLED=y
 CONFIG_MB_TIMER_GROUP=0
 CONFIG_MB_TIMER_INDEX=0
-# CONFIG_SUPPORT_STATIC_ALLOCATION is not set
+# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
 CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10

test/sdkconfig

@@ -321,6 +321,7 @@ CONFIG_ESP_CONSOLE_UART_DEFAULT=y
 # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_NONE is not set
 CONFIG_ESP_CONSOLE_UART=y
+CONFIG_ESP_CONSOLE_MULTIPLE_UART=y
 CONFIG_ESP_CONSOLE_UART_NUM=0
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
@@ -560,7 +561,8 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
 CONFIG_FREERTOS_ISR_STACKSIZE=1536
 # CONFIG_FREERTOS_LEGACY_HOOKS is not set
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
-# CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION is not set
+CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
+# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
 CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
@@ -657,7 +659,6 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 #
 # TCP
 #
-CONFIG_LWIP_TCP_ISN_HOOK=y
 CONFIG_LWIP_MAX_ACTIVE_TCP=16
 CONFIG_LWIP_MAX_LISTENING_TCP=16
 CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
@@ -685,6 +686,14 @@ CONFIG_LWIP_MAX_UDP_PCBS=16
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=6
 # end of UDP
 
+#
+# Checksums
+#
+# CONFIG_LWIP_CHECKSUM_CHECK_IP is not set
+# CONFIG_LWIP_CHECKSUM_CHECK_UDP is not set
+CONFIG_LWIP_CHECKSUM_CHECK_ICMP=y
+# end of Checksums
+
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
@@ -717,6 +726,20 @@ CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
+#
+# Hooks
+#
+# CONFIG_LWIP_HOOK_TCP_ISN_NONE is not set
+CONFIG_LWIP_HOOK_TCP_ISN_DEFAULT=y
+# CONFIG_LWIP_HOOK_TCP_ISN_CUSTOM is not set
+CONFIG_LWIP_HOOK_IP6_ROUTE_NONE=y
+# CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT is not set
+# CONFIG_LWIP_HOOK_IP6_ROUTE_CUSTOM is not set
+CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y
+# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set
+# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set
+# end of Hooks
+
 #
 # Debug
 #
@@ -727,8 +750,10 @@ CONFIG_LWIP_ESP_LWIP_ASSERT=y
 # CONFIG_LWIP_SOCKETS_DEBUG is not set
 # CONFIG_LWIP_IP_DEBUG is not set
 # CONFIG_LWIP_ICMP_DEBUG is not set
+# CONFIG_LWIP_DHCP_DEBUG is not set
 # CONFIG_LWIP_IP6_DEBUG is not set
 # CONFIG_LWIP_ICMP6_DEBUG is not set
+# CONFIG_LWIP_TCP_DEBUG is not set
 # end of Debug
 # end of LWIP
 
@@ -1037,6 +1062,7 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
 # CONFIG_WPA_DEBUG_PRINT is not set
 # CONFIG_WPA_TESTING_OPTIONS is not set
 # CONFIG_WPA_WPS_WARS is not set
+# CONFIG_WPA_11KV_SUPPORT is not set
 # end of Supplicant
 # end of Component config
 
@@ -1155,7 +1181,7 @@ CONFIG_MB_EVENT_QUEUE_TIMEOUT=20
 CONFIG_MB_TIMER_PORT_ENABLED=y
 CONFIG_MB_TIMER_GROUP=0
 CONFIG_MB_TIMER_INDEX=0
-# CONFIG_SUPPORT_STATIC_ALLOCATION is not set
+# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
 CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10