localhorst/ESP32-Mesh-OTA
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: localhorst:feature/blockingOTA
Branches Tags
localhorst:master localhorst:develop localhorst:feature/blockingOTA localhorst:feature/https_client localhorst:feature/mesh_network localhorst:feature/ota_https
..
compare: localhorst:14028679e1e48fe8fb6f705fee97e4ac3a69bb52
Branches Tags
localhorst:master localhorst:develop localhorst:feature/blockingOTA localhorst:feature/https_client localhorst:feature/mesh_network localhorst:feature/ota_https

3 Commits
feature/bl ... 14028679e1

Author SHA1 Message Date
localhorst
14028679e1 fixing timeout and non-relevant OTA messages 2021-01-20 15:18:22 +01:00
localhorst
05dfe8528b fixed update of all neighbours after update 2021-01-20 13:43:41 +01:00
localhorst
f74985da4c fixed mesh OTA process 2021-01-20 11:20:35 +01:00
4 changed files with 314 additions and 400 deletions
Expand all files Collapse all files

324
components/mesh_ota/Mesh_OTA.c
View File

@ -11,12 +11,6 @@ SemaphoreHandle_t bsOTAProcess; //binary semaphore
const esp_partition_t* pOTAPartition; //pointer to ota partition const esp_partition_t* pOTAPartition; //pointer to ota partition
bool bWantReboot; //flag to signal pending reboot bool bWantReboot; //flag to signal pending reboot
bool bOtaAbortTx = false;
esp_partition_t* pBootPartitionTx; //pointer to boot partition (that will booted after reset)
uint32_t u32OTABytesWrittenTx = 0U;
uint32_t u32SegmentCounterTx = 0U;
bool bNodeIsRespondingTx = false; //remote node is still active
esp_err_t errMeshOTAInitialize() esp_err_t errMeshOTAInitialize()
{ {
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
@ -73,12 +67,8 @@ esp_err_t errMeshOTAInitialize()
} }
ERROR_CHECK(errMeshNetworkSetChildConnectedHandle(vAddNodeToPossibleUpdatableQueue)); ERROR_CHECK(errMeshNetworkSetChildConnectedHandle(vAddNodeToPossibleUpdatableQueue));
ERROR_CHECK(errMeshNetworkSetOTAMessageHandle(vAddOTAControllMessageToQueue)); ERROR_CHECK(errMeshNetworkSetOTAMessageHandleHandle(vAddOtaMessageToQueue));
ERROR_CHECK(errMeshNetworkSetChangeStateOfServerWorkerHandle(vChangeStateOfServerWorker)); ERROR_CHECK(errMeshNetworkSetChangeStateOfServerWorkerHandle(vChangeStateOfServerWorker));
ERROR_CHECK(errMeshNetworkSetOtaDataHandle(vRecOtaDataHandler));
ERROR_CHECK(errMeshNetworkSetOtaAckHandle(vRecOtaAckHandler));
//ERROR_CHECK(errMeshNetworkSetOtaCompleteHandle(vRecOtaCompleteHandler));
// ERROR_CHECK(errMeshNetworkSetOtaAbortHandle(vRecOtaAbortHandler));
if(err == ESP_OK) if(err == ESP_OK)
{ {
@ -131,7 +121,7 @@ void vAddNodeToPossibleUpdatableQueue(uint8_t* pu8MAC)
} }
} }
void vAddOTAControllMessageToQueue(MESH_PACKET_t* puMeshPacket) void vAddOtaMessageToQueue(MESH_PACKET_t* puMeshPacket)
{ {
//send ota packet to packet queue //send ota packet to packet queue
if (xQueueSend(queueMessageOTA, puMeshPacket, portMAX_DELAY) != pdPASS) if (xQueueSend(queueMessageOTA, puMeshPacket, portMAX_DELAY) != pdPASS)
@ -140,7 +130,21 @@ void vAddOTAControllMessageToQueue(MESH_PACKET_t* puMeshPacket)
} }
else else
{ {
ESP_LOGI(LOG_TAG, "added ota message to queue: %i (type)", puMeshPacket->type); switch (puMeshPacket->type)
{
case OTA_Abort:
ESP_LOGI(LOG_TAG, "added ota message to queue: OTA_Abort from 0x%x", puMeshPacket->meshSenderAddr.addr[5]);
break;
case OTA_Version_Request:
ESP_LOGI(LOG_TAG, "added ota message to queue: OTA_Version_Request from 0x%x", puMeshPacket->meshSenderAddr.addr[5]);
break;
case OTA_Version_Response:
ESP_LOGI(LOG_TAG, "added ota message to queue: OTA_Version Response from 0x%x", puMeshPacket->meshSenderAddr.addr[5]);
break;
default:
break;
}
} }
} }
@ -230,7 +234,7 @@ void vTaskOTAWorker(void *arg)
if(bWantReboot == true) if(bWantReboot == true)
{ {
ESP_LOGI(LOG_TAG, "ESP32 Reboot ..."); //ESP_LOGI(LOG_TAG, "ESP32 Reboot ...");
//vTaskDelay( (1000) / portTICK_PERIOD_MS); //vTaskDelay( (1000) / portTICK_PERIOD_MS);
//esp_restart(); //esp_restart();
} }
@ -264,7 +268,7 @@ void vTaskOTAWorker(void *arg)
bWantReboot = true; bWantReboot = true;
vAddAllNeighboursToQueue(); //add all existing neighbours to queue vAddAllNeighboursToQueue(); //add all existing neighbours to queue
} }
vTaskDelay( (1000) / portTICK_PERIOD_MS); //TODO this is debug vTaskDelay( (1000) / portTICK_PERIOD_MS);
} }
} }
@ -372,7 +376,7 @@ esp_err_t errOTAMeshSlave(bool* pbNewOTAImage)
pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running 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 metadata of partition ERROR_CHECK(esp_ota_get_partition_description(pBootPartition, &bootPartitionDesc)); //get metadata of partition
ESP_LOGI(LOG_TAG, "//send OTA_Version_Response to sender of OTA_Version_Request packet with version in payload"); //send OTA_Version_Response to sender of OTA_Version_Request packet wirh version in payload
ERROR_CHECK(errSendOTAVersionResponse(&sOTAMessage.meshSenderAddr)); ERROR_CHECK(errSendOTAVersionResponse(&sOTAMessage.meshSenderAddr));
if((bNewerVersion((bootPartitionDesc).version, (char*) sOTAMessage.au8Payload)) && (err == ESP_OK)) //compare local and remote version if((bNewerVersion((bootPartitionDesc).version, (char*) sOTAMessage.au8Payload)) && (err == ESP_OK)) //compare local and remote version
@ -412,14 +416,15 @@ esp_err_t errOTAMeshMaster(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr)
bNodeIsConnected = true; //node is one of the neighbours bNodeIsConnected = true; //node is one of the neighbours
xSemaphoreTake(bsOTAProcess, portMAX_DELAY); //wait for binary semaphore that allows to start the OTA process xSemaphoreTake(bsOTAProcess, portMAX_DELAY); //wait for binary semaphore that allows to start the OTA process
ESP_LOGI(LOG_TAG, "Mesh-Master: send Version_Request to 0x%x", pMeshNodeAddr->addr[5]);
ERROR_CHECK(errSendOTAVersionRequest(pMeshNodeAddr)); //send OTA_VERSION_REQUEST with local version in payload ERROR_CHECK(errSendOTAVersionRequest(pMeshNodeAddr)); //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 for (uint32_t u32Index = 0; u32Index < QUEUE_MESSAGE_OTA_SIZE; u32Index++) //loop through all OTA messages
{ {
//if(uxQueueSpacesAvailable(queueMessageOTA) < QUEUE_MESSAGE_OTA_SIZE) if(uxQueueSpacesAvailable(queueMessageOTA) < QUEUE_MESSAGE_OTA_SIZE)
// { {
//queue not empty //queue not empty
if (xQueueReceive(queueMessageOTA, &sOTAMessage, ((OTA_MESH_TIMEOUT) / portTICK_PERIOD_MS)) != pdTRUE) if (xQueueReceive(queueMessageOTA, &sOTAMessage, ((3000) / portTICK_PERIOD_MS)) != pdTRUE)
{ {
ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from queue"); ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from queue");
err = ESP_FAIL; err = ESP_FAIL;
@ -428,7 +433,6 @@ esp_err_t errOTAMeshMaster(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr)
if((err == ESP_OK) && (sOTAMessage.type == OTA_Version_Response) && (bCheckMACEquality(sOTAMessage.meshSenderAddr.addr, pMeshNodeAddr->addr))) //if OTA_Version_Request if((err == ESP_OK) && (sOTAMessage.type == OTA_Version_Response) && (bCheckMACEquality(sOTAMessage.meshSenderAddr.addr, pMeshNodeAddr->addr))) //if OTA_Version_Request
{ {
bNodeIsResponding = true; bNodeIsResponding = true;
u32Index = QUEUE_MESSAGE_OTA_SIZE; //this will exit the loop through all OTA messages
pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running 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 metadata of partition ERROR_CHECK(esp_ota_get_partition_description(pBootPartition, &bootPartitionDesc)); //get metadata of partition
@ -450,23 +454,24 @@ esp_err_t errOTAMeshMaster(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr)
} }
else if (err == ESP_OK) else if (err == ESP_OK)
{ {
ESP_LOGI(LOG_TAG, "//received from wrong node or type --> back to queue"); //received from wrong node or type --> back to queue
vAddOTAControllMessageToQueue(&sOTAMessage); vAddOtaMessageToQueue(&sOTAMessage);
}
} }
/* }
else else
{ {
ESP_LOGI(LOG_TAG, "// OTA Message queue is empty --> wait some time"); // OTA Message queue is empty --> wait some time
vTaskDelay(OTA_MESH_TIMEOUT*u32Index / portTICK_PERIOD_MS); ESP_LOGI(LOG_TAG, "OTA-Master: OTA Message queue is empty --> wait some time");
vTaskDelay( (1000/QUEUE_MESSAGE_OTA_SIZE) / portTICK_PERIOD_MS);
} }
*/
}//end loop }//end loop
xSemaphoreGive(bsOTAProcess); //free binary semaphore, this allows other tasks to start the OTA process xSemaphoreGive(bsOTAProcess); //free binary semaphore, this allows other tasks to start the OTA process
} }
if((bNodeIsResponding == false) && (bNodeIsConnected == true)) if((bNodeIsResponding == false) && (bNodeIsConnected == true))
{ {
ESP_LOGI(LOG_TAG, "//add node back to queue if connected and NOT responding"); //add node back to queue if connected and NOT responding
ESP_LOGI(LOG_TAG, "OTA-Master: connected and NOT responding --> add node back to queue ");
vAddNodeToPossibleUpdatableQueue(pMeshNodeAddr->addr); vAddNodeToPossibleUpdatableQueue(pMeshNodeAddr->addr);
} }
return err; return err;
@ -616,12 +621,12 @@ void vPrintOTAProgress(const uint32_t* const pu32TotalImageSize, const uint32_t*
{ {
if(eRole == Transmitter) if(eRole == Transmitter)
{ {
ESP_LOGE(LOG_TAG, "Transmitting OTA update: %i %%", u32Percentage); ESP_LOGI(LOG_TAG, "Transmitting OTA update: %i %%", u32Percentage);
} }
if(eRole == Receiver) if(eRole == Receiver)
{ {
ESP_LOGE(LOG_TAG, "Receiving OTA update: %i %%", u32Percentage); ESP_LOGI(LOG_TAG, "Receiving OTA update: %i %%", u32Percentage);
} }
@ -669,10 +674,33 @@ esp_err_t errSendOTAVersionResponse(mesh_addr_t* pMeshReceiverAddr)
pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running 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 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 memcpy(&packet.au8Payload, &bootPartitionDesc.version, 12); //copy local version to OTA_Version_Response packet
ESP_LOGI(LOG_TAG, "Send OTA_Version_Response to 0x%x", pMeshReceiverAddr->addr[5]);
err = errSendMeshPacket(pMeshReceiverAddr, &packet); err = errSendMeshPacket(pMeshReceiverAddr, &packet);
return err; return err;
} }
void vClearOtaMessageQueue(mesh_addr_t* pMeshNodeAddr)
{
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(!(bCheckMACEquality(sMeshPacket.meshSenderAddr.addr, pMeshNodeAddr->addr)))
{
//received OTA message is NOT from pMeshNodeAddr --> keep it in queue
vAddOtaMessageToQueue(&sMeshPacket);
}
else
{
ESP_LOGI(LOG_TAG, "Removed type %i from node 0x%x", sMeshPacket.type, pMeshNodeAddr->addr[5]);
}
}
}//end OTA message loop
}
esp_err_t errSendOTAVersionRequest(mesh_addr_t* pMeshReceiverAddr) esp_err_t errSendOTAVersionRequest(mesh_addr_t* pMeshReceiverAddr)
{ {
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
@ -692,54 +720,51 @@ esp_err_t errSendOTAVersionRequest(mesh_addr_t* pMeshReceiverAddr)
esp_err_t errOTAMeshTransmit(mesh_addr_t* pMeshNodeAddr) esp_err_t errOTAMeshTransmit(mesh_addr_t* pMeshNodeAddr)
{ {
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
//const esp_partition_t* pBootPartition; //pointer to boot partition (that will booted after reset) const esp_partition_t* pBootPartition; //pointer to boot partition (that will booted after reset)
MESH_PACKET_t sMeshPacket; //packet for sending and receiving MESH_PACKET_t sMeshPacket; //packet for sending and receiving
//uint32_t u32Index = 0U; //index for partition read offset // uint32_t u32Index = 0U; //index for partition read offset
//bool bAbort = false; //abort the OTA process bool bAbort = false; //abort the OTA process
//bool bNodeIsResponding = false; //remote node is still active bool bNodeIsResponding = false; //remote node is still active
//uint32_t u32OTABytesWritten = 0U; uint32_t u32OTABytesWritten = 0U;
//uint32_t u32SegmentCounter = 0U; uint32_t u32SegmentCounter = 0U;
pBootPartitionTx = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
u32OTABytesWrittenTx = 0U;
u32SegmentCounterTx = 0U;
bNodeIsRespondingTx = false; //remote node is still active
//loop through partition to read in segmensts until end or error or abort called //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)) while( ((OTA_MESH_SEGMENT_SIZE * u32SegmentCounter) < pBootPartition->size) && (err == ESP_OK) && (bAbort == false))
{ {
//bNodeIsResponding = false; //reset to default bNodeIsResponding = false; //reset to default
/*
ESP_LOGI(LOG_TAG, "// read partition with offset based in index"); // read partition with offset based in index
ERROR_CHECK(esp_partition_read(pBootPartition, (OTA_MESH_SEGMENT_SIZE * u32Index), sMeshPacket.au8Payload, OTA_MESH_SEGMENT_SIZE)); ERROR_CHECK(esp_partition_read(pBootPartition, (OTA_MESH_SEGMENT_SIZE * u32SegmentCounter), sMeshPacket.au8Payload, OTA_MESH_SEGMENT_SIZE));
u32OTABytesWritten = ((u32SegmentCounter+1) * OTA_MESH_SEGMENT_SIZE); u32OTABytesWritten = ((u32SegmentCounter+1) * OTA_MESH_SEGMENT_SIZE);
vPrintOTAProgress(&(pBootPartition->size), &u32OTABytesWritten, Transmitter); vPrintOTAProgress(&(pBootPartition->size), &u32OTABytesWritten, Transmitter);
if(err == ESP_OK) if(err == ESP_OK)
{ {
//ESP_LOGI(LOG_TAG, "//no error while read --> send OTA_DATA packet"); //no error while read --> send OTA_DATA packet
sMeshPacket.type = OTA_Data; sMeshPacket.type = OTA_Data;
if((OTA_MESH_SEGMENT_SIZE * (u32SegmentCounter+1)) >= pBootPartition->size) //check if last segment if((OTA_MESH_SEGMENT_SIZE * (u32SegmentCounter+1)) >= pBootPartition->size) //check if last segment
{ {
ESP_LOGI(LOG_TAG, "//last partition image segment --> send OTA_Complete"); //last partition image segment --> send OTA_Complete
ESP_LOGI(LOG_TAG, "OTA-TX: last segment--> send Complete");
sMeshPacket.type = OTA_Complete; sMeshPacket.type = OTA_Complete;
ESP_LOGE(LOG_TAG, "u32SegmentCounter: %i", u32SegmentCounter);
} }
//ESP_LOGI(LOG_TAG, "OTA-TX: send packet");
err = errSendMeshPacket(pMeshNodeAddr, &sMeshPacket); err = errSendMeshPacket(pMeshNodeAddr, &sMeshPacket);
} }
else else
{ {
ESP_LOGI(LOG_TAG, "// error while read --> send OTA_ABORT and abort this OTA process"); // error while read --> send OTA_ABORT and abort this OTA process
sMeshPacket.type = OTA_Abort; sMeshPacket.type = OTA_Abort;
bAbort = true; bAbort = true;
ESP_LOGI(LOG_TAG, "OTA-TX: error while read --> send ABORT");
errSendMeshPacket(pMeshNodeAddr, &sMeshPacket); errSendMeshPacket(pMeshNodeAddr, &sMeshPacket);
} }
*/
// loop through all OTA messages or until abort is called or error // loop through all OTA messages or until abort is called or error
for (uint32_t u32Index = 0; ((u32Index < QUEUE_MESSAGE_OTA_SIZE) && (bOtaAbortTx == false)); u32Index++) //loop through all OTA messages for (uint32_t u32Index = 0; ((u32Index < QUEUE_MESSAGE_OTA_SIZE) && (bAbort == false) && (err == ESP_OK)); u32Index++) //loop through all OTA messages
{ {
// if(uxQueueSpacesAvailable(queueMessageOTA) < QUEUE_MESSAGE_OTA_SIZE) // if(uxQueueSpacesAvailable(queueMessageOTA) < QUEUE_MESSAGE_OTA_SIZE)
// { // {
@ -752,54 +777,56 @@ esp_err_t errOTAMeshTransmit(mesh_addr_t* pMeshNodeAddr)
if((err == ESP_OK) && (bCheckMACEquality(sMeshPacket.meshSenderAddr.addr, pMeshNodeAddr->addr))) //if OTA_Version_Request if((err == ESP_OK) && (bCheckMACEquality(sMeshPacket.meshSenderAddr.addr, pMeshNodeAddr->addr))) //if OTA_Version_Request
{ {
ESP_LOGI(LOG_TAG, "//packet from node received"); //packet from node received
switch (sMeshPacket.type) switch (sMeshPacket.type)
{ {
case OTA_ACK: //increase index for next round
u32Index++;
bNodeIsResponding = true;
u32Index = QUEUE_MESSAGE_OTA_SIZE;//this will end the loop through all OTA messages
break;
case OTA_Abort: //abort this OTA process case OTA_Abort: //abort this OTA process
bOtaAbortTx = true; bAbort = true;
bNodeIsRespondingTx = true; bNodeIsResponding = true;
break; break;
default: default:
ESP_LOGI(LOG_TAG, "//receives wrong OTA message type from node --> back to queue"); //receives wrong OTA message type from node --> back to queue
vAddOTAControllMessageToQueue(&sMeshPacket); //vAddOtaMessageToQueue(&sMeshPacket);
break; break;
} }
} }
else if (err == ESP_OK) else if (err == ESP_OK)
{ {
ESP_LOGI(LOG_TAG, "//received from wrong node --> back to queue"); //received from wrong node --> back to queue
vAddOTAControllMessageToQueue(&sMeshPacket); vAddOtaMessageToQueue(&sMeshPacket);
}
if(bNodeIsRespondingTx == false) /*
{
ESP_LOGI(LOG_TAG, "//no abort was called but node didn’t responded");
bOtaAbortTx = true;
err = ESP_FAIL; //this OTA process failed with error
} }
else else
{ {
bNodeIsRespondingTx = false; // OTA Message queue is empty --> wait some time
ESP_LOGI(LOG_TAG, "OTA-TX: ota message queue empty --> wait");
vTaskDelay( (OTA_MESH_TIMEOUT) / portTICK_PERIOD_MS);
} }
*/
}
// }
// else
//{
// ESP_LOGI(LOG_TAG, "// OTA Message queue is empty --> wait some time");
//vTaskDelay(OTA_MESH_TIMEOUT*u32Index/ portTICK_PERIOD_MS);
// }
}//end OTA message loop }//end OTA message loop
} if(bNodeIsResponding == false)
// u32SegmentCounter++;
//}//end of partition segment loop
return err;
}
esp_err_t errOTAMeshReceive(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr)
{ {
//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
vClearOtaMessageQueue(pMeshNodeAddr);
return err;
}
esp_err_t errOTAMeshReceive(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr)
{
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
MESH_PACKET_t sMeshPacket; //packet for sending and receiving MESH_PACKET_t sMeshPacket; //packet for sending and receiving
bool bComplete = false; //complete the OTA process bool bComplete = false; //complete the OTA process
@ -831,76 +858,76 @@ esp_err_t errOTAMeshTransmit(mesh_addr_t* pMeshNodeAddr)
if((err == ESP_OK) && (bCheckMACEquality(sMeshPacket.meshSenderAddr.addr, pMeshNodeAddr->addr))) //if OTA_Version_Request if((err == ESP_OK) && (bCheckMACEquality(sMeshPacket.meshSenderAddr.addr, pMeshNodeAddr->addr))) //if OTA_Version_Request
{ {
ESP_LOGI(LOG_TAG, "//packet from node received"); //packet from node received
switch (sMeshPacket.type) switch (sMeshPacket.type)
{ {
case OTA_Complete: case OTA_Complete: //signal end of this OTA process, fall through because same behavior as OTA_Data
ESP_LOGI(LOG_TAG, "//signal end of this OTA process, fall through because same behavior as OTA_Data");
bComplete = true; bComplete = true;
ESP_LOGE(LOG_TAG, "after rec:Complete u32SegmentCounter: %i", u32SegmentCounter); ESP_LOGI(LOG_TAG, "OTA-RX: rec Complete --> last segment");
//fall through //fall through
case OTA_Data: case OTA_Data: //data segement received
ESP_LOGI(LOG_TAG, "//data segement received");
bNodeIsResponding = true; bNodeIsResponding = true;
u32Index = QUEUE_MESSAGE_OTA_SIZE; //this will exit the loop through all OTA messages
ERROR_CHECK(esp_ota_write(otaHandle, sMeshPacket.au8Payload, OTA_MESH_SEGMENT_SIZE)); ERROR_CHECK(esp_ota_write(otaHandle, sMeshPacket.au8Payload, OTA_MESH_SEGMENT_SIZE));
if(err != ESP_OK)
{
ESP_LOGE(LOG_TAG, "write error - Segement: %i", u32SegmentCounter);
}
u32OTABytesWritten = ((u32SegmentCounter+1) * OTA_MESH_SEGMENT_SIZE); u32OTABytesWritten = ((u32SegmentCounter+1) * OTA_MESH_SEGMENT_SIZE);
vPrintOTAProgress(&(pOTAPartition->size), &u32OTABytesWritten, Receiver); vPrintOTAProgress(&(pOTAPartition->size), &u32OTABytesWritten, Receiver);
u32Index = QUEUE_MESSAGE_OTA_SIZE; //this will end the loop through all OTA messages
break; break;
case OTA_Abort: //abort this OTA process case OTA_Abort: //abort this OTA process
bAbort = true; bAbort = true;
bNodeIsResponding = true; bNodeIsResponding = true;
ESP_LOGI(LOG_TAG, "OTA-RX: rec Abort");
//this will end the loop through all OTA messages
break; break;
default: default:
ESP_LOGI(LOG_TAG, "//receives wrong OTA message type from node --> back to queue"); //receives wrong OTA message type from node --> back to queue
vAddOTAControllMessageToQueue(&sMeshPacket); //vAddOtaMessageToQueue(&sMeshPacket);
break; break;
} }
} }
else if (err == ESP_OK) else if (err == ESP_OK)
{ {
ESP_LOGI(LOG_TAG, "//received from wrong node --> back to queue"); //received from wrong node --> back to queue
vAddOTAControllMessageToQueue(&sMeshPacket); vAddOtaMessageToQueue(&sMeshPacket);
} }
// }
// else /* }
// { else
// ESP_LOGI(LOG_TAG, "// OTA Message queue is empty --> wait some time"); {
// vTaskDelay((OTA_MESH_TIMEOUT*u32Index) / portTICK_PERIOD_MS); ESP_LOGI(LOG_TAG, "OTA-RX: ota message queue empty --> wait");
// } // OTA Message queue is empty --> wait some time
vTaskDelay( (OTA_MESH_TIMEOUT) / portTICK_PERIOD_MS);
}
*/
}//end of OTA message loop }//end of OTA message loop
if(bNodeIsResponding == false) if(bNodeIsResponding == false)
{ {
ESP_LOGI(LOG_TAG, "//no abort was called but node didn’t responded --> error"); //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 bAbort = true; //this will stop the partition segement loop
err = ESP_FAIL; //this OTA process failed with error err = ESP_FAIL; //this OTA process failed with error
} }
else else
{ {
ESP_LOGI(LOG_TAG, "//node has responded with OTA_DATA or OTA_Complete or OTA_ABORT"); //node has responded with OTA_DATA or OTA_Complete or OTA_ABORT
if(err == ESP_OK) if(err == ESP_OK)
{ {
if((bAbort == false) && (bComplete == false)) if(bAbort == false)
{ {
ESP_LOGI(LOG_TAG, "//no error while ota write --> send OTA_ACK packet"); //no error while ota write --> send OTA_ACK packet
//ESP_LOGI(LOG_TAG, "OTA-RX: no error while ota write --> send OTA_ACK packet");
sMeshPacket.type = OTA_ACK; sMeshPacket.type = OTA_ACK;
err = errSendMeshPacket(pMeshNodeAddr, &sMeshPacket); err = errSendMeshPacket(pMeshNodeAddr, &sMeshPacket);
} }
} }
else if (bComplete == false) else
{ {
ESP_LOGI(LOG_TAG, "// error while read --> send OTA_ABORT and abort this OTA process"); // error while read --> send OTA_ABORT and abort this OTA process
sMeshPacket.type = OTA_Abort; sMeshPacket.type = OTA_Abort;
bAbort = true; bAbort = true;
ESP_LOGI(LOG_TAG, "OTA-RX: abort --> send ABORT");
errSendMeshPacket(pMeshNodeAddr, &sMeshPacket); errSendMeshPacket(pMeshNodeAddr, &sMeshPacket);
} }
} }
@ -909,84 +936,21 @@ esp_err_t errOTAMeshTransmit(mesh_addr_t* pMeshNodeAddr)
if(bComplete == true) if(bComplete == true)
{ {
ESP_LOGI(LOG_TAG, "//all OTA segments received --> validate"); //all OTA segments received --> validate
ESP_LOGI(LOG_TAG, "OTA-RX: validate image ");
ERROR_CHECK(esp_ota_end(otaHandle)); ERROR_CHECK(esp_ota_end(otaHandle));
ERROR_CHECK(esp_ota_set_boot_partition(pOTAPartition)); ERROR_CHECK(esp_ota_set_boot_partition(pOTAPartition));
if(err == ESP_OK) if(err == ESP_OK)
{ {
ESP_LOGI(LOG_TAG, "//successfully updated OTA partition"); //successfully updated OTA partition
*pbNewOTAImage = true; *pbNewOTAImage = true;
} }
} }
else else
{ {
ESP_LOGI(LOG_TAG, "//not all OTA segments received --> abort this OTA process"); //not all OTA segments received --> abort this OTA process
ERROR_CHECK(esp_ota_abort(otaHandle)); ERROR_CHECK(esp_ota_abort(otaHandle));
} }
vClearOtaMessageQueue(pMeshNodeAddr);
return err; return err;
} }
void vRecOtaDataHandler(MESH_PACKET_t* puMeshPacket)
{
if(bOtaAbortTx == false)
{
}
}
void vRecOtaAckHandler(MESH_PACKET_t* puMeshPacket)
{
esp_err_t err = ESP_OK;
MESH_PACKET_t sMeshPacket; //packet for sending and receiving
if(bOtaAbortTx == false)
{
//sender node == ota node ?
bNodeIsRespondingTx = true;
ESP_LOGI(LOG_TAG, "// read partition with offset based in index");
ERROR_CHECK(esp_partition_read(pBootPartitionTx, (OTA_MESH_SEGMENT_SIZE * u32SegmentCounterTx), sMeshPacket.au8Payload, OTA_MESH_SEGMENT_SIZE));
u32OTABytesWrittenTx = ((u32SegmentCounterTx+1) * OTA_MESH_SEGMENT_SIZE);
vPrintOTAProgress(&(pBootPartitionTx->size), &u32OTABytesWrittenTx, Transmitter);
sMeshPacket.type = OTA_Data;
if(err != ESP_OK)
{
bOtaAbortTx = true;
sMeshPacket.type = OTA_Abort;
}
if((OTA_MESH_SEGMENT_SIZE * (u32SegmentCounterTx+1)) >= pBootPartitionTx->size) //check if last segment
{
ESP_LOGI(LOG_TAG, "//last partition image segment --> send OTA_Complete");
sMeshPacket.type = OTA_Complete;
ESP_LOGE(LOG_TAG, "u32SegmentCounterTx: %i", u32SegmentCounterTx);
}
err = errSendMeshPacket(&puMeshPacket->meshSenderAddr, &sMeshPacket);
u32SegmentCounterTx++;
}
}
/*
void vRecOtaCompleteHandler(MESH_PACKET_t* puMeshPacket)
{
return;
}
void vRecOtaAbortHandler(MESH_PACKET_t* puMeshPacket)
{
return;
}
*/

70
components/mesh_ota/Mesh_network.c
View File

@ -14,12 +14,6 @@ void (*pOTAChildConnectHandle)(uint8_t* );
void (*pOTAMessageHandle)(MESH_PACKET_t* ); void (*pOTAMessageHandle)(MESH_PACKET_t* );
void (*pChangeStateOfServerWorkerHandle)(bool ); void (*pChangeStateOfServerWorkerHandle)(bool );
void (*pOtaDataHandle)(MESH_PACKET_t* );
void (*pOtaAckHandle)(MESH_PACKET_t* );
void (*pOtaCompleteHandle)(MESH_PACKET_t* );
void (*pOtaAbortHandle)(MESH_PACKET_t* );
esp_err_t errMeshNetworkInitialize() esp_err_t errMeshNetworkInitialize()
{ {
//init module variables //init module variables
@ -133,6 +127,15 @@ bool bCheckMACEquality(uint8_t* pu8aMAC, uint8_t* pu8bMAC)
{ {
bRet = false; bRet = false;
} }
if(index == 5)
{
//last byte of mac
if(abs((pu8aMAC[index] - pu8bMAC[index])) <= 1)
{
bRet = true; //last byte differs 1 ore less
}
}
index++; index++;
} }
return bRet; return bRet;
@ -236,36 +239,12 @@ esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(u
return ESP_OK; return ESP_OK;
} }
esp_err_t errMeshNetworkSetOTAMessageHandle(void (*pOTAMessageHandleTmp)(MESH_PACKET_t* puMeshPacket)) esp_err_t errMeshNetworkSetOTAMessageHandleHandle(void (*pOTAMessageHandleTmp)(MESH_PACKET_t* puMeshPacket))
{ {
pOTAMessageHandle = pOTAMessageHandleTmp; pOTAMessageHandle = pOTAMessageHandleTmp;
return ESP_OK; return ESP_OK;
} }
esp_err_t errMeshNetworkSetOtaDataHandle(void (*pOtaDataHandleTmp)(MESH_PACKET_t* puMeshPacket))
{
pOtaDataHandle = pOtaDataHandleTmp;
return ESP_OK;
}
esp_err_t errMeshNetworkSetOtaAckHandle(void (*pOtaAckHandleTmp)(MESH_PACKET_t* puMeshPacket))
{
pOtaAckHandle = pOtaAckHandleTmp;
return ESP_OK;
}
esp_err_t errMeshNetworkSetOtaCompleteHandle(void (*pOtaCompleteHandleTmp)(MESH_PACKET_t* puMeshPacket))
{
pOtaCompleteHandle = pOtaCompleteHandleTmp;
return ESP_OK;
}
esp_err_t errMeshNetworkSetOtaAbortHandle(void (*pOtaAbortHandleTmp)(MESH_PACKET_t* puMeshPacket))
{
pOtaAbortHandle = pOtaAbortHandleTmp;
return ESP_OK;
}
esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(bool bState)) esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(bool bState))
{ {
pChangeStateOfServerWorkerHandle = pChangeStateOfServerWorkerHandleTmp; pChangeStateOfServerWorkerHandle = pChangeStateOfServerWorkerHandleTmp;
@ -332,6 +311,8 @@ void vTaskReceiveMeshData(void *arg)
break; break;
case OTA_Version_Request: case OTA_Version_Request:
case OTA_Version_Response: case OTA_Version_Response:
case OTA_Data:
case OTA_ACK:
case OTA_Complete: case OTA_Complete:
case OTA_Abort: case OTA_Abort:
//call the rx handle from OTA //call the rx handle from OTA
@ -340,31 +321,6 @@ void vTaskReceiveMeshData(void *arg)
pOTAMessageHandle(&packet); pOTAMessageHandle(&packet);
} }
break; break;
case OTA_Data:
if(pOtaDataHandle)
{
pOtaDataHandle(&packet);
}
break;
case OTA_ACK:
if(pOtaAckHandle)
{
pOtaAckHandle(&packet);
}
break;
/* case OTA_Complete:
if(pOtaCompleteHandle)
{
pOtaCompleteHandle(&packet);
}
break;
case OTA_Abort:
if(pOtaAbortHandle)
{
pOtaAbortHandle(&packet);
}
break;
*/
default: default:
ESP_LOGE(LOG_TAG, "recv: something"); ESP_LOGE(LOG_TAG, "recv: something");
break; break;
@ -374,3 +330,5 @@ void vTaskReceiveMeshData(void *arg)

