made progress android example sending remote bin to arduino example

arduino-example/src/main.cpp

@@ -43,6 +43,8 @@ auto *aBin = "a_bin";
 auto *eBin = "e_bin";
 auto *aControl = "a_control";
 auto *eControl = "e_control";
+auto *aError = "a_error";
+auto *eError = "e_error";
 
 int status = WL_IDLE_STATUS;
 unsigned long lastStatusCheck = 0;
@@ -77,11 +79,11 @@ void printWiFiStatus() {
         Serial.print("SSID: ");
         Serial.println(WiFi.SSID());
 
-        Serial.print("IP Address: ");
+        Serial.print("IP address: ");
         Serial.println(ip);
 
         const long rssi = WiFi.RSSI();
-        Serial.print("Signal Strength (RSSI): ");
+        Serial.print("Signal strength (RSSI): ");
         Serial.print(rssi);
         Serial.println(" dBm");
 
@@ -110,8 +112,7 @@ void setup() {
     matrix.endText(SCROLL_LEFT);
     matrix.endDraw();
 
-    Serial.println("Wi-Fi: Station Mode");
-
+    Serial.println("Wi-Fi started in station mode");
     Serial.print("Attempting to connect to SSID: ");
     Serial.println(ssid);
 
@@ -127,14 +128,43 @@ void setup() {
     }
 }
 
+void onConnected(WiFiClient *client) {
+    client->flush();
+    Serial.println("Client connected");
+    client->println(eHello);
+}
+
+void onDisconnected(WiFiClient *client) {
+    remoteClose();
+    client->flush();
+    client->stop();
+    Serial.println("Client disconnected");
+}
+
+void onError(WiFiClient *client) {
+    client->flush();
+    client->stop();
+}
+
 void onCommand(const String *command, WiFiClient *client) {
     if (command->startsWith(aHello)) {
+        Serial.println("Received hello command");
         client->println(eBin);
         client->flush();
     } else if (command->startsWith(aBin)) {
         Serial.println("Received bin command");
-        Serial.println(*command);
-        onRemoteBin(command->c_str());
+        if (remoteOpen(command->c_str()) > 0) {
+            client->println(eControl);
+        } else {
+            Serial.println("Failed to parse bin command");
+            client->println(eError);
+        }
+    } else if (command->startsWith(aControl)) {
+        Serial.println("Received control command");
+        remoteControl(command->c_str());
+    } else if (command->startsWith(aError)) {
+        Serial.println("Received error command");
+        onError(client);
     }
 }
 
@@ -150,21 +180,17 @@ void loop() {
         client = server.available();
         if (client.connected()) {
             if (false == clientConnected) {
-                client.flush();
-                Serial.println("We have a new client");
-                client.println("e_hello");
-                clientConnected = true;
+                onConnected(&client);
             }
-
+            clientConnected = true;
             if (client.available()) {
-                String received = client.readStringUntil('\n');
+                const String received = client.readStringUntil('\n');
                 Serial.println(received);
                 onCommand(&received, &client);
             }
         } else {
             if (clientConnected) {
-                client.stop();
-                Serial.println("Client disconnected");
+                onDisconnected(&client);
             }
             clientConnected = false;
         }

arduino-example/src/remote.cpp

@@ -43,7 +43,7 @@ int remoteBinLen = 0;
 
 
 // public function definitions
-int onRemoteBin(const char *binStr) {
+int remoteOpen(const char *binStr) {
     char *aBinCommand[ABIN_COMMAND_SEG];
     char *remoteBinStr = nullptr;
     int categoryId = 0;
@@ -53,7 +53,8 @@ int onRemoteBin(const char *binStr) {
 
     aBinCommandSeg = splitString(binStr, aBinCommand, ABIN_COMMAND_SEG, ",");
     if (ABIN_COMMAND_SEG != aBinCommandSeg) {
-        Serial.println("Invalid aBinCommand");
+        Serial.print("Invalid aBin command: ");
+        Serial.println(binStr);
         return -1;
     }
     categoryId = strtol(aBinCommand[SEG_ABIN_CATE], nullptr, 10);
@@ -61,7 +62,7 @@ int onRemoteBin(const char *binStr) {
     remoteBinBase64Len = strtol(aBinCommand[SEG_ABIN_LENGTH], nullptr, 10);
     remoteBinStr = aBinCommand[SEG_ABIN_BIN];
     if (remoteBinBase64Len != strlen(remoteBinStr)) {
-        Serial.println("remoteBin length not correct");
+        Serial.println("Remote bin length not correct");
         return -1;
     }
 
@@ -69,19 +70,19 @@ int onRemoteBin(const char *binStr) {
     remoteBin = static_cast<unsigned char*>(malloc(remoteBinLen));
     char debugStr[129];
     if (nullptr == remoteBin) {
-        Serial.println("Not enough memory for remoteBin");
+        Serial.println("Not enough memory for remote bin");
         return -1;
     }
-    Serial.print("Remote bin length = ");
-    Serial.println(remoteBinLen);
     memset(remoteBin, 0, remoteBinLen);
 
     if (remoteBinLen != base64_decode(reinterpret_cast<char*>(remoteBin), remoteBinStr, remoteBinBase64Len)) {
-        Serial.println("Base64 decode failed");
+        Serial.println("Failed to decode remote bin");
         return -1;
     }
 
 #if defined REMOTE_BIN_DEBUG
+    Serial.print("Remote bin length = ");
+    Serial.println(remoteBinLen);
     snprintf(debugStr, 128, "%02x %02x %02x %02x %02x %02x %02x %02x",
         remoteBin[0], remoteBin[1], remoteBin[2], remoteBin[3],
         remoteBin[4], remoteBin[5], remoteBin[6], remoteBin[7]);
@@ -93,11 +94,18 @@ int onRemoteBin(const char *binStr) {
 #endif
 
     if (IR_DECODE_FAILED == ir_binary_open(categoryId, subCateId, remoteBin, remoteBinLen)) {
-        Serial.println("ir_binary_open failed");
+        Serial.println("Failed to load remote bin");
         return -1;
     }
-    Serial.println("ir_binary_open success");
-    ir_close();
+    Serial.println("Remote bin loaded successfully");
 
     return remoteBinLen;
+}
+
+int remoteControl(const char *controlStr) {
+    return 0;
+}
+
+void remoteClose() {
+    ir_close();
 }

arduino-example/src/remote.h

@@ -24,8 +24,12 @@
 #ifndef ARDUINO_EXAMPLE_REMOTE_H
 #define ARDUINO_EXAMPLE_REMOTE_H
 
-// #define REMOTE_BIN_DEBUG (1)
+#define REMOTE_BIN_DEBUG (1)
 
-int onRemoteBin(const char *binStr);
+int remoteOpen(const char *binStr);
+
+int remoteControl(const char *controlStr);
+
+void remoteClose();
 
 #endif //ARDUINO_EXAMPLE_REMOTE_H

arduino-example/src/utils.cpp

@@ -23,7 +23,7 @@
 
 #include <Arduino.h>
 
-#include <string.h>
+#include <cstring>
 
 
 // public function definitions

arduino-example/src/utils.h

@@ -25,6 +25,6 @@
 #define ARDUINO_EXAMPLE_UTILS_H
 
 int splitString(const char *str, char *parts[],
-                const int parts_max, const char *delimiter);
+                int parts_max, const char *delimiter);
 
 #endif //ARDUINO_EXAMPLE_UTILS_H