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

Adjustes Target to ESP32S3 and made uart payload build static

Browse Source
This commit is contained in:
skruecken
2025-07-24 11:39:29 +02:00
parent 73d3e24786
commit 2bc6686d90
8 changed files with 881 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/client_handler.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef CLIENT_HANDLER_H
#define CLIENT_HANDLER_H
#include "portmacro.h"
#include "freertos/FreeRTOS.h"
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
main/main.c
+44 -41
View File
@@ -12,10 +12,8 @@
#include "message_parser.h"
#include "nvs_flash.h"
#include "glob.h"
#include "communication_handler.h"
#include "main.h"
#include "portmacro.h"
#include "uart_handler.h"
#include <stdbool.h>
#include <stddef.h>
@@ -25,26 +23,18 @@
#include "message_builder.h"
typedef struct {
QueueHandle_t message_queue;
uint8_t *send_buffer;
size_t send_buffer_size;
} MessageBrokerTaskParams_t;
static const char *TAG = "ALOX - MAIN";
static const uint16_t version = 0x0001;
static uint8_t send_message_buffer[1024];
static uint8_t send_message_payload_buffer[512 - 4];
static MessageBrokerTaskParams_t broker_task_params;
ClientList clientList = {.Clients = {{0}}, .ClientCount = 0};
typedef void (*RegisterTaskCallback)(uint8_t msgid, const uint8_t *payload,
size_t payload_len, uint8_t *send_buffer,
size_t send_buffer_size);
void echoCallback(uint8_t msgid, const uint8_t *payload, size_t payload_len,
uint8_t *send_payload_buffer, size_t send_payload_buffer_size,
uint8_t *send_buffer, size_t send_buffer_size) {
// Code für den Button-Press
ESP_LOGI(TAG, "Echo command 0x01...");
int len =
build_message(0x01, payload, payload_len, send_buffer, send_buffer_size);
@@ -60,18 +50,25 @@ void echoCallback(uint8_t msgid, const uint8_t *payload, size_t payload_len,
}
void versionCallback(uint8_t msgid, const uint8_t *payload, size_t payload_len,
uint8_t *send_buffer, size_t send_buffer_size) {
// Code für den Button-Press
uint8_t *send_payload_buffer,
size_t send_payload_buffer_size, uint8_t *send_buffer,
size_t send_buffer_size) {
ESP_LOGI(TAG, "Version command 0x02...");
size_t git_build_hash_len = strlen(BUILD_GIT_HASH);
size_t needed_buffer_size = 2 + git_build_hash_len;
uint8_t send_payload[2 + git_build_hash_len];
send_payload[0] = (uint8_t)(version & 0xFF);
send_payload[1] = (uint8_t)((version >> 8) & 0xFF);
memcpy(&send_payload[2], &BUILD_GIT_HASH, git_build_hash_len);
if (send_payload_buffer_size < needed_buffer_size) {
ESP_LOGE(TAG, "send_payload_buffer to small size %d need %d",
send_payload_buffer_size, needed_buffer_size);
return;
}
int len = build_message(0x02, send_payload, sizeof(send_payload), send_buffer,
send_buffer_size);
send_payload_buffer[0] = (uint8_t)(version & 0xFF);
send_payload_buffer[1] = (uint8_t)((version >> 8) & 0xFF);
memcpy(&send_payload_buffer[2], &BUILD_GIT_HASH, git_build_hash_len);
int len = build_message(0x02, send_payload_buffer, needed_buffer_size,
send_buffer, send_buffer_size);
if (len < 0) {
ESP_LOGE(TAG,
"Error Building UART Message: payload_len, %d, sendbuffer_size: "
@@ -83,19 +80,20 @@ void versionCallback(uint8_t msgid, const uint8_t *payload, size_t payload_len,
}
void clientInfoCallback(uint8_t msgid, const uint8_t *payload,
size_t payload_len, uint8_t *send_buffer,
size_t payload_len, uint8_t *send_payload_buffer,
size_t send_payload_buffer_size, uint8_t *send_buffer,
size_t send_buffer_size) {
ESP_LOGI(TAG, "Client Info Command 0x03...");
static uint8_t entryLength = 17;
uint8_t needed_buffer_size = 1 + entryLength * clientList.ClientCount;
ESP_LOGE(TAG, "clientList.ClientCount = %d", clientList.ClientCount);
if (send_payload_buffer_size < needed_buffer_size) {
ESP_LOGE(TAG, "send_payload_buffer to small size %d need %d",
send_payload_buffer_size, needed_buffer_size);
return;
}
uint8_t payload_size = 1 + entryLength * clientList.ClientCount;
ESP_LOGE(TAG, "payload_size = %d", payload_size);
uint8_t send_payload[payload_size];
send_payload[0] = clientList.ClientCount;
send_payload_buffer[0] = clientList.ClientCount;
uint8_t offsetMult = 0;
uint8_t used_slots = 0;
@@ -104,7 +102,6 @@ void clientInfoCallback(uint8_t msgid, const uint8_t *payload,
used_slots++;
}
}
ESP_LOGE("SPECIAL", "USED SLOTS: %d", used_slots);
uint8_t loop_sanity_counter = 0;
@@ -112,30 +109,33 @@ void clientInfoCallback(uint8_t msgid, const uint8_t *payload,
if (clientList.Clients[i].slotIsUsed) {
loop_sanity_counter++;
if (loop_sanity_counter > clientList.ClientCount) {
ESP_LOGE("SPECIAL", "DAS KANN NICHT SEIN");
ESP_LOGE("SPECIAL", "loop_santy_count: %d, client_count: %d", loop_sanity_counter, clientList.ClientCount);
ESP_LOGE("SPECIAL",
"ERROR SANITY CHECK FAILED: loop_sanity_count: %d, "
"client_count: %d",
loop_sanity_counter, clientList.ClientCount);
}
size_t offset = 1 + (entryLength * offsetMult++);
ESP_LOGE("SPECIAL", "OFFSET %d", offset);
send_payload[offset] = i;
send_payload[offset + 1] = clientList.Clients[i].isAvailable;
send_payload[offset + 2] = clientList.Clients[i].slotIsUsed;
memcpy(&send_payload[offset + 3], clientList.Clients[i].macAddr,
send_payload_buffer[offset] = i;
send_payload_buffer[offset + 1] = clientList.Clients[i].isAvailable;
send_payload_buffer[offset + 2] = clientList.Clients[i].slotIsUsed;
memcpy(&send_payload_buffer[offset + 3], clientList.Clients[i].macAddr,
MAC_LENGTH);
memcpy(&send_payload[offset + 9], &clientList.Clients[i].lastPing, 4);
memcpy(&send_payload[offset + 13],
memcpy(&send_payload_buffer[offset + 9], &clientList.Clients[i].lastPing,
4);
memcpy(&send_payload_buffer[offset + 13],
&clientList.Clients[i].lastSuccessfullPing, 4);
}
}
int len = build_message(0x04, send_payload, sizeof(send_payload), send_buffer,
send_buffer_size);
int len = build_message(0x04, send_payload_buffer, needed_buffer_size,
send_buffer, send_buffer_size);
if (len < 0) {
ESP_LOGE(TAG,
"Error Building UART Message: payload_len, %d, sendbuffer_size: "
"%d, mes_len(error): %d",
payload_len, send_buffer_size, len);
needed_buffer_size, send_buffer_size, len);
return;
}
uart_write_bytes(MASTER_UART, send_buffer, len);
@@ -203,6 +203,9 @@ void app_main(void) {
broker_task_params.message_queue = parsed_message_queue;
broker_task_params.send_buffer = send_message_buffer;
broker_task_params.send_buffer_size = sizeof(send_message_buffer);
broker_task_params.payload_buffer = send_message_payload_buffer;
broker_task_params.payload_buffer_size =
sizeof(send_message_payload_buffer);
xTaskCreate(MessageBrokerTask, "message_handler_task", 4096,
(void *)&broker_task_params, 5, NULL);
main/main.h
+1 -1
View File
@@ -14,6 +14,6 @@
#include <stdio.h>
#include <string.h>
#define MASTER_MODE_PIN GPIO_NUM_0 // Jumper-Erkennungspin
#define MASTER_MODE_PIN GPIO_NUM_1 // Jumper-Erkennungspin
#endif
main/message_handler.c
+3 -6
View File
@@ -6,12 +6,6 @@
static struct MessageBroker mr;
static char *TAG = "ALOX - Message Handler";
typedef struct {
QueueHandle_t message_queue;
uint8_t *send_buffer;
size_t send_buffer_size;
} MessageBrokerTaskParams_t;
void InitMessageBroker() {
mr.num_direct_callbacks = 0;
mr.num_task_callbacks = 0;
@@ -40,6 +34,8 @@ void MessageBrokerTask(void *param) {
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) {
ESP_LOGE(TAG, "Message queue not initialized. Terminating task.");
@@ -57,6 +53,7 @@ void MessageBrokerTask(void *param) {
if (mr.FunctionList[i].MSGID == received_msg.msgid) {
mr.FunctionList[i].callback(
received_msg.msgid, received_msg.data, received_msg.payload_len,
send_payload_buffer, send_payload_buffer_size,
send_message_buffer, send_message_buffer_size);
}
}
main/message_handler.h
+15 -1
View File
@@ -5,12 +5,26 @@
#include <stddef.h>
#include <stdint.h>
typedef struct {
QueueHandle_t message_queue;
uint8_t *send_buffer;
size_t send_buffer_size;
uint8_t *payload_buffer;
size_t payload_buffer_size;
} MessageBrokerTaskParams_t;
typedef void (*RegisterFunctionCallback)(uint8_t msgid, const uint8_t *payload,
size_t payload_len,
uint8_t *send_payload_buffer,
size_t send_payload_buffer_size,
uint8_t *send_buffer,
size_t send_buffer_size);
typedef void (*RegisterTaskCallback)(uint8_t msgid, const uint8_t *payload,
size_t payload_len, uint8_t *send_buffer,
size_t payload_len,
uint8_t *send_payload_buffer,
size_t send_payload_buffer_size,
uint8_t *send_buffer,
size_t send_buffer_size);
struct RegisterdFunction {
main/uart_handler.h
+2 -2
View File
@@ -7,8 +7,8 @@
#include <stdint.h>
#define MASTER_UART UART_NUM_1
#define TXD_PIN (GPIO_NUM_1)
#define RXD_PIN (GPIO_NUM_2)
#define TXD_PIN (GPIO_NUM_2)
#define RXD_PIN (GPIO_NUM_3)
#define BUF_SIZE (256)