.gitignore

@@ -57,3 +57,6 @@ build/
 test/build/
 
 *.old
+
+*.orig
+

components/mesh_ota/CMakeLists.txt

@@ -1,4 +1,4 @@
-idf_component_register(SRCS "Mesh_network_handler.c" "Mesh_network.c" "Mesh_OTA.c"
+idf_component_register(SRCS "Mesh_OTA_Util.c" "Mesh_Network.c" "Mesh_Network_Handler.c" "HTTPS_Client.c" "Mesh_OTA_Partition_Access.c" "Mesh_OTA_Globals.c" "Mesh_OTA.c"
                     INCLUDE_DIRS "include" 
                     REQUIRES nvs_flash
                     esp_http_client

components/mesh_ota/HTTPS_Client.c

@@ -0,0 +1,355 @@
+/**
+* @file HTTPS_Client.c
+* @brief Used to download the OTA image from the server
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Additional Infos: Connects via HTTPS and HTTPS Basic Auth to the Server.
+* Downloads the image in segments
+*/
+
+#include "HTTPS_Client.h"
+
+static const char *TAG = "https_client";
+
+//HTTP GET data
+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(void);
+https_client_ret_t errHTTPSClientConnectToServer(void);
+https_client_ret_t errHTTPSClientValidateServer(void);
+https_client_ret_t errHTTPSClientSendRequest(void);
+
+/**
+* @fn https_client_ret_t errHTTPSClientInitialize(void)
+* @brief Initialize the client
+* @param void
+* @return HTTPS_Client error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Initialize embedTLS
+*/
+https_client_ret_t errHTTPSClientInitialize(void)
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+
+    i32RetHTTPClient = https_clientInitEmbedTLS();
+
+    if (i32RetHTTPClient == HTTPS_CLIENT_ERROR_INIT_EMBEDTLS)
+        {
+            ESP_LOGE(TAG, "Unable to initialize EmbedTLS");
+            i32RetHTTPClient = HTTPS_CLIENT_ERROR;
+        }
+    return i32RetHTTPClient;
+}
+
+/**
+* @fn https_client_ret_t errHTTPSClientRetrieveData(char* const cpu8Data, const uint32_t* const cpcu32DataLenght, uint32_t* pu32BytesRead)
+* @brief receive a image segment from server
+* @param cpu8Data data buffer
+* @param cpcu32DataLenght desired byte amount
+* @param pu32BytesRead actual received byte amount
+* @return HTTPS_Client error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Read segement and handle all events like EOF or timeout
+*/
+https_client_ret_t errHTTPSClientRetrieveData(char* const cpu8Data, const uint32_t* const cpcu32DataLenght, uint32_t* pu32BytesRead)
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetRetrieveData = ESP_OK;
+    bool bRetriveData = true;
+
+    bzero(cpu8Data, *cpcu32DataLenght);
+    (*pu32BytesRead) = 0U;
+
+    while (bRetriveData)
+        {
+            mbedtls_ssl_conf_read_timeout(&sHTTPS_ClientConfig.conf, HTTPS_READ_TIMEOUT); //set timeout
+            //Reading HTTP response
+            i32RetRetrieveData = mbedtls_ssl_read(&sHTTPS_ClientConfig.ssl, (unsigned char *)(cpu8Data+(*pu32BytesRead)), ((*cpcu32DataLenght)-(*pu32BytesRead)));
+
+            if(i32RetRetrieveData > 0)
+                {
+                    //Data received
+                    *pu32BytesRead = *pu32BytesRead + i32RetRetrieveData;
+
+                    if(*cpcu32DataLenght > 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_TIMEOUT )
+                {
+                    //timeout --> stop reading
+                    bRetriveData = false;
+                }
+
+            if(i32RetRetrieveData == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY)
+                {
+                    //connection is going to be closed
+                    i32RetHTTPClient = HTTPS_CLIENT_ERROR;
+                    bRetriveData = false;
+                }
+        }
+    return i32RetHTTPClient;
+}
+
+/**
+* @fn https_client_ret_t errHTTPSClientReset(void)
+* @brief reset client for next receive of image
+* @param void
+* @return HTTPS_Client error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* reset session
+*/
+https_client_ret_t errHTTPSClientReset(void)
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+
+    i32RetHTTPClient = mbedtls_ssl_close_notify(&sHTTPS_ClientConfig.ssl); //close session
+
+    if(i32RetHTTPClient != ESP_OK)
+        {
+            ESP_LOGE(TAG, "mbedtls_ssl_close_notify returned 0x%x", i32RetHTTPClient);
+        }
+
+    mbedtls_ssl_session_reset(&sHTTPS_ClientConfig.ssl); //reset embedssl
+    mbedtls_net_free(&sHTTPS_ClientConfig.server_fd); //free ram
+
+    return i32RetHTTPClient;
+}
+
+/**
+* @fn https_client_ret_t https_clientInitEmbedTLS(void)
+* @brief init embedTLS
+* @param void
+* @return HTTPS_Client error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* attach certs for tls
+*/
+https_client_ret_t https_clientInitEmbedTLS(void)
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetEmbedTLS = ESP_OK;
+    static bool bAlreadySetup = false;
+
+    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);
+
+            if (bAlreadySetup == false) //check if mbedtls_ssl_setup was called before
+                {
+                    i32RetEmbedTLS = mbedtls_ssl_setup(&sHTTPS_ClientConfig.ssl, &sHTTPS_ClientConfig.conf); //call this only once
+                    if(i32RetEmbedTLS != ESP_OK)
+                        {
+                            ESP_LOGE(TAG, "mbedtls_ssl_setup returned 0x%x\n", i32RetEmbedTLS);
+                        }
+                    else
+                        {
+                            bAlreadySetup = true;
+                        }
+                }
+        }
+
+    if(i32RetEmbedTLS == ESP_OK)
+        {
+            mbedtls_net_init(&sHTTPS_ClientConfig.server_fd);
+        }
+
+    if (i32RetEmbedTLS != ESP_OK)
+        {
+            i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_EMBEDTLS;
+        }
+
+    return i32RetHTTPClient;
+}
+
+/**
+* @fn https_client_ret_t errHTTPSClientConnectToServer(void)
+* @brief connect to server
+* @param void
+* @return HTTPS_Client error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* open TLS session
+*/
+https_client_ret_t errHTTPSClientConnectToServer(void)
+{
+    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, mbedtls_net_recv_timeout);
+
+            //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;
+}
+
+/**
+* @fn https_client_ret_t errHTTPSClientValidateServer(void)
+* @brief validate server
+* @param void
+* @return HTTPS_Client error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* check CDN and cert
+*/
+https_client_ret_t errHTTPSClientValidateServer(void)
+{
+    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;
+}
+
+/**
+* @fn https_client_ret_t errHTTPSClientSendRequest(void)
+* @brief send request to server
+* @param void
+* @return HTTPS_Client error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* send HTTP GET request
+*/
+https_client_ret_t errHTTPSClientSendRequest(void)
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetSendRequest = ESP_OK;
+    uint32_t u32WrittenBytes = 0;
+    bool bWrite = true; //flag to stop loop
+
+    //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/Mesh_Network.c