10
components/mesh_ota/include/Mesh_OTA.h
View File

@ -23,7 +23,7 @@
#define OTA_HTTPS_SEGMENT_SIZE 2048U #define OTA_HTTPS_SEGMENT_SIZE 2048U
#define OTA_PROGRESS_LOG_INTERVAL 7U #define OTA_PROGRESS_LOG_INTERVAL 7U
#define OTA_MESH_SEGMENT_SIZE MESH_NETWORK_PAYLOAD_SIZE #define OTA_MESH_SEGMENT_SIZE MESH_NETWORK_PAYLOAD_SIZE
#define OTA_MESH_TIMEOUT 100U //in ms #define OTA_MESH_TIMEOUT 20000U //in ms
#define ERROR_CHECK(x) if (err == ESP_OK) \ #define ERROR_CHECK(x) if (err == ESP_OK) \
{ \ { \
@ -59,17 +59,13 @@ void vPrintOTAProgress(const uint32_t* const pu32TotalImageSize, const uint32_t*
void vAddAllNeighboursToQueue(void); void vAddAllNeighboursToQueue(void);
esp_err_t errSendOTAVersionResponse(mesh_addr_t* meshReceiverAddr); esp_err_t errSendOTAVersionResponse(mesh_addr_t* meshReceiverAddr);
esp_err_t errSendOTAVersionRequest(mesh_addr_t* meshReceiverAddr); esp_err_t errSendOTAVersionRequest(mesh_addr_t* meshReceiverAddr);
void vClearOtaMessageQueue(mesh_addr_t* pMeshNodeAddr);
//Handler //Handler
void vAddNodeToPossibleUpdatableQueue(uint8_t* pu8MAC); void vAddNodeToPossibleUpdatableQueue(uint8_t* pu8MAC);
void vAddOTAControllMessageToQueue(MESH_PACKET_t* puMeshPacket); void vAddOtaMessageToQueue(MESH_PACKET_t* puMeshPacket);
void vChangeStateOfServerWorker(bool state); void vChangeStateOfServerWorker(bool state);
void vRecOtaDataHandler(MESH_PACKET_t* puMeshPacket);
void vRecOtaAckHandler(MESH_PACKET_t* puMeshPacket);
//void vRecOtaCompleteHandler(MESH_PACKET_t* puMeshPacket);
//void vRecOtaAbortHandler(MESH_PACKET_t* puMeshPacket);
//Tasks //Tasks
void vTaskServerWorker(void *arg); void vTaskServerWorker(void *arg);
void vTaskOTAWorker(void *arg); void vTaskOTAWorker(void *arg);

8
components/mesh_ota/include/Mesh_network.h
View File

@ -8,6 +8,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "esp_mesh.h" #include "esp_mesh.h"
#include "esp_mesh_internal.h" #include "esp_mesh_internal.h"
#include <stdlib.h>
#ifndef CONFIG_MESH_MESSAGE_SIZE #ifndef CONFIG_MESH_MESSAGE_SIZE
#define CONFIG_MESH_MESSAGE_SIZE 1500 #define CONFIG_MESH_MESSAGE_SIZE 1500
@ -80,12 +81,7 @@ esp_err_t errMeshNetworkInitializeRouter(mesh_cfg_t* cfg);
esp_err_t errMeshNetworkSetAppReceiveHandle(void (*pAppRxHandleTmp)(uint8_t * pu8Data, uint8_t* pu8Sender)); esp_err_t errMeshNetworkSetAppReceiveHandle(void (*pAppRxHandleTmp)(uint8_t * pu8Data, uint8_t* pu8Sender));
esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(uint8_t * pu8Data)); esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(uint8_t * pu8Data));
esp_err_t errMeshNetworkSetOTAMessageHandle(void (*pOTAMessageHandleTmp)(MESH_PACKET_t* puMeshPacket)); esp_err_t errMeshNetworkSetOTAMessageHandleHandle(void (*pOTAMessageHandleTmp)(MESH_PACKET_t* puMeshPacket));
esp_err_t errMeshNetworkSetOtaDataHandle(void (*pOtaDataHandleTmp)(MESH_PACKET_t* puMeshPacket));
esp_err_t errMeshNetworkSetOtaAckHandle(void (*pOtaAckHandleTmp)(MESH_PACKET_t* puMeshPacket));
esp_err_t errMeshNetworkSetOtaCompleteHandle(void (*pOtaCompleteHandleTmp)(MESH_PACKET_t* puMeshPacket));
esp_err_t errMeshNetworkSetOtaAbortHandle(void (*pOtaAbortHandleTmp)(MESH_PACKET_t* puMeshPacket));
esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(bool bState)); esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(bool bState));