From ad91360cbf7d07a06b6581f4e827fc763caa6fcd Mon Sep 17 00:00:00 2001
From: Zoe Pfister <zoe.pfister@uibk.ac.at>
Date: Fri, 27 Jan 2023 10:59:41 +0100
Subject: [PATCH] Minor changes as suggested by markus
---
host/host_central_mast/src/main.cpp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/host/host_central_mast/src/main.cpp b/host/host_central_mast/src/main.cpp
index 63694b4..042d4e6 100644
--- a/host/host_central_mast/src/main.cpp
+++ b/host/host_central_mast/src/main.cpp
@@ -60,7 +60,7 @@ void on_data_sent(const uint8_t *mac_addr, esp_now_send_status_t status) {
}
void on_data_recv(const uint8_t *mac, const uint8_t *incomingData, int len) {
- esp_log_write(ESP_LOG_INFO, TAG_ESPNOW, "Message recieved\n");
+ esp_log_write(ESP_LOG_INFO, TAG_ESPNOW, "Message received\n");
// copy received data to a char array
char data[len];
memcpy(data, incomingData, len);
@@ -78,9 +78,7 @@ void on_data_recv(const uint8_t *mac, const uint8_t *incomingData, int len) {
}
}
- DynamicJsonDocument doc = parseReceivedJsonData(data);
-
- // TODO: Respond to the client. Maybe do that before parsing anything
+ // TODO: Think if response to client may contain error messages
response response = {};
response.type = dataAck;
esp_read_mac(response.mac, ESP_MAC_WIFI_STA);
@@ -88,6 +86,8 @@ void on_data_recv(const uint8_t *mac, const uint8_t *incomingData, int len) {
esp_err_t success = esp_now_send(mac, (uint8_t *)&response, sizeof(response));
esp_log_write(ESP_LOG_DEBUG, TAG_ESPNOW, (success == ESP_OK) ? "Response sent\n" : "Failed to respond\n");
+ DynamicJsonDocument doc = parseReceivedJsonData(data);
+
String macAddress = getMacAddressAsString(mac);
// add timestamp and mac address
@@ -190,9 +190,6 @@ void setup() {
0); /* Core where the task should run */
SerialAT.begin(UART_BAUD, SERIAL_8N1, PIN_RX, PIN_TX);
-
- // Restart takes quite some time
- // To skip it, call init() instead of restart()
}
void loop() {
--
GitLab