skruecken/esp_alox
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Reworked ESPNOW MessageBrokerTask

Browse Source
This commit is contained in:
simon 2025-08-18 20:27:30 +02:00
parent b29512d922
commit 8398442544
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
main/communication_handler.c
View File

@ -35,15 +35,12 @@ void ESP_RegisterTask(CommandPages command, ESP_RegisterTaskCallback callback) {
} }
void ESP_MessageBrokerTask(void *param) { void ESP_MessageBrokerTask(void *param) {
ParsedMessage_t received_msg; ESPNOW_MessageInfo received_msg;
MessageBrokerTaskParams_t *task_params = (MessageBrokerTaskParams_t *)param; ESP_MessageBrokerTaskParams_t *task_params =
(ESP_MessageBrokerTaskParams_t *)param;
// Extrahiere die einzelnen Parameter // Extrahiere die einzelnen Parameter
QueueHandle_t msg_queue = task_params->message_queue; QueueHandle_t msg_queue = task_params->message_queue;
uint8_t *send_message_buffer = task_params->send_buffer;
size_t send_message_buffer_size = task_params->send_buffer_size;
uint8_t *send_payload_buffer = task_params->payload_buffer;
size_t send_payload_buffer_size = task_params->payload_buffer_size;
if (msg_queue == NULL) { if (msg_queue == NULL) {
ESP_LOGE(TAG, "Message queue not initialized. Terminating task."); ESP_LOGE(TAG, "Message queue not initialized. Terminating task.");
@ -54,23 +51,21 @@ void ESP_MessageBrokerTask(void *param) {
while (1) { while (1) {
if (xQueueReceive(msg_queue, &received_msg, portMAX_DELAY)) { if (xQueueReceive(msg_queue, &received_msg, portMAX_DELAY)) {
//ESP_LOGI(TAG, "Received message from queue: MSGID=0x%02X, Length=%u",
// received_msg.msgid, received_msg.payload_len); const BaseMessage *message = (const BaseMessage *)received_msg.data;
for (int i = 0; i < mr.num_direct_callbacks; i++) { for (int i = 0; i < mr.num_direct_callbacks; i++) {
if (mr.FunctionList[i].MSGID == received_msg) { if (mr.FunctionList[i].MSGID == message->commandPage) {
mr.FunctionList[i].callback( mr.FunctionList[i].callback(received_msg.esp_now_info,
received_msg.msgid, received_msg.data, received_msg.payload_len, received_msg.data, received_msg.data_len);
send_payload_buffer, send_payload_buffer_size,
send_message_buffer, send_message_buffer_size);
} }
} }
for (int i = 0; i < mr.num_direct_callbacks; i++) { for (int i = 0; i < mr.num_direct_callbacks; i++) {
if (mr.FunctionList[i].MSGID == received_msg.msgid) { // if (mr.FunctionList[i].MSGID == received_msg.msgid) {
// TODO: Not yet implemented // TODO: Not yet implemented
// Only send data to task, task should be created beforhead and wait // Only send data to task, task should be created beforhead and wait
// for new data in the queue. // for new data in the queue.
} //}
} }
} }
} }

10
main/communication_handler.h
View File

@ -138,6 +138,16 @@ struct ESP_MessageBroker {
uint8_t num_task_callbacks; uint8_t num_task_callbacks;
}; };
typedef struct {
QueueHandle_t message_queue;
} ESP_MessageBrokerTaskParams_t;
typedef struct {
const esp_now_recv_info_t *esp_now_info;
const uint8_t *data;
int data_len;
} ESPNOW_MessageInfo;
void ESP_InitMessageBroker(); void ESP_InitMessageBroker();
void ESP_RegisterFunction(CommandPages command, void ESP_RegisterFunction(CommandPages command,
ESP_RegisterFunctionCallback callback); ESP_RegisterFunctionCallback callback);