esp_garden git · master

Rename ack to response

Christian Immanuel · 2025-10-26 06:15 · 93058cc5470134e14df4a7f39a3dea85eb652946

 client_sensor/ClientSensor.cpp | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/client_sensor/ClientSensor.cpp b/client_sensor/ClientSensor.cpp
index 57e6569..6b36039 100644
--- a/client_sensor/ClientSensor.cpp
+++ b/client_sensor/ClientSensor.cpp
@@ -2,9 +2,9 @@
 #include "secrets.h"
 
 volatile bool rtc_synced_with_server = false;
-volatile bool ack_received = false;
+volatile bool response_received = false;
 volatile bool send_process_complete = false;
-volatile bool send_ack_process_complete = false;
+volatile bool send_response_process_complete = false;
 
 uint8_t config_request_attempts = 0;
 
@@ -162,7 +162,7 @@ void on_DataRecv(const esp_now_recv_info *info, const uint8_t *data, int len) {
 }
 
 
-void on_DataRecvAck(const esp_now_recv_info *info, const uint8_t *data, int len) {
+void on_DataRecvResponse(const esp_now_recv_info *info, const uint8_t *data, int len) {
     if (!info || !data || len <= 0) return;
 
     char msg[256];
@@ -178,7 +178,7 @@ void on_DataRecvAck(const esp_now_recv_info *info, const uint8_t *data, int len)
         struct timeval tv = { .tv_sec = server_unix, .tv_usec = 0 };
         settimeofday(&tv, nullptr);
         rtc_synced_with_server = true;
-        ack_received = true;
+        response_received = true;
         DBG_PRINTLN("System time updated from server (ACK).");
     }
 
@@ -212,8 +212,8 @@ void on_DataRecvAck(const esp_now_recv_info *info, const uint8_t *data, int len)
         cfg_ptr = end;
     }
 
-    DBG_PRINTLN("Setting send_ack_process_complete to TRUE");
-    send_ack_process_complete = true;
+    DBG_PRINTLN("Setting send_response_process_complete to TRUE");
+    send_response_process_complete = true;
 }
 
 void print_AllPeers() {
@@ -297,11 +297,11 @@ bool send_Message(const uint8_t* peer, const char* message) {
     return result == ESP_NOW_SEND_SUCCESS;
 }
 
-bool send_AndWaitAck(const uint8_t* peer, const char* message, uint32_t timeout_ms = 5000) {
-    send_ack_process_complete = false;
-    ack_received = false;
+bool send_AndWaitResponse(const uint8_t* peer, const char* message, uint32_t timeout_ms = 5000) {
+    send_response_process_complete = false;
+    response_received = false;
 
-    esp_now_register_recv_cb(on_DataRecvAck);
+    esp_now_register_recv_cb(on_DataRecvResponse);
 
     if (!send_Message(peer, message)) {
         DBG_PRINTLN("Failed to queue message for sending!");
@@ -309,11 +309,11 @@ bool send_AndWaitAck(const uint8_t* peer, const char* message, uint32_t timeout_
     }
 
     unsigned long start = millis();
-    while (!ack_received && millis() - start < timeout_ms) {
+    while (!response_received && millis() - start < timeout_ms) {
         delay(10);
     }
 
-    if (!ack_received) {
+    if (!response_received) {
         DBG_PRINT("No ACK received from ");
         printMac(peer);
         return false;
@@ -698,22 +698,22 @@ void send_DataToPeer(size_t config_id, uint32_t value) {
 
     DBG_PRINT("Sending to peer: ");
     printMac(p.pump_mac);
-    send_ack_process_complete = false;
-    if (!send_AndWaitAck(p.pump_mac, message)) {
+    send_response_process_complete = false;
+    if (!send_AndWaitResponse(p.pump_mac, message)) {
         DBG_PRINTLN("Delivery failed or peer offline!");
-        send_ack_process_complete = true;
+        send_response_process_complete = true;
     }
 
-    while (!send_ack_process_complete) delay(100);
+    while (!send_response_process_complete) delay(100);
 
     DBG_PRINT("Sending to peer: ");
     printMac(PEER_SERVER);
-    send_ack_process_complete = false;
-    if (!send_AndWaitAck(PEER_SERVER, message)) {
-        DBG_PRINTLN("Failed to get ack from server!");
-        send_ack_process_complete = true;
+    send_response_process_complete = false;
+    if (!send_AndWaitResponse(PEER_SERVER, message)) {
+        DBG_PRINTLN("Failed to get response from server!");
+        send_response_process_complete = true;
     }
-    while (!send_ack_process_complete) delay(100);
+    while (!send_response_process_complete) delay(100);
 }