fixed update of all neighbours after update
This commit is contained in:
parent
f74985da4c
commit
05dfe8528b
|
@ -130,7 +130,21 @@ void vAddOTAControllMessageToQueue(MESH_PACKET_t* puMeshPacket)
|
|||
}
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -216,7 +230,7 @@ void vTaskOTAWorker(void *arg)
|
|||
if((uxQueueSpacesAvailable(queueNodes) - QUEUE_NODES_SIZE) == 0)
|
||||
{
|
||||
//nodes queue is empty
|
||||
// ESP_LOGI(LOG_TAG, "nodes queue is empty");
|
||||
ESP_LOGI(LOG_TAG, "nodes queue is empty");
|
||||
|
||||
if(bWantReboot == true)
|
||||
{
|
||||
|
@ -402,6 +416,7 @@ esp_err_t errOTAMeshMaster(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr)
|
|||
bNodeIsConnected = true; //node is one of the neighbours
|
||||
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
|
||||
|
||||
for (uint32_t u32Index = 0; u32Index < QUEUE_MESSAGE_OTA_SIZE; u32Index++) //loop through all OTA messages
|
||||
|
@ -446,6 +461,7 @@ esp_err_t errOTAMeshMaster(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr)
|
|||
else
|
||||
{
|
||||
// OTA Message queue is empty --> wait some time
|
||||
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
|
||||
|
@ -455,6 +471,7 @@ esp_err_t errOTAMeshMaster(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr)
|
|||
if((bNodeIsResponding == false) && (bNodeIsConnected == true))
|
||||
{
|
||||
//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);
|
||||
}
|
||||
return err;
|
||||
|
@ -711,7 +728,7 @@ esp_err_t errOTAMeshTransmit(mesh_addr_t* pMeshNodeAddr)
|
|||
ESP_LOGI(LOG_TAG, "OTA-TX: last segment--> send Complete");
|
||||
sMeshPacket.type = OTA_Complete;
|
||||
}
|
||||
ESP_LOGI(LOG_TAG, "OTA-TX: send packet");
|
||||
//ESP_LOGI(LOG_TAG, "OTA-TX: send packet");
|
||||
err = errSendMeshPacket(pMeshNodeAddr, &sMeshPacket);
|
||||
}
|
||||
else
|
||||
|
@ -876,7 +893,7 @@ esp_err_t errOTAMeshReceive(bool* pbNewOTAImage, mesh_addr_t* pMeshNodeAddr)
|
|||
if(bAbort == false)
|
||||
{
|
||||
//no error while ota write --> send OTA_ACK packet
|
||||
ESP_LOGI(LOG_TAG, "OTA-RX: 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;
|
||||
err = errSendMeshPacket(pMeshNodeAddr, &sMeshPacket);
|
||||
}
|
||||
|
|
|
@ -127,6 +127,16 @@ bool bCheckMACEquality(uint8_t* pu8aMAC, uint8_t* pu8bMAC)
|
|||
{
|
||||
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++;
|
||||
}
|
||||
return bRet;
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include "esp_log.h"
|
||||
#include "esp_mesh.h"
|
||||
#include "esp_mesh_internal.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifndef CONFIG_MESH_MESSAGE_SIZE
|
||||
#define CONFIG_MESH_MESSAGE_SIZE 1500
|
||||
|
|
Loading…
Reference in New Issue