Merge pull request #22 from toniebox-reverse-engineering/develop

Develop

Author: SciLor

BoxBattery.cpp

@@ -107,8 +107,8 @@ void BoxBattery::_doBatteryTestStep() {
         bool batteryLow = isBatteryLow();
         bool batteryCritical = isBatteryCritical();
 
-        char* output;
-        asprintf(&output, "%hu;%s;%hu;%hu.%s%hu;%s;%s;",
+        char output[5+1 +5+1 +5+1 +3+1+5+5+1 +5+1 +5+1 +1];
+        sprintf(output, "%hu;%s;%hu;%hu.%s%hu;%s;%s;",
             timeRunning,
             (chargerConnected ? "true" : "false"),
             batteryAdcRaw,
@@ -118,7 +118,6 @@ void BoxBattery::_doBatteryTestStep() {
         );
         Log.info(output);
         file.writeString(output);
-        free(output);
 
         file.writeString("\r\n");
         file.close();
@@ -133,7 +132,7 @@ void BoxBattery::startBatteryTest() {
     _batteryTestStartMillis = millis();
     FileFs file;
     if (file.open(_batteryTestFilename, FA_CREATE_ALWAYS | FA_WRITE)) {
-        char* output;
+        char output[26+10+10+1];
 
         file.writeString("Timestamp;");
         file.writeString("Charging;");
@@ -144,9 +143,8 @@ void BoxBattery::startBatteryTest() {
         file.writeString("Comments");
         file.writeString("\r\n");
         file.writeString("0;;;;;;");
-        asprintf(&output, "vFactor=%u, vChargerFactor=%u;", _batteryVoltageFactor, _batteryVoltageChargerFactor);
+        sprintf(output, "vFactor=%u, vChargerFactor=%u;", _batteryVoltageFactor, _batteryVoltageChargerFactor);
         file.writeString(output);
-        free(output);
         file.writeString("\r\n");
         file.close();
 
@@ -164,11 +162,10 @@ void BoxBattery::stopBatteryTest() {
     _doBatteryTestStep();
     FileFs file;
     if (file.open(_batteryTestFilename, FA_OPEN_APPEND | FA_WRITE)) {
-        char* output;
+        char output[13+5+1];
         uint16_t timeRunning = (millis()-_batteryTestStartMillis) / (1000*60);
-        asprintf(&output, "%hu;;;;;;stopped", timeRunning);
+        sprintf(output, "%hu;;;;;;stopped", timeRunning);
         file.writeString(output);
-        free(output);
         file.writeString("\r\n");
         file.close();
     } else {

BoxEvents.cpp

@@ -164,6 +164,7 @@ void BoxEvents::handleWiFiEvent(WrapperWiFi::ConnectionState state) {
     case WrapperWiFi::ConnectionState::CONNECTED:
         Log.info("IP: %s", WiFi.localIP().toString().c_str());
         Box.boxLEDs.setActiveAnimationByIteration(BoxLEDs::ANIMATION_TYPE::BLINK, BoxLEDs::CRGB::Blue, 3);
+        Box.boxWiFi.mDnsAdvertiseSetup();
         break;
     case WrapperWiFi::ConnectionState::DISCONNECTED:
         //Box.boxLEDs.setActiveAnimationByIteration(BoxLEDs::ANIMATION_TYPE::BLINK, BoxLEDs::CRGB::Cyan, 3);
@@ -277,10 +278,10 @@ void BoxEvents::handleTagEvent(BoxRFID::TAG_EVENT event) {
             }
 
             Box.boxTonie.loadTonieByUid(Box.boxRFID.tagUid);
-            uint8_t* path;
+            uint8_t path[strlen(Box.boxTonie.RCONTENT_BASE)+16+1];
             uint8_t* uid = Box.boxRFID.tagUid;
-            asprintf(
-                (char**)&path,
+            sprintf(
+                (char*)path,
                 "%s%02X%02X%02X%02X%02X%02X%02X%02X",
                 Box.boxTonie.RCONTENT_BASE,
                 uid[0], uid[1], uid[2], uid[3], uid[4], uid[5], uid[6], uid[7]
@@ -301,18 +302,16 @@ void BoxEvents::handleTagEvent(BoxRFID::TAG_EVENT event) {
                 if (!foundFile) {
                     Log.info("No file play.");
                 } else {
-                    uint8_t* filepath;
-                    asprintf(
-                        (char**)&filepath,
+                    uint8_t filepath[256];
+                    sprintf(
+                        (char*)filepath,
                         "%s/%s",
                         path,
                         dir.fileName()
                     );
                     Box.boxDAC.playFile((const char*)filepath);
-                    free(filepath);
                 }
             }
-            free(path);
         }
         break;
     case BoxRFID::TAG_EVENT::TAG_REMOVED:

BoxTonies.cpp

@@ -1,21 +1,19 @@
 #include "BoxTonies.h"
 
 bool BoxTonies::loadTonieByUid(uint8_t uid[8]) {
-    uint8_t* path;
+    uint8_t path[strlen(CONTENT_BASE)+16+1+1];
 
-    asprintf(
-        (char**)&path,
+    sprintf(
+        (char*)path,
         "%s%02X%02X%02X%02X/%02X%02X%02X%02X",
         CONTENT_BASE,
         uid[0], uid[1], uid[2], uid[3], uid[4], uid[5], uid[6], uid[7]
     );
 
     memcpy(currentUid, uid, 8);
     if (loadTonieByPath(path)) {
-        free(path);
         return true;
     }
-    free(path);
     return false;
 }
 

WrapperWiFi.cpp

@@ -93,3 +93,38 @@ void WrapperWiFi::apMode() {
 WrapperWiFi::ConnectionState WrapperWiFi::getStatus() {
   return _state;
 }
+
+void WrapperWiFi::mDnsAdvertiseSetup() {
+  const char* service = "Hackiebox._api._tcp.local"; //max 64 bytes?
+  const char* text = "Hackiebox";
+
+  int16_t result = sl_NetAppMDNSUnRegisterService(0, 0);
+
+  if (result != 0)
+    Log.error("mDNS service unreg 1 failed=%i", result);
+
+  //Registering for the mDNS service.
+  result = sl_NetAppMDNSUnRegisterService(
+    (const signed char*)service,
+    (const unsigned char)strlen(service)
+  );
+
+  if (result != 0 && result != SL_NET_APP_DNS_NOT_EXISTED_SERVICE_ERROR)
+    Log.error("mDNS service unreg 2 failed=%i", result);
+  
+  result = sl_NetAppMDNSRegisterService(
+    (const signed char*)service, //Service
+    (const unsigned char)strlen(service), //ServiceLen
+    (const signed char*)text, //Text
+    (const unsigned char)strlen(text), //TextLen
+    80, //Port
+    2000, //TTL
+    1 //Options
+  );
+
+  if(result == 0) {
+      Log.info("mDNS service %s with %s enabled", service, text);
+  } else {
+      Log.error("mDNS service setup failed=%i", result);
+  }
+}

WrapperWiFi.h

@@ -32,6 +32,8 @@ class WrapperWiFi : public EnhancedThread {
 
     WrapperWiFi::ConnectionState getStatus();
 
+    void mDnsAdvertiseSetup();
+
   private:
     const char* _ssid;
     const char* _password;