@@ -0,0 +1,495 @@
+/**
+* @file Mesh_Network.c
+* @brief Mesh network layer used by OTA and APP
+* @author Hendrik Schutter, init based in ESP32-IDE code
+* @date 20.01.2021
+*
+* Additional Infos: Start network and send and receive data.
+*/
+
+#include "Mesh_Network.h"
+
+static const char *LOG_TAG = "mesh_network";
+
+//w: errMeshNetworkInitialize
+//r: errMeshNetworkInitialize;vMeshNetworkGetOwnAddr;errMeshNetworkGetChildren
+uint8_t u8ownMAC[6];
+
+//w: errMeshNetworkInitialize; vMeshNetworkMeshEventHandler
+//r: vMeshNetworkMeshEventHandler
+esp_netif_t* pNetifSta;
+
+//w: errMeshNetworkInitialize; vMeshNetworkMeshEventHandler
+//r: errMeshNetworkInitialize;
+bool bIsMeshConnected;
+
+//w: errMeshNetworkInitialize; vMeshNetworkMeshEventHandler
+//r: vMeshNetworkMeshEventHandler
+int32_t i32MeshLayer;
+
+//w: errMeshNetworkInitialize; vMeshNetworkMeshEventHandler
+//r: vMeshNetworkMeshEventHandler
+mesh_addr_t meshParentAddr;
+
+//function pointer for callbacks
+void (*pAppRxHandle)(const uint8_t* const, const uint8_t* const);
+void (*pOTAChildConnectHandle)(const uint8_t* const);
+void (*pOTAMessageHandle)(const MESH_PACKET_t* const);
+void (*pChangeStateOfServerWorkerHandle)(const bool );
+
+/**
+* @fn esp_err_t errMeshNetworkInitialize()
+* @brief Starts the mesh network
+* @param void
+* @return ESP32 error code
+* @author Hendrik Schutter, init based in ESP32-IDE code
+* @date 20.01.2021
+*
+* Initialize the network
+*/
+esp_err_t errMeshNetworkInitialize(void)
+{
+    //init module variables
+    esp_err_t err;
+    bIsMeshConnected = false;
+    i32MeshLayer = -1;
+    pNetifSta = 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(&pNetifSta, 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, &vMeshNetworkMeshEventHandler, 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(u8ownMAC))
+
+    //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\" ", u8ownMAC[0], u8ownMAC[1], u8ownMAC[2], u8ownMAC[3], u8ownMAC[4], u8ownMAC[5]);
+
+    return ESP_OK;
+}
+
+/**
+* @fn esp_err_t errMeshNetworkInitializeWiFi()
+* @brief Starts the WiFI
+* @param void
+* @return ESP32 error code
+* @author Hendrik Schutter, init based in ESP32-IDE code
+* @date 20.01.2021
+*
+* start the wifi
+*/
+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, &vMeshNetworkIpEventHandler, NULL));
+    ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_FLASH));
+    ERROR_CHECK(esp_wifi_start());
+    return err;
+}
+
+/**
+* @fn esp_err_t errMeshNetworkInitializeRouter(mesh_cfg_t* cfg)
+* @brief Starts the router
+* @param cfg router config
+* @return ESP32 error code
+* @author Hendrik Schutter, init based in ESP32-IDE code
+* @date 20.01.2021
+*
+* Initialize the network
+*/
+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;
+}
+
+/**
+* @fn esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(const uint8_t* const cpcu8Data))
+* @brief set callback for event when child connects
+* @param (*pChildConnectHandleTmp)(const uint8_t* const cpcu8Data) function pointer
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*/
+esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(const uint8_t* const cpcu8Data))
+{
+    pOTAChildConnectHandle = pChildConnectHandleTmp;
+    return ESP_OK;
+}
+
+/**
+* @fn esp_err_t errMeshNetworkSetAppReceiveHandle(void (*pAppRxHandleTmp)(const uint8_t* const cpcu8Data, const uint8_t* const pu8Sender))
+* @brief set callback for event when application data is received
+* @param (*pAppRxHandleTmp)(const uint8_t* const cpcu8Data, const uint8_t* const pu8Sender) function pointer
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*/
+esp_err_t errMeshNetworkSetAppReceiveHandle(void (*pAppRxHandleTmp)(const uint8_t* const cpcu8Data, const uint8_t* const pu8Sender))
+{
+    pAppRxHandle = pAppRxHandleTmp; //set handle from app as receive handle if an app packet is received
+    return ESP_OK;
+}
+
+/**
+* @fn esp_err_t errMeshNetworkSetOTAMessageHandleHandle(void (*pOTAMessageHandleTmp)(const MESH_PACKET_t* const cpcuMeshPacket))
+* @brief set callback for event when OTA message is received
+* @param (*pOTAMessageHandleTmp)(const MESH_PACKET_t* const cpcuMeshPacket) function pointer
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*/
+esp_err_t errMeshNetworkSetOTAMessageHandleHandle(void (*pOTAMessageHandleTmp)(const MESH_PACKET_t* const cpcuMeshPacket))
+{
+    pOTAMessageHandle = pOTAMessageHandleTmp;
+    return ESP_OK;
+}
+
+/**
+* @fn esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(const bool cbState))
+* @brief set callback for event when connectify to server is changed
+* @param (*pChangeStateOfServerWorkerHandleTmp)(const bool cbState) function pointer
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*/
+esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(const bool cbState))
+{
+    pChangeStateOfServerWorkerHandle = pChangeStateOfServerWorkerHandleTmp;
+    return ESP_OK;
+}
+
+/**
+* @fn esp_err_t errMeshNetworkSendMeshPacket(const mesh_addr_t* const cpcAddrDest, const MESH_PACKET_t* const cpcPacket)
+* @brief send packet to mesh node
+* @param cpcAddrDest address from mesh node
+* @param cpcPacket packet to send
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*/
+esp_err_t errMeshNetworkSendMeshPacket(const mesh_addr_t* const cpcAddrDest, const MESH_PACKET_t* const cpcPacket)
+{
+    esp_err_t err;
+    mesh_data_t data;
+    uint8_t tx_buf[CONFIG_MESH_MESSAGE_SIZE] = { 0, };
+    data.data = tx_buf;
+    data.size = sizeof(tx_buf);
+    data.proto = MESH_PROTO_BIN;
+    data.tos = MESH_TOS_P2P;
+    memcpy(tx_buf, (uint8_t *)cpcPacket, sizeof(MESH_PACKET_t));
+
+    err = esp_mesh_send(cpcAddrDest, &data, MESH_DATA_P2P, NULL, 0);
+
+    return err;
+}
+
+/**
+* @fn bool bMeshNetworkIsRootNode()
+* @brief return  true if this node is the root
+* @param void
+* @return boolean
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+bool bMeshNetworkIsRootNode(void)
+{
+    return esp_mesh_is_root();
+}
+
+/**
+* @fn bool bMeshNetworkIsNodeNeighbour(const mesh_addr_t* const cpcNode)
+* @brief return true if node is neighbour if this
+* @param cpcNode to check
+* @return boolean
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+bool bMeshNetworkIsNodeNeighbour(const mesh_addr_t* const cpcNode)
+{
+    esp_err_t err = ESP_OK;
+    bool bReturn = false;
+    mesh_addr_t addrParent;  //addr of parent node
+    mesh_addr_t childrenAddr[CONFIG_MESH_ROUTE_TABLE_SIZE]; //array of children attached to this node
+    uint16_t u16ChildrenSize = 0U; //number of children attached to this node
+
+    err = errMeshNetworkGetParentNode(&addrParent);
+
+    if(err == ESP_OK)
+        {
+            if(bMeshNetworkCheckMacEquality(cpcNode->addr,  addrParent.addr) == true)
+                {
+                    bReturn = true; //node was found
+                }
+        }
+
+    if(bReturn == false)
+        {
+            err = ESP_OK; //reset error code
+
+            ERROR_CHECK(errMeshNetworkGetChildren(childrenAddr, &u16ChildrenSize)); //get all children
+
+            for (uint16_t u16Index = 0; ((u16Index < u16ChildrenSize) && (err == ESP_OK) && (bReturn == false)); u16Index++)
+                {
+                    if(bMeshNetworkCheckMacEquality(cpcNode->addr,  childrenAddr[u16Index].addr) == true)
+                        {
+                            bReturn = true; //node was found
+                        }
+                }
+        }
+    return bReturn;
+}
+
+
+/**
+* @fn bool bMeshNetworkCheckMacEquality(const uint8_t* const cpcu8aMAC, const uint8_t* const cpcu8bMAC)
+* @brief returns true if MAC address is equal
+* @param cpcu8aMAC first MAC
+* @param cpcu8bMAC second MAC
+* @return boolean
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+bool bMeshNetworkCheckMacEquality(const uint8_t* const cpcu8aMAC, const uint8_t* const cpcu8bMAC)
+{
+    bool bRet = true;
+    uint8_t index = 0;
+
+    while ((index < 6) && (bRet == true))
+        {
+            if(cpcu8aMAC[index] != cpcu8bMAC[index])
+                {
+                    bRet = false;
+                }
+
+            if(index == 5)
+                {
+                    //last byte of mac
+                    if(abs((cpcu8aMAC[index] - cpcu8bMAC[index])) <= 1)
+                        {
+                            bRet = true; //last byte differs 1 ore less
+                        }
+                }
+            index++;
+        }
+    return bRet;
+}
+
+/**
+* @fn esp_err_t errMeshNetworkStartReceiveTask()
+* @brief start the task to receive the mesh packets
+* @param void
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+esp_err_t errMeshNetworkStartReceiveTask(void)
+{
+    esp_err_t err = ESP_OK;
+    BaseType_t xReturned;
+
+    xReturned = xTaskCreate(vMeshNetworkTaskReceiveMeshData, "ReceiveMeshData", 7000, NULL, 5, NULL);
+
+    if(xReturned != pdPASS)
+        {
+            err = ESP_FAIL;
+        }
+    return err;
+}
+
+/**
+* @fn vMeshNetworkGetOwnAddr(mesh_addr_t* const cpMeshOwnAddr)
+* @brief return own MAC addr
+* @param cpMeshOwnAddr pointer to own mac
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshNetworkGetOwnAddr(mesh_addr_t* const cpMeshOwnAddr)
+{
+    memcpy(cpMeshOwnAddr->addr, u8ownMAC, 6);
+}
+
+/**
+* @fn esp_err_t errMeshNetworkGetChildren(mesh_addr_t* const cpChildren, uint16_t* const cpu16ChildrenSize)
+* @brief get all connected children to node in array
+* @param cpChildren pointer to array
+* @param cpu16ChildrenSize pointer to size of array
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+esp_err_t errMeshNetworkGetChildren(mesh_addr_t* const cpChildren, uint16_t* const cpu16ChildrenSize)
+{
+    esp_err_t err = ESP_OK;
+    int route_table_size = 0;
+    *cpu16ChildrenSize = 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(! (bMeshNetworkCheckMacEquality(u8ownMAC, route_table[index].addr))  )
+                        {
+                            //child node
+                            //ESP_LOGI(LOG_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]);
+                            cpChildren[*cpu16ChildrenSize] = route_table[index];
+                            (*cpu16ChildrenSize) =  (*cpu16ChildrenSize)+1;
+                        }
+                }
+        }
+    return err;
+}
+
+/**
+* @fn void vMeshNetworkTaskReceiveMeshData(void *arg)
+* @brief Task to receive all mesh packets
+* @param arg
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshNetworkTaskReceiveMeshData(void *arg)
+{
+    esp_err_t err;
+    mesh_addr_t from;
+    mesh_data_t data;
+    uint8_t rx_buf[CONFIG_MESH_MESSAGE_SIZE] = { 0, };
+    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;
+                }
+            MESH_PACKET_t packet;
+            memcpy(&packet, (uint8_t *)rx_buf, sizeof(MESH_PACKET_t)); //parse MESH_PACKET_t
+            memcpy(&packet.meshSenderAddr, &from, sizeof(mesh_addr_t)); //copy sender into packet
+
+            switch (packet.type)
+                {
+                case APP_Data:
+                    ESP_LOGD(LOG_TAG, "recv: APP_Data");
+                    //call the rx handle from app
+                    pAppRxHandle(packet.au8Payload, from.addr);  //hand over payload and sender of this mesh packet
+                    break;
+                case OTA_Version_Request:
+                case OTA_Version_Response:
+                case OTA_Data:
+                case OTA_ACK:
+                case OTA_Complete:
+                case OTA_Abort:
+                    //call the rx handle from OTA
+                    if(pOTAMessageHandle)
+                        {
+                            pOTAMessageHandle(&packet);
+                        }
+                    break;
+                default:
+                    ESP_LOGE(LOG_TAG, "recv: something");
+                    break;
+                }//end switch
+        } //end while
+}
+
+/**
+* @fn esp_err_t errMeshNetworkGetParentNode(mesh_addr_t* const cpMeshParentAddr)
+* @brief get parrent node if connected to it
+* @param cpMeshParentAddr pointer to parent node addrs
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+esp_err_t errMeshNetworkGetParentNode(mesh_addr_t* const cpMeshParentAddr)
+{
+    esp_err_t err = ESP_OK;
+
+    if((bIsMeshConnected == false) || (esp_mesh_is_root()))
+        {
+            //this node is not connected or is the root --> this node has no parent
+            err = ESP_FAIL;
+        }
+    else
+        {
+            //node has parent
+            memcpy(cpMeshParentAddr, &meshParentAddr, sizeof(mesh_addr_t));
+        }
+    return err;
+}
+
+
+
+

components/mesh_ota/Mesh_Network_Handler.c

@@ -0,0 +1,261 @@
+
+/**
+* @file Mesh_Network_Handler.c
+* @brief Handler for events from mesh network (no messages)
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Additional Infos: IP event received or parrent or child connected or disconnected
+*/
+
+#include "Mesh_Network.h"
+
+static const char *LOG_TAG = "mesh_network_handler";
+
+/**
+* @fn void vMeshNetworkIpEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void *vpEventData)
+* @brief received an IP event
+* @param arg
+* @param event_base
+* @param i32EventID
+* @param vpEventData
+* @return void
+* @author ESP-IDF
+* @date 20.01.2021
+*/
+void vMeshNetworkIpEventHandler(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));
+    if(pChangeStateOfServerWorkerHandle)
+        {
+            pChangeStateOfServerWorkerHandle(true);   //signal that this node (root node) has access to internet
+        }
+}
+
+/**
+* @fn void vMeshNetworkMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void* vpEventData)
+* @brief received an mesh event
+* @param arg
+* @param event_base
+* @param i32EventID
+* @param vpEventData
+* @return void
+* @author ESP-IDF
+* @date 20.01.2021
+*/
+void vMeshNetworkMeshEventHandler(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));
+
+if(pOTAChildConnectHandle){pOTAChildConnectHandle(child_connected->mac);}//add this child to queue using handle
+
+}
+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(&meshParentAddr.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(meshParentAddr.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()) 
+{
+if(esp_netif_dhcpc_start(pNetifSta) == ESP_ERR_ESP_NETIF_DHCP_ALREADY_STARTED) //get a IP from router
+{
+if(pChangeStateOfServerWorkerHandle){pChangeStateOfServerWorkerHandle(true);}// signal reconnect
+} 
+}
+errMeshNetworkStartReceiveTask();//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;
+if(pChangeStateOfServerWorkerHandle){pChangeStateOfServerWorkerHandle(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(&meshParentAddr);
+ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_SWITCH_ACK>layer:%d, parent:"MACSTR"", i32MeshLayer, MAC2STR(meshParentAddr.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/Mesh_OTA.c

@@ -1,237 +1,382 @@
-#include "Mesh_OTA.h"
-
-/*
- * 999.999.999
- * Return true if remote version is newer (higher) than local version
+/**
+* @file Mesh_OTA.c
+* @brief Start and implement OTA updates via HTTPS from server and other mesh nodes (bidirectional)
+* @author Hendrik Schutter
+* @date 21.01.2021
 */
-bool bNewerVersion(const char* pu8Local, const  char* pu8Remote) 
+
+#include "Mesh_OTA.h"
+#include "Mesh_OTA_Util.h"
+#include "Mesh_OTA_Globals.h"
+#include "Mesh_OTA_Partition_Access.h"
+
+static const char *LOG_TAG = "mesh_ota";
+
+/**
+* @fn esp_err_t errMeshOTAInitialize(void)
+* @brief Starts Mesh OTA functionality
+* @param void
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+* Initialize queues and tasks
+* Set callbacks
+*/
+esp_err_t errMeshOTAInitialize(void)
 {
-    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;
+    BaseType_t xReturned;
+    bWantReboot = false;
 
-    strcpy(pc8RemoteVersionNumber, "999.999.999"); //init value
-    err = errFindImageStart(pu8Data, pu32DataLenght, &u32StartOffset); //get image start offset
+    //create queue to store nodes for ota worker task
+    queueNodes = xQueueCreate(QUEUE_NODES_SIZE, sizeof(mesh_addr_t));
+    if (queueNodes == 0)  // Queue not created
+        {
+            ESP_LOGE(LOG_TAG, "Unable to create queue for nodes");
+            err = ESP_FAIL;
+        }
 
     if(err == ESP_OK)
-    {
-        //image found
-        strncpy(pc8RemoteVersionNumber, pu8Data+(u32StartOffset+48), 11); //copy version number
-        pc8RemoteVersionNumber[12] = '\0';
-    }
+        {
+            //create queue to store ota messages
+            queueMessageOTA = xQueueCreate(QUEUE_MESSAGE_OTA_SIZE, sizeof(MESH_PACKET_t));
+            if (queueMessageOTA == 0)  // Queue not created
+                {
+                    ESP_LOGE(LOG_TAG, "Unable to create queue for OTA messages");
+                    err = ESP_FAIL;
+                }
+        }
+
+    if(err == ESP_OK)
+        {
+            bsStartStopServerWorker = xSemaphoreCreateBinary();
+            if( bsStartStopServerWorker == NULL )
+                {
+                    ESP_LOGE(LOG_TAG, "Unable to create mutex to represent state of server worker");
+                    err = ESP_FAIL;
+                }
+        }
+
+    if(err == ESP_OK)
+        {
+            bsOTAProcess = xSemaphoreCreateBinary();
+            if( bsOTAProcess == NULL )
+                {
+                    ESP_LOGE(LOG_TAG, "Unable to create mutex to grant access to OTA process");
+                    err = ESP_FAIL;
+                }
+        }
+
+    if(err == ESP_OK)
+        {
+            xSemaphoreGive(bsOTAProcess);  //unlock binary semaphore
+            if( bsOTAProcess == NULL )
+                {
+                    ESP_LOGE(LOG_TAG, "Unable to unlock mutex to grant access to OTA process");
+                    err = ESP_FAIL;
+                }
+        }
+
+    //register callbacks in network
+    ERROR_CHECK(errMeshNetworkSetChildConnectedHandle(vMeshOtaUtilAddNodeToPossibleUpdatableQueue));
+    ERROR_CHECK(errMeshNetworkSetOTAMessageHandleHandle(vMeshOtaUtilAddOtaMessageToQueue));
+    ERROR_CHECK(errMeshNetworkSetChangeStateOfServerWorkerHandle(vMeshOtaUtilChangeStateOfServerWorker));
+
+    if(err == ESP_OK)
+        {
+            pOTAPartition =  esp_ota_get_next_update_partition(NULL); //get ota partition
+
+            if(pOTAPartition == NULL)
+                {
+                    err = ESP_FAIL;
+                    ESP_LOGE(LOG_TAG, "unable to get next ota partition");
+                }
+        }
+
+    if(err == ESP_OK)
+        {
+            xReturned = xTaskCreate(vMeshOtaTaskServerWorker, "vMeshOtaTaskServerWorker", 8192, NULL, 5, NULL);
+            if(xReturned != pdPASS)
+                {
+                    ESP_LOGE(LOG_TAG, "Unable to create the server worker task");
+                    err = ESP_FAIL;
+                }
+        }
+
+
+    if(err == ESP_OK)
+        {
+            xReturned = xTaskCreate(vMeshOtaTaskOTAWorker, "vMeshOtaTaskOTAWorker", 8192, NULL, 5, NULL);
+            if(xReturned != pdPASS)
+                {
+                    ESP_LOGE(LOG_TAG, "Unable to create the OTA worker task");
+                    err = ESP_FAIL;
+                }
+        }
+
     return err;
 }
 
-/*
-
-
-esp_err_t esp_mesh_ota_send(mesh_addr_t* dest)
+/**
+* @fn void vMeshOtaTaskServerWorker(void *arg)
+* @brief Task for updating from server via HTTPS
+* @param arg
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshOtaTaskServerWorker(void *arg)
 {
     esp_err_t err = ESP_OK;
+    bool bNewOTAImage; //true if a new ota image was downloaded and validated
+    bool bFirstRun = true;
 
-    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)
+    while(true)
         {
-            //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++;
-        }
+            err = ESP_OK;
+            bNewOTAImage = false;
+            xSemaphoreTake(bsStartStopServerWorker, portMAX_DELAY); //wait for binary semaphore that allows to start the worker
+            xSemaphoreGive(bsStartStopServerWorker); //free binary semaphore, this allows the handler to change is to taken
 
-        if (data_read > 0)
-        {
-            //send ota fragemnt to node
-            esp_mesh_send_packet(dest, &packet);
-        }
+            if (esp_mesh_is_root()) //check again that this node is the root node
+                {
+                    ESP_LOGI(LOG_TAG, "Checking firmware image on server");
 
-        ESP_ERROR_CHECK(err);
-    }
-    else
-    {
-        ESP_LOGI(MESH_TAG, "Subtype: %d",  (*currentPartition).subtype);
-    }
-    return err;
+                    if(bFirstRun == true)
+                        {
+                            //init on first run
+                            ERROR_CHECK(errHTTPSClientInitialize());
+                            bFirstRun = false;
+                        }
+
+                    ERROR_CHECK(errHTTPSClientConnectToServer());
+                    ERROR_CHECK(errHTTPSClientValidateServer());
+                    ERROR_CHECK(errHTTPSClientSendRequest());
+
+                    ERROR_CHECK(errMeshOtaPartitionAccessHttps(&bNewOTAImage));
+                    errHTTPSClientReset();
+
+                    if(bNewOTAImage == true)
+                        {
+                            //set want reboot
+                            ESP_LOGI(LOG_TAG, "Updated successfully via HTTPS, set pending reboot");
+                            bWantReboot = true;
+                            vMeshOtaUtilAddAllNeighboursToQueue(); //add all existing neighbours to queue (aparent will not be added because this node is the root)
+                        }
+                    vTaskDelay( (SERVER_CHECK_INTERVAL*1000) / portTICK_PERIOD_MS); //sleep till next server checks
+                }
+        }
 }
 
-esp_err_t esp_mesh_ota_receive(mesh_addr_t* dest, struct ota_mesh_packet* packet)
+/**
+* @fn void vMeshOtaTaskServerWorker(void *arg)
+* @brief Task for updating from nodes in mesh network
+* @param arg
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshOtaTaskOTAWorker(void *arg)
 {
     esp_err_t err = ESP_OK;
-    static esp_ota_handle_t otaHandle;
-    static uint32_t u32index;
+    bool bNewOTAImage; //true if a new ota image was downloaded and validated
+    mesh_addr_t meshNodeAddr; //node that should be checked for ota update
 
-    const esp_partition_t * currentPartition = esp_ota_get_boot_partition();
-    const esp_partition_t * otaPartition =  esp_ota_get_next_update_partition(currentPartition);
+    while(true)
+        {
+            err = ESP_OK;
+            bNewOTAImage = false;
 
-    if(u32index == 0)
-    {
-        //first run
+            if((uxQueueSpacesAvailable(queueNodes) - QUEUE_NODES_SIZE) == 0)
+                {
+                    //nodes queue is empty
+                    if((bWantReboot == true) && (OTA_ALLOW_REBOOT == 1))
+                        {
+                            ESP_LOGE(LOG_TAG, "ESP32 Reboot ...");
+                            vTaskDelay( (1000) / portTICK_PERIOD_MS);
+                            esp_restart();
+                        }
 
-        err = esp_ota_begin(otaPartition, OTA_SIZE_UNKNOWN, &otaHandle);
-        ESP_ERROR_CHECK(err);
-    }
+                    ERROR_CHECK(errMeshOtaSlaveEndpoint(&bNewOTAImage));
+                }
+            else
+                {
+                    //queue not empty
+                    if (xQueueReceive(queueNodes, &meshNodeAddr, ((100) / portTICK_PERIOD_MS)) != pdTRUE)
+                        {
+                            ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from Queue");
+                            err = ESP_FAIL;
+                        }
 
-    ESP_LOGI(MESH_TAG, "OTA-Data write: %i", u32index);
-    err = esp_ota_write(otaHandle, packet->au8Payload, 1024);
+                    ERROR_CHECK(errMeshOtaMasterEndpoint(&bNewOTAImage, &meshNodeAddr));
 
-    if(err != ESP_OK)
-    {
-        ESP_LOGE(MESH_TAG, "OTA-Data write error: %i at %i", err, u32index);
-    }
+                    if (err != ESP_OK)
+                        {
+                            //OTA process faild --> add back to queue
+                            vMeshOtaUtilAddNodeToPossibleUpdatableQueue(meshNodeAddr.addr);
+                        }
+                    else
+                        {
+                            vMeshOtaUtilClearNeighboursQueue(&meshNodeAddr); //remove this node from queue
+                        }
+                }
 
-    ESP_ERROR_CHECK(err);
+            if(bNewOTAImage == true)
+                {
+                    //set want reboot
+                    ESP_LOGI(LOG_TAG, "Updated successfully via Mesh, set pending reboot");
+                    bWantReboot = true;
+                    vMeshOtaUtilAddAllNeighboursToQueue(); //add all existing neighbours to queue
+                }
+            vTaskDelay( (1000) / portTICK_PERIOD_MS);
+        }
+}
 
+/**
+* @fn esp_err_t errMeshOtaSlaveEndpoint(bool* const cpbNewOTAImage)
+* @brief Endpoint for OTA process that is called from remote node
+* @param cpbNewOTAImage pointer to boolean to signal if a new image was successfully received
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+* Answers the OTA_Version_Request with OTA_Version_Response
+* calls errMeshOtaPartitionAccessMeshReceive OR errMeshOtaPartitionAccessMeshTransmit based on version number
+*/
+esp_err_t errMeshOtaSlaveEndpoint(bool* const cpbNewOTAImage)
+{
+    esp_err_t err = ESP_OK;
+    MESH_PACKET_t sOTAMessage;
+    const esp_partition_t* cpBootPartition = NULL; //pointer to boot partition (that will booted after reset)
+    esp_app_desc_t bootPartitionDesc; //Metadate from boot partition
+    *cpbNewOTAImage = false; //set default false
 
+    //read OTAMessages queue
+    if(uxQueueSpacesAvailable(queueMessageOTA) < QUEUE_MESSAGE_OTA_SIZE)
+        {
+            //queue not empty
+            if (xQueueReceive(queueMessageOTA, &sOTAMessage, ((100) / portTICK_PERIOD_MS)) != pdTRUE)
+                {
+                    ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from Queue");
+                    err = ESP_FAIL;
+                }
 
-    if(u32index >= 1023)
-    {
-        //ota update complete
+            if((err == ESP_OK) && (sOTAMessage.type == OTA_Version_Request)) //if OTA_Version_Request
+                {
+                    xSemaphoreTake(bsOTAProcess, portMAX_DELAY); //wait for binary semaphore that allows to start the OTA process
 
-        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);
+                    cpBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
+                    ERROR_CHECK(esp_ota_get_partition_description(cpBootPartition, &bootPartitionDesc)); //get metadata of partition
 
-        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++;
+                    //send OTA_Version_Response to sender of OTA_Version_Request packet wirh version in payload
+                    ERROR_CHECK(errMeshOtaUtilSendOtaVersionResponse(&sOTAMessage.meshSenderAddr));
 
+                    if((bMeshOtaUtilNewerVersion((bootPartitionDesc).version, (char*) sOTAMessage.au8Payload)) && (err == ESP_OK)) //compare local and remote version
+                        {
+                            //remote newer as local
+                            ESP_LOGI(LOG_TAG, "remote image on node is newer --> OTA update required");
+                            //  --> this version older --> start OTA_Rx --> set cpbNewOTAImage true
+                            ERROR_CHECK(errMeshOtaPartitionAccessMeshReceive(cpbNewOTAImage, &sOTAMessage.meshSenderAddr));
+                        }
 
+                    if((bMeshOtaUtilNewerVersion((char*) sOTAMessage.au8Payload, (bootPartitionDesc).version)) && (err == ESP_OK)) //compare remote and local version
+                        {
+                            //local newer as remote
+                            ESP_LOGI(LOG_TAG, "remote image on node is older --> OTA send required");
+                            //  --> this version newer --> start OTA_Tx
+                            ERROR_CHECK(errMeshOtaPartitionAccessMeshTransmit(&sOTAMessage.meshSenderAddr));
+                        }
+                    xSemaphoreGive(bsOTAProcess); //free binary semaphore, this allows other tasks to start the OTA process
+                }
+        }
+    return err;
+}
+
+/**
+* @fn esp_err_t errMeshOtaMasterEndpoint(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr)
+* @brief Endpoint for OTA process that calls remote node
+* @param cpbNewOTAImage pointer to boolean to signal if a new image was successfully received
+* @param cpcMeshNodeAddr pointer to remote node addr
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+* Sends the OTA_Version_Request to remote node
+* calls errMeshOtaPartitionAccessMeshReceive OR errMeshOtaPartitionAccessMeshTransmit based on version number received
+*/
+esp_err_t errMeshOtaMasterEndpoint(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr)
+{
+    esp_err_t err = ESP_OK;
+    MESH_PACKET_t sOTAMessage;
+    const esp_partition_t* cpBootPartition = NULL; //pointer to boot partition (that will booted after reset)
+    esp_app_desc_t bootPartitionDesc; //Metadata from boot partition
+    bool bNodeIsConnected = false;
+    bool bNodeIsResponding = false;
+
+    *cpbNewOTAImage = false; //set default false
+
+    if(bMeshNetworkIsNodeNeighbour(cpcMeshNodeAddr) == true) //check if node is still connected
+        {
+            bNodeIsConnected = true; //node is one of the neighbours
+            xSemaphoreTake(bsOTAProcess, portMAX_DELAY); //wait for binary semaphore that allows to start the OTA process
+
+            ERROR_CHECK(errMeshOtaUtilSendOtaVersionRequest(cpcMeshNodeAddr)); //send OTA_VERSION_REQUEST with local version in payload
+
+            for (uint32_t u32Index = 0; u32Index < QUEUE_MESSAGE_OTA_SIZE; u32Index++) //loop through all OTA messages
+                {
+                    if(uxQueueSpacesAvailable(queueMessageOTA) < QUEUE_MESSAGE_OTA_SIZE)
+                        {
+                            //queue not empty
+                            if (xQueueReceive(queueMessageOTA, &sOTAMessage, ((3000) / portTICK_PERIOD_MS)) != pdTRUE)
+                                {
+                                    ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from queue");
+                                    err = ESP_FAIL;
+                                }
+
+                            if((err == ESP_OK) && (sOTAMessage.type == OTA_Version_Response) && (bMeshNetworkCheckMacEquality(sOTAMessage.meshSenderAddr.addr, cpcMeshNodeAddr->addr))) //if OTA_Version_Request
+                                {
+                                    bNodeIsResponding = true;
+                                    cpBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
+                                    ERROR_CHECK(esp_ota_get_partition_description(cpBootPartition, &bootPartitionDesc)); //get metadata of partition
+
+                                    if((bMeshOtaUtilNewerVersion((bootPartitionDesc).version, (char*) sOTAMessage.au8Payload)) && (err == ESP_OK)) //compare local and remote version
+                                        {
+                                            //remote newer as local
+                                            ESP_LOGI(LOG_TAG, "Mesh: remote image on node is newer --> OTA update required");
+                                            //  --> this version older --> start OTA_Rx --> set cpbNewOTAImage true
+                                            ERROR_CHECK(errMeshOtaPartitionAccessMeshReceive(cpbNewOTAImage, &sOTAMessage.meshSenderAddr));
+                                        }
+
+                                    if((bMeshOtaUtilNewerVersion((char*) sOTAMessage.au8Payload, (bootPartitionDesc).version)) && (err == ESP_OK)) //compare remote and local version
+                                        {
+                                            //local newer as remote
+                                            ESP_LOGI(LOG_TAG, "Mesh: remote image on node is older --> OTA send required");
+                                            //  --> this version newer --> start OTA_Tx
+                                            ERROR_CHECK(errMeshOtaPartitionAccessMeshTransmit(&sOTAMessage.meshSenderAddr));
+                                        }
+                                }
+                            else if (err == ESP_OK)
+                                {
+                                    //received from wrong node or type --> back to queue
+                                    vMeshOtaUtilAddOtaMessageToQueue(&sOTAMessage);
+                                }
+                        }
+                    else
+                        {
+                            // OTA Message queue is empty --> wait some time
+                            ESP_LOGD(LOG_TAG, "OTA-Master: OTA Message queue is empty --> wait some time");
+                            vTaskDelay( (1000/QUEUE_MESSAGE_OTA_SIZE) / portTICK_PERIOD_MS);
+                        }
+                }//end loop
+            xSemaphoreGive(bsOTAProcess); //free binary semaphore, this allows other tasks to start the OTA process
+        }
+
+    if((bNodeIsResponding == false) && (bNodeIsConnected == true))
+        {
+            //add node back to queue if connected and NOT responding
+            ESP_LOGD(LOG_TAG, "OTA-Master: connected and NOT responding --> add node back to queue ");
+            vMeshOtaUtilAddNodeToPossibleUpdatableQueue(cpcMeshNodeAddr->addr);
+        }
     return err;
 }
-*/

components/mesh_ota/Mesh_OTA_Globals.c

@@ -0,0 +1,22 @@
+/**
+* @file Mesh_OTA_Globals.c
+* @brief global variables unsed in Mesh_OTA
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+
+#include "Mesh_OTA_Globals.h"
+
+xQueueHandle queueNodes; //nodes that should be checked for ota update (contains children and parent)
+xQueueHandle queueMessageOTA; //mesh ota controll messages like "OTA_Version_Response" "OTA_ACK"
+
+SemaphoreHandle_t bsStartStopServerWorker; //binary semaphore
+SemaphoreHandle_t bsOTAProcess; //binary semaphore
+
+//w: errMeshOTAInitialize;
+//r: errMeshOTAInitialize; errMeshOtaPartitionAccessHttps; errMeshOtaPartitionAccessMeshReceive;
+const esp_partition_t* pOTAPartition; //pointer to ota partition
+
+//w: errMeshOTAInitialize; vMeshOtaTaskOTAWorker; vMeshOtaTaskServerWorker
+//r: errMeshOTAInitialize; vMeshOtaTaskOTAWorker; vMeshOtaTaskServerWorker
+bool bWantReboot; //flag to signal pending reboot

components/mesh_ota/Mesh_OTA_Partition_Access.c

@@ -0,0 +1,344 @@
+/**
+* @file Mesh_OTA_Partition_Access.c
+* @brief Write and read partition if requested from Mesh_OTA
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+* Additional Infos: Write image via HTTPS
+*                   Receive or transmit via Mesh
+*/
+
+#include "Mesh_OTA.h"
+#include "Mesh_OTA_Util.h"
+#include "Mesh_OTA_Globals.h"
+#include "Mesh_OTA_Partition_Access.h"
+
+static const char *LOG_TAG = "mesh_ota_partition_access";
+
+/**
+* @fn esp_err_t errMeshOtaPartitionAccessHttps(bool* const cpbNewOTAImage)
+* @brief Downloads and writes the image from the server to partition
+* @param cpbNewOTAImage pointer to boolean to signal if a new image was successfully received
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+* Checks if the image on server is newer
+* Downloads the image in segements
+* Handles OTA process
+*/
+esp_err_t errMeshOtaPartitionAccessHttps(bool* const cpbNewOTAImage)
+{
+    esp_err_t err = ESP_OK;
+    char u8OTABuffer[OTA_HTTPS_SEGMENT_SIZE]; //store image segment from server before ota write
+    uint32_t u32BufferLenght = OTA_HTTPS_SEGMENT_SIZE; //size of buffer
+    uint32_t u32BytesRead = 0; //number of bytes that are read from server, <= u32BufferLenght
+    char pcRemoteVersionNumber[12]; //string for version number in server image
+    const esp_partition_t* pBootPartition; //pointer to boot partition (that will booted after reset)
+    static esp_ota_handle_t otaHandle; //OTA process handle
+    uint32_t u32StartOffset = 0U; //start offset for image (exclude the http response data)
+    esp_app_desc_t bootPartitionDesc; //Metadate from boot partition
+    uint32_t u32OTABytesWritten = 0U; //counter unsed for progress log
+
+    ERROR_CHECK(errHTTPSClientRetrieveData(u8OTABuffer, &u32BufferLenght, &u32BytesRead)); //read first bytes if image, including the version
+
+    ERROR_CHECK(errMeshOtaUtilExtractVersionNumber(u8OTABuffer, &u32BytesRead, pcRemoteVersionNumber)); //extract version numbers
+
+    //check if version number is found
+    if(err == ESP_OK)
+        {
+            xSemaphoreTake(bsOTAProcess, portMAX_DELAY); //wait for binary semaphore that allows to start the OTA process
+
+            pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
+            ERROR_CHECK(esp_ota_get_partition_description(pBootPartition, &bootPartitionDesc)); //get metadata of partition
+
+            if(bMeshOtaUtilNewerVersion((bootPartitionDesc).version, pcRemoteVersionNumber)) //compare local and remote version
+                {
+                    // server image is newer --> OTA update required
+                    ESP_LOGI(LOG_TAG, "Server: image is newer --> OTA update required");
+
+                    ERROR_CHECK(errMeshOtaUtilFindImageStart(u8OTABuffer, &u32BufferLenght, &u32StartOffset)); //get image start offset
+                    ERROR_CHECK(esp_ota_begin(pOTAPartition, OTA_SIZE_UNKNOWN, &otaHandle)); //start ota update process
+
+                    if(err == ESP_OK)
+                        {
+                            //image download and ota partition write
+                            ESP_LOGI(LOG_TAG, "start OTA download via HTTPS");
+                            do
+                                {
+                                    vMeshOtaUtilPrintOtaProgress(&(pOTAPartition->size), &u32OTABytesWritten, Receiver);
+                                    ERROR_CHECK(esp_ota_write(otaHandle, (const void*) u8OTABuffer+u32StartOffset, (u32BytesRead-u32StartOffset)));
+
+                                    if(err == ESP_OK)
+                                        {
+                                            //write was succsesfull
+                                            u32StartOffset = 0U; //reset the offset for next download
+                                            ERROR_CHECK(errHTTPSClientRetrieveData(u8OTABuffer, &u32BufferLenght, &u32BytesRead)); //download next data segment
+                                            u32OTABytesWritten = u32OTABytesWritten + u32BytesRead; //update counter
+                                        }
+                                }
+                            //loop until error or complete image downloaded
+                            while ((u32BytesRead > 0) && (err == ESP_OK) && (u32OTABytesWritten <= pOTAPartition->size));
+                        }
+
+                    if(err == ESP_OK)
+                        {
+                            //no error occurred --> finish ota update process
+                            ERROR_CHECK(esp_ota_end(otaHandle)); //finish process
+                            ERROR_CHECK(esp_ota_set_boot_partition(pOTAPartition)); //set new image as boot
+                            if(err == ESP_OK)
+                                {
+                                    *cpbNewOTAImage = true; //image validated
+                                }
+                        }
+                    else
+                        {
+                            //error occurred --> abort ota update process
+                            ESP_LOGE(LOG_TAG, "abort OTA process due to error 0x%x -> %s", err, esp_err_to_name(err));
+                            ERROR_CHECK(esp_ota_abort(otaHandle));
+                            *cpbNewOTAImage = false; //ota update failed
+                        }
+                }
+            else
+                {
+                    ESP_LOGI(LOG_TAG, "server image is NOT newer --> OTA update NOT required");
+                }
+            xSemaphoreGive(bsOTAProcess); //free binary semaphore, this allows other tasks to start the OTA process
+        } //end version number extracted
+    return err;
+}
+
+/**
+* @fn esp_err_t errMeshOtaPartitionAccessMeshTransmit(const mesh_addr_t* const cpcMeshNodeAddr)
+* @brief Reads the local image and sends it to node
+* @param cpcMeshNodeAddr pointer to mesh node addr to send the image segments to
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+* Reads the newest OTA image in segments
+* Sends the image to mesh node in segments
+* Handles OTA process
+*/
+esp_err_t errMeshOtaPartitionAccessMeshTransmit(const mesh_addr_t* const cpcMeshNodeAddr)
+{
+    esp_err_t err = ESP_OK;
+    const esp_partition_t* pBootPartition = NULL; //pointer to boot partition (that will booted after reset)
+    MESH_PACKET_t sMeshPacket; //packet for sending and receiving
+    // uint32_t u32Index = 0U; //index for partition read offset
+    bool bAbort = false; //abort the OTA process
+    bool bNodeIsResponding = false; //remote node is still active
+    uint32_t u32OTABytesWritten = 0U; //counter of bytes unsed for progress log
+    uint32_t u32SegmentCounter = 0U; //counter of segments unsed for progress log
+
+    pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
+
+    //loop through partition to read in segmensts until end or error or abort called
+    while( ((OTA_MESH_SEGMENT_SIZE * u32SegmentCounter) < pBootPartition->size) && (err == ESP_OK) && (bAbort == false))
+        {
+            bNodeIsResponding = false; //reset to default for this loop
+
+            // read partition with offset based in index
+            ERROR_CHECK(esp_partition_read(pBootPartition, (OTA_MESH_SEGMENT_SIZE * u32SegmentCounter), sMeshPacket.au8Payload, OTA_MESH_SEGMENT_SIZE));
+            u32OTABytesWritten = ((u32SegmentCounter+1) * OTA_MESH_SEGMENT_SIZE); //calc bytes that are written in this ota process
+            vMeshOtaUtilPrintOtaProgress(&(pBootPartition->size), &u32OTABytesWritten, Transmitter);
+
+            if(err == ESP_OK)
+                {
+                    //no error while read --> send OTA_DATA packet
+                    sMeshPacket.type = OTA_Data;
+
+                    if((OTA_MESH_SEGMENT_SIZE * (u32SegmentCounter+1)) >= pBootPartition->size) //check if last segment
+                        {
+                            //last partition image segment --> send OTA_Complete
+                            ESP_LOGD(LOG_TAG, "OTA-TX: last segment--> send Complete");
+                            sMeshPacket.type = OTA_Complete;
+                        }
+                    err = errMeshNetworkSendMeshPacket(cpcMeshNodeAddr, &sMeshPacket);
+                }
+            else
+                {
+                    // error while read --> send OTA_ABORT and abort this OTA process
+                    sMeshPacket.type = OTA_Abort;
+                    bAbort = true;
+                    ESP_LOGE(LOG_TAG, "OTA-TX: error while read --> send ABORT");
+                    errMeshNetworkSendMeshPacket(cpcMeshNodeAddr, &sMeshPacket);
+                }
+
+            // loop through all OTA messages or until abort is called or error
+            for (uint32_t u32Index = 0; ((u32Index < QUEUE_MESSAGE_OTA_SIZE) && (bAbort == false) && (err == ESP_OK)); u32Index++) //loop through all OTA messages
+                {
+                    //get OTA message from queue
+                    if (xQueueReceive(queueMessageOTA, &sMeshPacket, ((OTA_MESH_TIMEOUT) / portTICK_PERIOD_MS)) != pdTRUE)
+                        {
+                            ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from queue");
+                            err = ESP_FAIL;
+                        }
+
+                    //check if from correct node
+                    if((err == ESP_OK) && (bMeshNetworkCheckMacEquality(sMeshPacket.meshSenderAddr.addr, cpcMeshNodeAddr->addr)))
+                        {
+                            //packet from node received --> handle it
+                            switch (sMeshPacket.type)
+                                {
+                                case OTA_ACK: //start next loop for segment
+                                    bNodeIsResponding = true;
+                                    u32Index = QUEUE_MESSAGE_OTA_SIZE; //this will end the loop through all OTA messages
+                                    break;
+                                case OTA_Abort: //abort this OTA process
+                                    bAbort = true;
+                                    bNodeIsResponding = true;
+                                    break;
+                                default:
+                                    break;
+                                }
+                        }
+                    else if (err == ESP_OK)
+                        {
+                            //received from wrong node --> back to queue
+                            vMeshOtaUtilAddOtaMessageToQueue(&sMeshPacket);
+                        }
+                }//end OTA message loop
+
+            if(bNodeIsResponding == false)
+                {
+                    //no abort was called but node didn’t responded
+                    ESP_LOGE(LOG_TAG, "OTA-TX: no abort was called but node didn’t responded --> error");
+                    bAbort = true;
+                    err = ESP_FAIL; //this OTA process failed with error
+                }
+            u32SegmentCounter++;
+        }//end of partition segment loop
+    vMeshOtaUtilClearOtaMessageQueue(cpcMeshNodeAddr); //remove all OTA messages from remote node
+    return err;
+}
+
+/**
+* @fn esp_err_t errMeshOtaPartitionAccessMeshReceive(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr)
+* @brief Downloads and writes the image from the remote node
+* @param cpbNewOTAImage pointer to boolean to signal if a new image was successfully received
+* @param cpcMeshNodeAddr pointer to mesh node addr to receive the image segments from
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+* Receives the images segments from remote node
+* Writtes segments to OTA partition
+* Handles OTA process
+*/
+esp_err_t errMeshOtaPartitionAccessMeshReceive(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr)
+{
+    esp_err_t err = ESP_OK;
+    MESH_PACKET_t sMeshPacket; //packet for sending and receiving
+    bool bComplete = false; //complete the OTA process
+    bool bAbort = false; //abort the OTA process
+    bool bNodeIsResponding = false; //remote node is still active
+    uint32_t u32OTABytesWritten = 0U; //counter unsed for progress log
+    static esp_ota_handle_t otaHandle; //OTA process handle
+    *cpbNewOTAImage = false; //set default to false
+    uint32_t u32SegmentCounter = 0U; //counter of segments unsed for progress log
+
+    ERROR_CHECK(esp_ota_begin(pOTAPartition, OTA_SIZE_UNKNOWN, &otaHandle)); //start ota update process
+
+    //partition segement loop through partition to read in segmensts until end or error or abort called
+    while((bComplete == false) && (err == ESP_OK) && (bAbort == false) && (u32OTABytesWritten <= pOTAPartition->size))
+        {
+            bNodeIsResponding = false; //reset to default
+
+            // loop through all OTA messages or until abort is called
+            for (uint32_t u32Index = 0; ((u32Index < QUEUE_MESSAGE_OTA_SIZE) && (bAbort == false)); u32Index++) //loop through all OTA messages
+                {
+                    //if(uxQueueSpacesAvailable(queueMessageOTA) < QUEUE_MESSAGE_OTA_SIZE)
+                    //   {
+                    //queue not empty
+                    if (xQueueReceive(queueMessageOTA, &sMeshPacket, ((OTA_MESH_TIMEOUT) / portTICK_PERIOD_MS)) != pdTRUE)
+                        {
+                            ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from queue");
+                            err = ESP_FAIL;
+                        }
+
+                    if((err == ESP_OK) && (bMeshNetworkCheckMacEquality(sMeshPacket.meshSenderAddr.addr, cpcMeshNodeAddr->addr))) //if OTA_Version_Request
+                        {
+                            //packet from node received
+                            switch (sMeshPacket.type)
+                                {
+                                case OTA_Complete: //signal end of this OTA process, fall through because same behavior as OTA_Data
+                                    bComplete = true;
+                                //fall through
+                                case OTA_Data: //data segement received
+                                    bNodeIsResponding = true;
+                                    ERROR_CHECK(esp_ota_write(otaHandle, sMeshPacket.au8Payload, OTA_MESH_SEGMENT_SIZE));
+                                    u32OTABytesWritten = ((u32SegmentCounter+1) * OTA_MESH_SEGMENT_SIZE); //calc bytes that are written in this ota process
+                                    vMeshOtaUtilPrintOtaProgress(&(pOTAPartition->size), &u32OTABytesWritten, Receiver);
+                                    u32Index = QUEUE_MESSAGE_OTA_SIZE; //this will end the loop through all OTA messages
+                                    break;
+                                case OTA_Abort: //abort this OTA process
+                                    bAbort = true;
+                                    bNodeIsResponding = true;
+                                    ESP_LOGE(LOG_TAG, "OTA-RX: receives abort --> abort this OTA process on this node");
+                                    //this will end the loop through all OTA messages
+                                    break;
+                                default:
+                                    break;
+                                }
+                        }
+                    else if (err == ESP_OK)
+                        {
+                            //received from wrong node --> back to queue
+                            vMeshOtaUtilAddOtaMessageToQueue(&sMeshPacket);
+                        }
+                }//end of OTA message loop
+
+            if(bNodeIsResponding == false)
+                {
+                    //no abort was called but node didn’t responded --> error
+                    ESP_LOGI(LOG_TAG, "OTA-RX: no abort was called but node didn’t responded --> error");
+                    bAbort = true; //this will stop the partition segement loop
+                    err = ESP_FAIL; //this OTA process failed with error
+                }
+            else
+                {
+                    //node has responded with OTA_DATA or OTA_Complete or OTA_ABORT
+                    if(err == ESP_OK)
+                        {
+
+                            if(bAbort == false)
+                                {
+                                    //no error while ota write --> send OTA_ACK packet
+                                    sMeshPacket.type = OTA_ACK;
+                                    err = errMeshNetworkSendMeshPacket(cpcMeshNodeAddr, &sMeshPacket);
+                                }
+                        }
+                    else
+                        {
+                            // error while read --> send OTA_ABORT and abort this OTA process
+                            sMeshPacket.type = OTA_Abort;
+                            bAbort = true;
+                            ESP_LOGI(LOG_TAG, "OTA-RX: abort --> send ABORT");
+                            errMeshNetworkSendMeshPacket(cpcMeshNodeAddr, &sMeshPacket);
+                        }
+                }
+            u32SegmentCounter++;
+        }//end of partition segement loop
+
+    if(bComplete == true)
+        {
+            //all OTA segments received --> validate
+            ESP_LOGI(LOG_TAG, "OTA-RX: validate image ");
+            ERROR_CHECK(esp_ota_end(otaHandle)); //validate image
+            ERROR_CHECK(esp_ota_set_boot_partition(pOTAPartition));
+            if(err == ESP_OK)
+                {
+                    //successfully updated OTA partition
+                    *cpbNewOTAImage = true;
+                }
+        }
+    else
+        {
+            //not all OTA segments received --> abort this OTA process
+            ERROR_CHECK(esp_ota_abort(otaHandle));
+        }
+    vMeshOtaUtilClearOtaMessageQueue(cpcMeshNodeAddr);
+    return err;
+}
+

components/mesh_ota/Mesh_OTA_Util.c

@@ -0,0 +1,433 @@
+/**
+* @file Mesh_OTA_Util.c
+* @brief Utility and helper functions to perfrom mesh OTA updates
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+
+#include "Mesh_OTA_Util.h"
+#include "Mesh_OTA_Globals.h"
+
+static const char *LOG_TAG = "mesh_ota";
+
+/**
+* @fn bool bMeshOtaUtilNewerVersion(const char* cpu8Local, const char* cpu8Remote)
+* @brief compares to version strings
+* @param cpu8Local local image version string
+* @param cpu8Remote remote image version string
+* @return bool
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+* Returns true if remote is newer
+*/
+bool bMeshOtaUtilNewerVersion(const char* cpu8Local, const char* cpu8Remote)
+{
+    char u8LocalTmp[12]; //local version
+    char u8RemoteTmp[12]; //remote version
+    char* pu8saveptrLocal = NULL; //context for strok_r
+    char* pu8saveptrRemote = NULL; //context for strok_r
+    bool bReturn = false; //flag to stop loop
+    uint8_t u8Index = 0; //numbers counter in version string
+
+    strncpy(u8LocalTmp, cpu8Local, 12); //copy in tmp
+    strncpy(u8RemoteTmp, cpu8Remote, 12); //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;
+}
+
+/**
+* @fn esp_err_t errMeshOtaUtilExtractVersionNumber(const char* cpu8Data, uint32_t* const cpcu32DataLenght, char* const pc8RemoteVersionNumber)
+* @brief extract version number from image data
+* @param cpu8Data image data buffer
+* @param cpcu32DataLenght pointer to lenght of image data
+* @param pc8RemoteVersionNumber pointer version number
+* @return ESP32 error code
+* @author Hendrik Schutters
+* @date 21.01.2021
+*
+* Search version number in raw image data
+*/
+esp_err_t errMeshOtaUtilExtractVersionNumber(const char* cpu8Data, uint32_t* const cpcu32DataLenght, char* const pc8RemoteVersionNumber)
+{
+    uint32_t u32StartOffset;
+    esp_err_t err = ESP_OK;
+
+    strcpy(pc8RemoteVersionNumber, "999.999.999"); //init value
+    err = errMeshOtaUtilFindImageStart(cpu8Data, cpcu32DataLenght, &u32StartOffset); //get image start offset
+
+    if(err == ESP_OK)
+        {
+            //image found
+            strncpy(pc8RemoteVersionNumber, cpu8Data+(u32StartOffset+48), 11); //copy version number
+            pc8RemoteVersionNumber[12] = '\0';
+        }
+    return err;
+}
+
+/**
+* @fn esp_err_t errMeshOtaUtilFindImageStart(const char* const cpu8Data, const uint32_t* const cpcu32DataLenght, uint32_t* const cpu32StartOffset)
+* @brief find start offset from image raw data
+* @param cpu8Data image data buffer
+* @param cpcu32DataLenght pointer to lenght of image data
+* @param cpu32StartOffset pointer to determined offset
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+* Search offset in raw image data from server (exclude HTTP response)
+*/
+esp_err_t errMeshOtaUtilFindImageStart(const char* const cpu8Data, const uint32_t* const cpcu32DataLenght, uint32_t* const cpu32StartOffset)
+{
+
+    // 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;
+
+    *cpu32StartOffset = 0U; //reset offset to zero
+
+    while((u32DataIndex < *cpcu32DataLenght) &&  (bImageStartOffsetFound == false))
+        {
+            //search for magic byte
+            if(cpu8Data[u32DataIndex] == 0xe9)
+                {
+                    //magic byte found
+                    while ((u8FirstDotIndex < 3) && (u32FirstDotOffset == 0))
+                        {
+                            //search first dot in version number
+                            if((u32DataIndex+49+u8FirstDotIndex) < *cpcu32DataLenght)
+                                {
+                                    if((cpu8Data[(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)) < *cpcu32DataLenght)
+                                {
+                                    if((cpu8Data[(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
+                            *cpu32StartOffset = 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;
+}
+
+/**
+* @fn esp_err_t errMeshOtaUtilSendOtaVersionRequest(const mesh_addr_t* const cpcMeshReceiverAddr)
+* @brief send OTA_Version_Request to node
+* @param cpcMeshReceiverAddr node addr
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+esp_err_t errMeshOtaUtilSendOtaVersionRequest(const mesh_addr_t* const cpcMeshReceiverAddr)
+{
+    esp_err_t err = ESP_OK;
+    MESH_PACKET_t packet;
+    packet.type = OTA_Version_Request;
+
+    const esp_partition_t* pBootPartition = NULL; //pointer to boot partition (that will booted after reset)
+    esp_app_desc_t bootPartitionDesc; //Metadata from boot partition
+
+    pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
+    ERROR_CHECK(esp_ota_get_partition_description(pBootPartition, &bootPartitionDesc)); //get metadate of partition
+    memcpy(&packet.au8Payload, &bootPartitionDesc.version, 12); //copy local version to OTA_Version_Request packet
+    err = errMeshNetworkSendMeshPacket(cpcMeshReceiverAddr, &packet);
+    return err;
+}
+
+/**
+* @fn esp_err_t errMeshOtaUtilSendOtaVersionResponse(const mesh_addr_t* const cpcMeshReceiverAddr)
+* @brief send OTA_Version_Response to node
+* @param cpcMeshReceiverAddr node addr
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+esp_err_t errMeshOtaUtilSendOtaVersionResponse(const mesh_addr_t* const cpcMeshReceiverAddr)
+{
+    esp_err_t err = ESP_OK;
+    MESH_PACKET_t packet;
+    packet.type = OTA_Version_Response;
+
+    const esp_partition_t* pBootPartition = NULL; //pointer to boot partition (that will booted after reset)
+    esp_app_desc_t bootPartitionDesc; //Metadata from boot partition
+
+    pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
+    ERROR_CHECK(esp_ota_get_partition_description(pBootPartition, &bootPartitionDesc)); //get metadate of partition
+    memcpy(&packet.au8Payload, &bootPartitionDesc.version, 12); //copy local version to OTA_Version_Response packet
+
+    ESP_LOGD(LOG_TAG, "Send OTA_Version_Response to 0x%x", cpcMeshReceiverAddr->addr[5]);
+
+    err = errMeshNetworkSendMeshPacket(cpcMeshReceiverAddr, &packet);
+    return err;
+}
+
+/**
+* @fn void vMeshOtaUtilPrintOtaProgress(const uint32_t* const cpcu32TotalImageSize, const uint32_t* const cpcu32BytesWritten, const OTA_MESH_ROLE_t ceRole)
+* @brief print LOG for OTA process progress
+* @param cpcu32TotalImageSize size of OTA partition
+* @param cpcu32BytesWritten actual bytes written
+* @param ceRole role if this OTA process
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshOtaUtilPrintOtaProgress(const uint32_t* const cpcu32TotalImageSize, const uint32_t* const cpcu32BytesWritten, const OTA_MESH_ROLE_t ceRole)
+{
+    uint32_t u32Percentage = 0U;
+    static uint32_t u32LastPercentage = 0U;
+
+    if((*cpcu32BytesWritten) >= (*cpcu32TotalImageSize))
+        {
+            u32Percentage = 100;
+        }
+    else
+        {
+            u32Percentage = (uint32_t) (((float) (*cpcu32BytesWritten)/(float) (*cpcu32TotalImageSize)) * 100.0);
+        }
+
+    if((u32Percentage-u32LastPercentage) >= OTA_PROGRESS_LOG_INTERVAL)
+        {
+            if(ceRole == Transmitter)
+                {
+                    ESP_LOGI(LOG_TAG, "Transmitting OTA update: %i %%", u32Percentage);
+                }
+
+            if(ceRole == Receiver)
+                {
+                    ESP_LOGI(LOG_TAG, "Receiving OTA update: %i %%", u32Percentage);
+                }
+
+
+
+            u32LastPercentage = u32Percentage;
+        }
+}
+
+/**
+* @fn void vMeshOtaUtilAddAllNeighboursToQueue(void)
+* @brief add all neigbhours (children and parent) to queue
+* @param void
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshOtaUtilAddAllNeighboursToQueue(void)
+{
+    esp_err_t err = ESP_OK;
+
+    mesh_addr_t addrParent;  //addr of parent node
+    mesh_addr_t childrenAddr[CONFIG_MESH_ROUTE_TABLE_SIZE]; //array of children attached to this node
+    uint16_t u16ChildrenSize = 0U; //number of children attached to this node
+
+    err = errMeshNetworkGetParentNode(&addrParent);
+
+    if(err == ESP_OK)
+        {
+            vMeshOtaUtilAddNodeToPossibleUpdatableQueue(addrParent.addr);
+        }
+
+    err = ESP_OK; //reset error code
+
+    ERROR_CHECK(errMeshNetworkGetChildren(childrenAddr, &u16ChildrenSize)); //get all children
+
+    for (uint16_t u16Index = 0; ((u16Index < u16ChildrenSize) && (err == ESP_OK)); u16Index++)
+        {
+            vMeshOtaUtilAddNodeToPossibleUpdatableQueue(childrenAddr[u16Index].addr);
+        }
+}
+
+/**
+* @fn void vMeshOtaUtilClearOtaMessageQueue(const mesh_addr_t* const cpcMeshNodeAddr)
+* @brief remode all OTA messages from this node in queue
+* @param cpcMeshNodeAddr node addr
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshOtaUtilClearOtaMessageQueue(const mesh_addr_t* const cpcMeshNodeAddr)
+{
+    MESH_PACKET_t sMeshPacket; //packet for sending and receiving
+    for (uint32_t u32Index = 0; (u32Index < QUEUE_MESSAGE_OTA_SIZE); u32Index++) //loop through all OTA messages
+        {
+            if (xQueueReceive(queueMessageOTA, &sMeshPacket, 0) == pdTRUE)
+                {
+                    if(!(bMeshNetworkCheckMacEquality(sMeshPacket.meshSenderAddr.addr, cpcMeshNodeAddr->addr)))
+                        {
+                            //received OTA message is NOT from cpcMeshNodeAddr --> keep it in queue
+                            vMeshOtaUtilAddOtaMessageToQueue(&sMeshPacket);
+                        }
+                }
+        }//end OTA message loop
+}
+
+/**
+* @fn void vMeshOtaUtilClearNeighboursQueue(const mesh_addr_t* const cpcMeshNodeAddr)
+* @brief remode all instances of this node in queue
+* @param cpcMeshNodeAddr node addr
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshOtaUtilClearNeighboursQueue(const mesh_addr_t* const cpcMeshNodeAddr)
+{
+    mesh_addr_t sNode; //packet for sending and receiving
+    for (uint32_t u32Index = 0; (u32Index < QUEUE_MESSAGE_OTA_SIZE); u32Index++) //loop through all OTA messages
+        {
+            if (xQueueReceive(queueNodes, &sNode, 0) == pdTRUE)
+                {
+                    if(!(bMeshNetworkCheckMacEquality(sNode.addr, cpcMeshNodeAddr->addr)))
+                        {
+                            //node is NOT cpcMeshNodeAddr --> keep it in queue
+                            vMeshOtaUtilAddNodeToPossibleUpdatableQueue(cpcMeshNodeAddr->addr);
+                        }
+                }
+        }//end OTA message loop
+}
+
+/**
+* @fn void vMeshOtaUtilAddNodeToPossibleUpdatableQueue(const uint8_t* const cpcu8MAC)
+* @brief add node instance to queue
+* @param cpcu8MAC MAC addr of node
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshOtaUtilAddNodeToPossibleUpdatableQueue(const uint8_t* const cpcu8MAC)
+{
+    //send payload to node queues
+    mesh_addr_t addrNode;
+    memcpy(&addrNode.addr, (uint8_t *)cpcu8MAC, 6); //copy MAC
+
+    if (xQueueSend(queueNodes, &addrNode, portMAX_DELAY) != pdPASS)
+        {
+            ESP_LOGE(LOG_TAG, "Unable to push node into node queue");
+        }
+    else
+        {
+            ESP_LOGD(LOG_TAG, "added node \"%x:%x:%x:%x:%x:%x\" to possible updatable queue", addrNode.addr[0], addrNode.addr[1], addrNode.addr[2], addrNode.addr[3], addrNode.addr[4], addrNode.addr[5]);
+        }
+}
+
+/**
+* @fn void vMeshOtaUtilAddOtaMessageToQueue(const MESH_PACKET_t* const cpcuMeshPacket)
+* @brief add OTA message to queue
+* @param cpcuMeshPacket OTA message
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshOtaUtilAddOtaMessageToQueue(const MESH_PACKET_t* const cpcuMeshPacket)
+{
+    //send ota packet to packet queue
+    if (xQueueSend(queueMessageOTA, cpcuMeshPacket, portMAX_DELAY) != pdPASS)
+        {
+            ESP_LOGE(LOG_TAG, "Unable to push ota packet into packet queue");
+        }
+    else
+        {
+            switch (cpcuMeshPacket->type)
+                {
+                case OTA_Abort:
+                    ESP_LOGD(LOG_TAG, "added ota message to queue: OTA_Abort from 0x%x", cpcuMeshPacket->meshSenderAddr.addr[5]);
+                    break;
+                case OTA_Version_Request:
+                    ESP_LOGD(LOG_TAG, "added ota message to queue: OTA_Version_Request from 0x%x", cpcuMeshPacket->meshSenderAddr.addr[5]);
+                    break;
+
+                case OTA_Version_Response:
+                    ESP_LOGD(LOG_TAG, "added ota message to queue: OTA_Version Response from 0x%x", cpcuMeshPacket->meshSenderAddr.addr[5]);
+                    break;
+                default:
+                    break;
+                }
+        }
+}
+
+/**
+* @fn void vMeshOtaUtilChangeStateOfServerWorker(const bool cbState)
+* @brief callback for mesh network if connectivity to server changed
+* @param cbState boolean state
+* @return void
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+void vMeshOtaUtilChangeStateOfServerWorker(const bool cbState)
+{
+    static bool bLastState = false;
+
+    if(cbState != bLastState) //change only if necessary
+        {
+            if(cbState == true)
+                {
+                    if (xSemaphoreGive(bsStartStopServerWorker)  != pdTRUE)
+                        {
+                            ESP_LOGE(LOG_TAG, "Unable to give mutex to activate the server worker");
+                        }
+                }
+            else
+                {
+                    if (xSemaphoreTake(bsStartStopServerWorker,( TickType_t ) 10 )  != pdTRUE)
+                        {
+                            ESP_LOGE(LOG_TAG, "Unable to obtain mutex to deactivate the server worker");
+                        }
+                }
+            bLastState = cbState;
+        }
+}

components/mesh_ota/Mesh_network.c

@@ -1,247 +0,0 @@
-
-#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

@@ -1,221 +0,0 @@
-
-#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/include/HTTPS_Client.h

@@ -0,0 +1,81 @@
+/**
+* @file HTTPS_Client.h
+* @brief Used to download the OTA image from the server
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Additional Infos: Connects via HTTPS and HTTPS Basic Auth to the Server.
+* Downloads the image in segments
+*/
+
+#ifndef H_HTTPS_CLIENT
+#define H_HTTPS_CLIENT
+
+#include <string.h>
+#include <stdlib.h>
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "esp_event.h"
+#include "esp_log.h"
+#include "esp_system.h"
+#include "esp_netif.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
+
+#define HTTPS_READ_TIMEOUT 1000 //ms
+
+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 errHTTPSClientInitialize(void);
+https_client_ret_t errHTTPSClientConnectToServer(void);
+https_client_ret_t errHTTPSClientValidateServer(void);
+https_client_ret_t errHTTPSClientSendRequest(void);
+https_client_ret_t errHTTPSClientRetrieveData(char* const cpu8Data, const uint32_t* const cpcu32DataLenght, uint32_t* pu32BytesRead);
+https_client_ret_t errHTTPSClientReset(void);
+
+#endif /* H_HTTPS_CLIENT */
+
+
+
+

components/mesh_ota/include/Mesh_Network.h

@@ -0,0 +1,120 @@
+/**
+* @file Mesh_Network.h
+* @brief Mesh network layer used by OTA and APP
+* @author Hendrik Schutter, init based in ESP32-IDE code
+* @date 20.01.2021
+*
+* Additional Infos: Start network and send and receive data.
+*/
+
+#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"
+#include "nvs_flash.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
+
+#define MESH_NETWORK_PAYLOAD_SIZE 1024U
+
+struct meshPacket
+{
+    enum otaMeshPacketType
+    {
+        APP_Data,            //data for application
+        OTA_Version_Request, //send own version in payload
+        OTA_Version_Response, //send own version in payload
+        OTA_Data,            //send image segment
+        OTA_ACK,             //ack image segment
+        OTA_Complete,         //signal end of image
+        OTA_Abort             //abort OTA process
+    } type;
+    uint8_t au8Payload[MESH_NETWORK_PAYLOAD_SIZE];
+    mesh_addr_t meshSenderAddr;
+};
+
+typedef struct meshPacket MESH_PACKET_t;
+
+#define ERROR_CHECK(x) if (err == ESP_OK)                                                               \
+    {                                                                                                   \
+        err = (x);                                                                                      \
+        if (err != ESP_OK)                                                                              \
+            {                                                                                           \
+                ESP_LOGE(LOG_TAG,  "%s failed with error: 0x%x -> %s", #x,  err, esp_err_to_name(err)); \
+            }                                                                                           \
+    }                                                                                                   \
+
+extern bool bIsMeshConnected;
+extern int32_t i32MeshLayer;
+extern mesh_addr_t meshParentAddr;
+extern esp_netif_t* pNetifSta;
+extern uint8_t u8ownMAC[6];
+extern void (*pOTAChildConnectHandle)(const uint8_t* const);
+extern void (*pChangeStateOfServerWorkerHandle)(const bool );
+
+esp_err_t errMeshNetworkInitialize(void);
+esp_err_t errMeshNetworkInitializeWiFi(void);
+esp_err_t errMeshNetworkInitializeRouter(mesh_cfg_t* cfg);
+
+esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(const uint8_t* const cpcu8Data));
+esp_err_t errMeshNetworkSetAppReceiveHandle(void (*pAppRxHandleTmp)(const uint8_t* const cpcu8Data, const uint8_t* const cpcu8Sender));
+esp_err_t errMeshNetworkSetOTAMessageHandleHandle(void (*pOTAMessageHandleTmp)(const MESH_PACKET_t* const cpcuMeshPacket));
+esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(const bool cbState));
+
+bool bMeshNetworkIsRootNode(void);
+bool bMeshNetworkIsNodeNeighbour(const mesh_addr_t* const cpcNode);
+bool bMeshNetworkCheckMacEquality(const uint8_t* const cpcu8aMAC, const uint8_t* const cpcu8bMAC);
+
+esp_err_t errMeshNetworkStartReceiveTask(void);
+esp_err_t errMeshNetworkGetParentNode(mesh_addr_t* const cpMeshParentAddr);
+esp_err_t errMeshNetworkGetChildren(mesh_addr_t* const cpChildren, uint16_t* const cpu16ChildrenSize);
+esp_err_t errMeshNetworkSendMeshPacket(const mesh_addr_t* const cpcAddrDest, const MESH_PACKET_t* const cpcPacket);
+
+void vMeshNetworkTaskReceiveMeshData(void *arg);
+void vMeshNetworkGetOwnAddr(mesh_addr_t* const cpMeshOwnAddr);
+void vMeshNetworkIpEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void *vpEventData);
+void vMeshNetworkMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void* vpEventData);
+
+#endif /* H_MESH_NETWORK */
+

components/mesh_ota/include/Mesh_OTA.h

@@ -1,45 +1,49 @@
+/**
+* @file Mesh_OTA.h
+* @brief Start and implement OTA updates via HTTPS from server and other mesh nodes (bidirectional)
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+
 #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"
+#include "Mesh_Network.h"
+#include "HTTPS_Client.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 QUEUE_NODES_SIZE 10
+#define QUEUE_MESSAGE_OTA_SIZE 10
+#define SERVER_CHECK_INTERVAL 30 //in seconds
+#define OTA_HTTPS_SEGMENT_SIZE 2048U
+#define OTA_PROGRESS_LOG_INTERVAL 7U
+#define OTA_MESH_SEGMENT_SIZE MESH_NETWORK_PAYLOAD_SIZE
+#define OTA_MESH_TIMEOUT 20000U //in ms
+#define OTA_ALLOW_REBOOT 0
 
 #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));   \
+                ESP_LOGE(LOG_TAG,  "%s failed with error: 0x%x -> %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);
+esp_err_t errMeshOTAInitialize(void);
+
+//Tasks
+void vMeshOtaTaskServerWorker(void *arg);
+void vMeshOtaTaskOTAWorker(void *arg);
+
+//OTA process endpoints
+esp_err_t errMeshOtaSlaveEndpoint(bool* const cpbNewOTAImage);
+esp_err_t errMeshOtaMasterEndpoint(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr);
 
 #endif /* H_MESH_OTA */

components/mesh_ota/include/Mesh_OTA_Globals.h

@@ -0,0 +1,27 @@
+/**
+* @file Mesh_OTA_Globals.h
+* @brief global variables unsed in Mesh_OTA
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+*/
+
+#ifndef H_MESH_OTA_GLOBALS
+#define H_MESH_OTA_GLOBALS
+
+#include "esp_system.h"
+#include "esp_partition.h"
+
+#include "Mesh_Network.h"
+#include "HTTPS_Client.h"
+
+extern xQueueHandle queueNodes; //nodes that should be checked for ota update (contains children and parent)
+extern xQueueHandle queueMessageOTA; //mesh ota controll messages like "OTA_Version_Response" "OTA_ACK"
+
+extern SemaphoreHandle_t bsStartStopServerWorker; //binary semaphore
+extern SemaphoreHandle_t bsOTAProcess; //binary semaphore
+
+extern const esp_partition_t* pOTAPartition; //pointer to ota partition
+extern bool bWantReboot; //flag to signal pending reboot
+
+#endif /* H_MESH_OTA_GLOBALS */

components/mesh_ota/include/Mesh_OTA_Partition_Access.h

@@ -0,0 +1,37 @@
+/**
+* @file Mesh_OTA_Partition_Access.h
+* @brief Write and read partition if requested from Mesh_OTA
+* @author Hendrik Schutter
+* @date 21.01.2021
+*
+* Additional Infos: Write image via HTTPS
+*                   Receive or transmit via Mesh
+*/
+
+#ifndef H_MESH_OTA_PARTITION_ACCESS
+#define H_MESH_OTA_PARTITION_ACCESS
+
+#include "esp_system.h"
+#include "esp_event.h"
+#include "esp_log.h"
+#include "nvs_flash.h"
+#include "esp_ota_ops.h"
+#include "esp_partition.h"
+
+#include "Mesh_Network.h"
+#include "HTTPS_Client.h"
+
+#define ERROR_CHECK(x) if (err == ESP_OK)                                                               \
+    {                                                                                                   \
+        err = (x);                                                                                      \
+        if (err != ESP_OK)                                                                              \
+            {                                                                                           \
+                ESP_LOGE(LOG_TAG,  "%s failed with error: 0x%x -> %s", #x,  err, esp_err_to_name(err)); \
+            }                                                                                           \
+    }                                                                                                   \
+
+esp_err_t errMeshOtaPartitionAccessHttps(bool* const cpbNewOTAImage);
+esp_err_t errMeshOtaPartitionAccessMeshTransmit(const mesh_addr_t* const cpcMeshNodeAddr);
+esp_err_t errMeshOtaPartitionAccessMeshReceive(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr);
+
+#endif /* H_MESH_OTA_PARTITION_ACCESS */

components/mesh_ota/include/Mesh_OTA_Util.h

@@ -0,0 +1,44 @@
+/**
+* @file Mesh_OTA_Util.h
+* @brief Utility and helper functions to perfrom mesh OTA updates
+* @author Hendrik Schutter
+* @date 21.01.2021
+*/
+
+#ifndef H_MESH_OTA_UTIL
+#define H_MESH_OTA_UTIL
+
+#include "esp_system.h"
+#include "esp_event.h"
+#include "esp_log.h"
+
+#include "Mesh_Network.h"
+#include "HTTPS_Client.h"
+#include "Mesh_OTA.h"
+
+enum otaMeshRole
+{
+    Transmitter,
+    Receiver
+};
+
+typedef  enum otaMeshRole OTA_MESH_ROLE_t;
+
+//helper functions
+bool bMeshOtaUtilNewerVersion(const char* cpu8Local, const char* cpu8Remote);
+esp_err_t errMeshOtaUtilExtractVersionNumber(const char* cpu8Data, uint32_t* const cpu32DataLenght, char* const pc8RemoteVersionNumber);
+esp_err_t errMeshOtaUtilFindImageStart(const  char* const cpu8Data, const uint32_t* const cpu32DataLenght, uint32_t* const cpu32StartOffset);
+esp_err_t errMeshOtaUtilSendOtaVersionRequest(const mesh_addr_t* const cpcMeshReceiverAddr);
+esp_err_t errMeshOtaUtilSendOtaVersionResponse(const mesh_addr_t* const cpcMeshReceiverAddr);
+void vMeshOtaUtilPrintOtaProgress(const uint32_t* const cpcu32TotalImageSize, const uint32_t* const cpcu32BytesWritten, const OTA_MESH_ROLE_t ceRole);
+void vMeshOtaUtilAddAllNeighboursToQueue(void);
+void vMeshOtaUtilClearOtaMessageQueue(const mesh_addr_t* const cpcMeshNodeAddr);
+void vMeshOtaUtilClearNeighboursQueue(const mesh_addr_t* const cpcMeshNodeAddr);
+
+//Handler
+void vMeshOtaUtilAddNodeToPossibleUpdatableQueue(const uint8_t* const cpcu8MAC);
+void vMeshOtaUtilAddOtaMessageToQueue(const MESH_PACKET_t* const cpcuMeshPacket);
+void vMeshOtaUtilChangeStateOfServerWorker(const bool cbState);
+
+#endif /* H_MESH_OTA_UTIL */
+

components/mesh_ota/include/Mesh_network.h

@@ -1,83 +0,0 @@
-#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/test/test_mesh_ota.c

@@ -10,56 +10,56 @@ TEST_CASE("Remote got patch", "[distinguish newer image version]")
 {
     char versionLocal[] = "1.2.3";  //current running image
     char versionRemote[] = "1.2.4"; //image from server
-    TEST_ASSERT_TRUE( bNewerVersion(versionLocal, versionRemote)  );
+    TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
 }
 
 TEST_CASE("Remote got minor", "[distinguish newer image version]")
 {
     char versionLocal[] = "1.2.3";  //current running image
     char versionRemote[] = "1.3.3"; //image from server
-    TEST_ASSERT_TRUE( bNewerVersion(versionLocal, versionRemote)  );
+    TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
 }
 
 TEST_CASE("Remote got major", "[distinguish newer image version]")
 {
     char versionLocal[] = "1.2.3";  //current running image
     char versionRemote[] = "2.2.3"; //image from server
-    TEST_ASSERT_TRUE( bNewerVersion(versionLocal, versionRemote)  );
+    TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
 }
 
 TEST_CASE("Local got patch", "[distinguish newer image version]")
 {
     char versionLocal[] = "1.2.4";  //current running image
     char versionRemote[] = "1.2.3"; //image from server
-    TEST_ASSERT_FALSE( bNewerVersion(versionLocal, versionRemote)  );
+    TEST_ASSERT_FALSE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
 }
 
 TEST_CASE("Local got minor", "[distinguish newer image version]")
 {
     char versionLocal[] = "1.3.3";  //current running image
     char versionRemote[] = "1.2.3"; //image from server
-    TEST_ASSERT_FALSE( bNewerVersion(versionLocal, versionRemote)  );
+    TEST_ASSERT_FALSE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
 }
 
 TEST_CASE("Local got major", "[distinguish newer image version]")
 {
     char versionLocal[] = "2.2.3";  //current running image
     char versionRemote[] = "1.2.3"; //image from server
-    TEST_ASSERT_FALSE( bNewerVersion(versionLocal, versionRemote)  );
+    TEST_ASSERT_FALSE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
 }
 
 TEST_CASE("Remote got alpha and patch", "[distinguish newer image version]")
 {
     char versionLocal[] = "2.2.3";  //current running image
     char versionRemote[] = "a2.2.4"; //image from server
-    TEST_ASSERT_TRUE( bNewerVersion(versionLocal, versionRemote)  );
+    TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
 }
 
 TEST_CASE("Remote got max", "[distinguish newer image version]")
 {
     char versionLocal[] = "2.2.3";  //current running image
     char versionRemote[] = "999.999.999"; //image from server
-    TEST_ASSERT_TRUE( bNewerVersion(versionLocal, versionRemote)  );
+    TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
 }
 
 // ### ### ###  find start offset in firmware image ### ### ###
@@ -68,7 +68,7 @@ TEST_CASE("with http response +  0.0.1", "[find start offset in firmware image]"
 {
     uint32_t u32StartOffset;
     uint32_t u32DataLenght = sizeof(dataWithHttpRespone0_0_1)/sizeof(dataWithHttpRespone0_0_1[0]);
-    esp_err_t err = errFindImageStart(dataWithHttpRespone0_0_1, &u32DataLenght, &u32StartOffset);
+    esp_err_t err = errMeshOtaUtilFindImageStart(dataWithHttpRespone0_0_1, &u32DataLenght, &u32StartOffset);
     if(err == ESP_OK)
     {
         TEST_ASSERT_EQUAL_INT(305, u32StartOffset);
@@ -83,7 +83,7 @@ TEST_CASE("without http response +  0.0.1", "[find start offset in firmware imag
 {
     uint32_t u32StartOffset;
     uint32_t u32DataLenght = sizeof(dataWithoutHttpRespone0_0_1)/sizeof(dataWithoutHttpRespone0_0_1[0]);
-    esp_err_t err =  errFindImageStart(dataWithoutHttpRespone0_0_1, &u32DataLenght, &u32StartOffset);
+    esp_err_t err =  errMeshOtaUtilFindImageStart(dataWithoutHttpRespone0_0_1, &u32DataLenght, &u32StartOffset);
     if(err == ESP_OK)
     {
         TEST_ASSERT_EQUAL_INT(0, u32StartOffset);
@@ -99,7 +99,7 @@ TEST_CASE("with http response +  999.999.999", "[find start offset in firmware i
 {
     uint32_t u32StartOffset;
     uint32_t u32DataLenght = sizeof(dataWithHttpRespone999_999_999)/sizeof(dataWithHttpRespone999_999_999[0]);
-    esp_err_t err = errFindImageStart(dataWithHttpRespone999_999_999, &u32DataLenght, &u32StartOffset);
+    esp_err_t err = errMeshOtaUtilFindImageStart(dataWithHttpRespone999_999_999, &u32DataLenght, &u32StartOffset);
     if(err == ESP_OK)
     {
         TEST_ASSERT_EQUAL_INT(305, u32StartOffset);
@@ -114,7 +114,7 @@ TEST_CASE("without http response +  999.999.999", "[find start offset in firmwar
 {
     uint32_t u32StartOffset;
     uint32_t u32DataLenght = sizeof(dataWithoutHttpRespone999_999_999)/sizeof(dataWithoutHttpRespone999_999_999[0]);
-    esp_err_t err = errFindImageStart(dataWithoutHttpRespone999_999_999, &u32DataLenght, &u32StartOffset);
+    esp_err_t err = errMeshOtaUtilFindImageStart(dataWithoutHttpRespone999_999_999, &u32DataLenght, &u32StartOffset);
     if(err == ESP_OK)
     {
         TEST_ASSERT_EQUAL_INT(0, u32StartOffset);
@@ -129,7 +129,7 @@ TEST_CASE("with http response +  999.9.999", "[find start offset in firmware ima
 {
     uint32_t u32StartOffset;
     uint32_t u32DataLenght = sizeof(dataWithHttpRespone999_9_999)/sizeof(dataWithHttpRespone999_9_999[0]);
-    esp_err_t err = errFindImageStart(dataWithHttpRespone999_9_999, &u32DataLenght, &u32StartOffset);
+    esp_err_t err = errMeshOtaUtilFindImageStart(dataWithHttpRespone999_9_999, &u32DataLenght, &u32StartOffset);
     if(err == ESP_OK)
     {
         TEST_ASSERT_EQUAL_INT(302, u32StartOffset);
@@ -144,7 +144,7 @@ TEST_CASE("with http response +  999.99.999", "[find start offset in firmware im
 {
     uint32_t u32StartOffset;
     uint32_t u32DataLenght = sizeof(dataWithHttpRespone999_99_999)/sizeof(dataWithHttpRespone999_99_999[0]);
-    esp_err_t err = errFindImageStart(dataWithHttpRespone999_99_999, &u32DataLenght, &u32StartOffset);
+    esp_err_t err = errMeshOtaUtilFindImageStart(dataWithHttpRespone999_99_999, &u32DataLenght, &u32StartOffset);
     if(err == ESP_OK)
     {
         TEST_ASSERT_EQUAL_INT(299, u32StartOffset);
@@ -162,10 +162,10 @@ TEST_CASE("extract version 0.0.1", "[extract image version number]")
     char versionLocal[] = "0.0.0";  //current running image
     char versionRemote[12];//image from server
     uint32_t u32DataLenght = sizeof(dataWithHttpRespone0_0_1)/sizeof(dataWithHttpRespone0_0_1[0]);
-    esp_err_t err = errExtractVersionNumber(dataWithHttpRespone0_0_1, &u32DataLenght, versionRemote);
+    esp_err_t err = errMeshOtaUtilExtractVersionNumber(dataWithHttpRespone0_0_1, &u32DataLenght, versionRemote);
     if(err == ESP_OK)
     {
-        TEST_ASSERT_TRUE( bNewerVersion(versionLocal, versionRemote)  );
+        TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
     }
     else
     {
@@ -178,10 +178,10 @@ TEST_CASE("extract version 999.999.999", "[extract image version number]")
     char versionLocal[] = "0.0.0";  //current running image
     char versionRemote[12];//image from server
     uint32_t u32DataLenght = sizeof(dataWithHttpRespone999_999_999)/sizeof(dataWithHttpRespone999_999_999[0]);
-    esp_err_t err = errExtractVersionNumber(dataWithHttpRespone999_999_999, &u32DataLenght, versionRemote);
+    esp_err_t err = errMeshOtaUtilExtractVersionNumber(dataWithHttpRespone999_999_999, &u32DataLenght, versionRemote);
     if(err == ESP_OK)
     {
-        TEST_ASSERT_TRUE( bNewerVersion(versionLocal, versionRemote)  );
+        TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
     }
     else
     {
@@ -194,10 +194,10 @@ TEST_CASE("extract version 999.99.999", "[extract image version number]")
     char versionLocal[] = "999.100.999";  //current running image
     char versionRemote[12];//image from server
     uint32_t u32DataLenght = sizeof(dataWithHttpRespone999_99_999)/sizeof(dataWithHttpRespone999_99_999[0]);
-    esp_err_t err = errExtractVersionNumber(dataWithHttpRespone999_99_999, &u32DataLenght, versionRemote);
+    esp_err_t err = errMeshOtaUtilExtractVersionNumber(dataWithHttpRespone999_99_999, &u32DataLenght, versionRemote);
     if(err == ESP_OK)
     {
-        TEST_ASSERT_FALSE( bNewerVersion(versionLocal, versionRemote)  );
+        TEST_ASSERT_FALSE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
     }
     else
     {

main/Blinky_LED.c

@@ -0,0 +1,246 @@
+/**
+* @file Blinky_LED.c
+* @brief Demo application using the mesh network
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Additional Infos: If button "BOOT" on ESP32-Module is pressed, all LED2 (blue) in the network will toggle the state.
+*/
+
+#include "Blinky_LED.h"
+
+static const char *LOG_TAG = "blinky_led";
+static bool bLEDisOn = false; //set led default off
+static mesh_addr_t addrParent; //addr of parent node
+static mesh_addr_t childrenAddr[CONFIG_MESH_ROUTE_TABLE_SIZE]; //array of children attached to this node
+static uint16_t u16ChildrenSize; //number of children attached to this node
+xQueueHandle queueBlinkyLEDPackets; //handle for led action queue
+
+/**
+* @fn esp_err_t errBlinkyLEDInitialize()
+* @brief Starts the demp app
+* @param void
+* @return ESP32 error code
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Initialize the queue and starts the tasks
+*/
+esp_err_t errBlinkyLEDInitialize(void)
+{
+    esp_err_t err = ESP_OK;
+    BaseType_t xReturned;
+
+    vGPIOInitialize();
+
+    //create queue to store led action created from BTN and mesh network events
+    queueBlinkyLEDPackets = xQueueCreate(5, sizeof(BLINKY_PACKET_t));
+    if (queueBlinkyLEDPackets == 0)  // Queue not created
+        {
+            ESP_LOGE(LOG_TAG, "Unable to create Queue for Application Packets");
+            err = ESP_FAIL;
+        }
+
+    //register the receiver handle in mesh network
+    ERROR_CHECK(errMeshNetworkSetAppReceiveHandle(rxHandle));
+
+    if(err == ESP_OK)
+        {
+            xReturned = xTaskCreate(vTaskReadUserInput, "vTaskReadUserInput", 4096, NULL, 5, NULL);
+            if(xReturned != pdPASS)
+                {
+                    err = ESP_FAIL;
+                }
+        }
+
+    if(err == ESP_OK)
+        {
+            xReturned = xTaskCreate(vTaskReceiveData, "vTaskReceiveData", 4096, NULL, 5, NULL);
+            if(xReturned != pdPASS)
+                {
+                    err = ESP_FAIL;
+                }
+        }
+    return err;
+}
+
+/**
+* @fn void vGPIOInitialize(void)
+* @brief sets the GPIO pins to correct modes
+* @param void
+* @return void
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Initialize GPIO
+*/
+void vGPIOInitialize(void)
+{
+    gpio_config_t gpioConf;
+
+    //LED as Output
+    gpio_reset_pin(GPIO_LED);
+    gpio_set_direction(GPIO_LED, GPIO_MODE_OUTPUT);
+
+    //BTN as Input
+    gpioConf.intr_type = GPIO_INTR_DISABLE;
+    gpioConf.mode = GPIO_MODE_INPUT;
+    gpioConf.pin_bit_mask = GPIO_INPUT_PIN_SEL;
+    gpioConf.pull_down_en = 0;
+    gpioConf.pull_up_en = 1;
+    gpio_config(&gpioConf);
+}
+
+/**
+* @fn void rxHandle(const uint8_t* const pu8Data, const uint8_t* const pu8Sender)
+* @brief callback handler from mesh network layer
+* @param pu8Data data received
+* @param pu8Sender sender node from data
+* @return void
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Adds the data into queue
+*/
+void rxHandle(const uint8_t* const pu8Data, const uint8_t* const pu8Sender)
+{
+    //send payload to app queue
+    BLINKY_PACKET_t bTmpPacket;
+    memcpy(&bTmpPacket, (uint8_t *)pu8Data, sizeof(BLINKY_PACKET_t));
+    memcpy(&bTmpPacket.meshSenderAddr, (uint8_t *)pu8Sender, 6); //copy MAC from sender into app packet
+    if (xQueueSend(queueBlinkyLEDPackets, &bTmpPacket, portMAX_DELAY) != pdPASS)
+        {
+            ESP_LOGE(LOG_TAG, "Unable to push packet from mesh into Queue");
+        }
+}
+
+/**
+* @fn void vTaskReadUserInput(void *arg)
+* @brief FreeRTOS task reading the user input (button)
+* @param args parameter for task
+* @return void
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Adds a button press to the queue
+*/
+void vTaskReadUserInput(void *arg)
+{
+    esp_err_t err = ESP_OK;
+    BLINKY_PACKET_t bTmpPacket;
+    MESH_PACKET_t meshPacket;
+
+    bTmpPacket.type = LED_OFF; //default off
+    meshPacket.type = APP_Data; //this is a app packet
+
+    while(true)
+        {
+            //check for BTN press
+            if(gpio_get_level(GPIO_BOOT_BTN) == 0)
+                {
+                    err = ESP_OK;
+
+                    if(bLEDisOn == false)
+                        {
+                            bTmpPacket.type = LED_ON;
+                        }
+                    else
+                        {
+                            bTmpPacket.type = LED_OFF;
+                        }
+
+                    //push led action into queue
+                    if (xQueueSend(queueBlinkyLEDPackets, &bTmpPacket, portMAX_DELAY) != pdPASS)
+                        {
+                            ESP_LOGE(LOG_TAG, "Unable to push packet into queue");
+                        }
+
+                    memcpy(meshPacket.au8Payload, &bTmpPacket, sizeof(BLINKY_PACKET_t));
+
+                    if(bMeshNetworkIsRootNode() == false)
+                        {
+                            //this node is not root --> send led action to parent
+                            ERROR_CHECK(errMeshNetworkGetParentNode(&addrParent));
+                            ERROR_CHECK(errMeshNetworkSendMeshPacket(&addrParent, &meshPacket));
+                        }
+                    else
+                        {
+                            //this node is root --> send led action to children
+                            ERROR_CHECK(errMeshNetworkGetChildren(childrenAddr, &u16ChildrenSize));
+
+                            for (uint16_t u16Index = 0; u16Index < u16ChildrenSize; u16Index++)
+                                {
+                                    ERROR_CHECK (errMeshNetworkSendMeshPacket(&childrenAddr[u16Index], &meshPacket));
+                                }
+                        }
+                    vTaskDelay(200 / portTICK_PERIOD_MS);
+                }
+            vTaskDelay(50 / portTICK_PERIOD_MS);
+        }
+}
+
+/**
+* @fn void vTaskReceiveData(void *arg)
+* @brief FreeRTOS task reading queue and setting the LED
+* @param args parameter for task
+* @return void
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Sets the LED off or on based on data in queue
+*/
+void vTaskReceiveData(void *arg)
+{
+    esp_err_t err = ESP_OK;
+    MESH_PACKET_t meshPacket;
+    BLINKY_PACKET_t bTmpPacket;
+
+    bTmpPacket.type = LED_OFF; //default off
+    meshPacket.type = APP_Data; //this is a app packet
+
+    while (1)
+        {
+            if (xQueueReceive(queueBlinkyLEDPackets, &bTmpPacket, portMAX_DELAY) != pdTRUE)
+                {
+                    ESP_LOGE(LOG_TAG, "Unable to receive packet from Queue");
+                }
+            else
+                {
+                    err = ESP_OK;
+                    //Successfully RECEIVED the packet
+                    switch (bTmpPacket.type)
+                        {
+                        case LED_ON:
+                            bLEDisOn = true;
+                            gpio_set_level(GPIO_LED, 1); //switch on
+                            ESP_LOGI(LOG_TAG,"switch LED ON");
+                            break;
+
+                        case LED_OFF:
+                            bLEDisOn = false;
+                            gpio_set_level(GPIO_LED, 0); //switch off
+                            ESP_LOGI(LOG_TAG,"switch LED OFF");
+                            break;
+
+                        default:
+                            bLEDisOn = false;
+                            gpio_set_level(GPIO_LED, 0); //switch off
+                            ESP_LOGI(LOG_TAG,"switch LED OFF");
+                            break;
+                        }
+                }
+
+            ERROR_CHECK(errMeshNetworkGetChildren(childrenAddr, &u16ChildrenSize)); //get all children attached to this node
+            memcpy(meshPacket.au8Payload, &bTmpPacket, sizeof(BLINKY_PACKET_t)); //copy led action in mesh packet payload
+
+            for (uint16_t u16Index = 0; u16Index < u16ChildrenSize; u16Index++)
+                {
+                    //loop through children
+                    if(bMeshNetworkCheckMacEquality(bTmpPacket.meshSenderAddr.addr,  childrenAddr[u16Index].addr) == false) //exclude the sender node
+                        {
+                            ERROR_CHECK (errMeshNetworkSendMeshPacket(&childrenAddr[u16Index], &meshPacket)); //send to child
+                        }
+                }
+            vTaskDelay(200 / portTICK_PERIOD_MS);
+        }
+}

main/Blinky_LED.h

@@ -0,0 +1,49 @@
+/**
+* @file Blinky_LED.h
+* @brief Demo application using the mesh network
+* @author Hendrik Schutter
+* @date 20.01.2021
+*
+* Additional Infos: If button "BOOT" on ESP32-Module is pressed, all LED2 (blue) in the network will toggle the state.
+*/
+
+#ifndef H_BLINKY_LED
+#define H_BLINKY_LED
+
+#include <string.h>
+#include "esp_wifi.h"
+#include "esp_system.h"
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "driver/gpio.h"
+
+#include "Mesh_OTA.h"
+
+
+#define GPIO_BOOT_BTN   0 //GPIO0 (Boot BTN)
+#define GPIO_LED        2 //GPIO2 (internal blue LED in DevKit V1.0)
+
+#define GPIO_INPUT_PIN_SEL  (1ULL<<GPIO_BOOT_BTN)
+
+struct blinky_packet
+{
+    enum blinky_packet_type
+    {
+        LED_OFF,
+        LED_ON,
+    } type;
+    mesh_addr_t meshSenderAddr; //stores addr of sender of this packet
+};
+
+typedef struct blinky_packet BLINKY_PACKET_t;
+
+esp_err_t errBlinkyLEDInitialize(void);
+void vGPIOInitialize(void);
+void rxHandle(const uint8_t* const pu8Data, const uint8_t* const pu8Sender);
+void vTaskReadUserInput(void *arg);
+void vTaskReceiveData(void *arg);
+
+#endif /* H_BLINKY_LED */
+
+

main/CMakeLists.txt

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

main/Main.c

@@ -1,31 +1,31 @@
-
-#include <string.h>
-#include "esp_wifi.h"
+#include <stdio.h>
+#include "sdkconfig.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.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 "esp_spi_flash.h"
 
 #include "Mesh_OTA.h"
+#include "Blinky_LED.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"); 
+    ESP_LOGI(LOG_TAG, "hardcoded version: 0.0.1");
+
+    ESP_LOGI(LOG_TAG, "start mesh network");
     err = errMeshNetworkInitialize();
     ESP_ERROR_CHECK(err);
 
-    //start ota
-
-    //start app 
+    ESP_LOGI(LOG_TAG, "start ota");
+    err = errMeshOTAInitialize();
+    ESP_ERROR_CHECK(err);
 
+    ESP_LOGI(LOG_TAG, "start app");
+    err = errBlinkyLEDInitialize();
+    ESP_ERROR_CHECK(err);
 }
 
 

sdkconfig

@@ -159,7 +159,7 @@ 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_MESH_MESSAGE_SIZE=1234
 CONFIG_OTA_HTTPS_SERVER_COMMON_NAME="ota.hendrikschutter.com"
 CONFIG_OTA_HTTPS_SERVER_PORT="443"
 CONFIG_OTA_HTTPS_URL="https://ota.hendrikschutter.com/mesh_ota.bin"

style_code.sh

@@ -0,0 +1,15 @@
+#! /bin/bash
+
+cd main
+astyle --style=gnu *.c
+astyle --style=gnu *.h
+
+cd ..
+
+cd components/mesh_ota
+astyle --style=gnu *.c
+cd include
+astyle --style=gnu *.h
+
+
+