Add ZeDMD WiFi support (#49)

bartdesign · web-flow · commit bad83bc73e63 · 2024-09-08T10:42:39.000-04:00
diff --git a/README.md b/README.md
@@ -170,8 +170,9 @@ The "paused" connections aren't really paused. Their data is still accepted but
 
 ```ini
 [DMDServer]
-# The address (interface) to listen for TCP connections.
-Addr = localhost
+# Address (interface) to bind for incoming connections
+# Use 0.0.0.0 to accept connections from external devices on all interfaces
+Addr = 127.0.0.1
 # The port to listen for TCP connections.
 Port = 6789
 # Set to 1 if Serum colorization should be used, 0 if not.
@@ -204,6 +205,14 @@ Brightness = -1
 # Set to 1 to permantenly store the overwritten settings above in ZeDMD internally.
 SaveSettings = 0
 
+[ZeDMD-WiFi]
+# Set to 1 if ZeDMD-WiFi is available.
+Enabled = 0
+# Enter your ZeDMD WiFi IP address here
+WiFiAddr = 
+# Set the ZeDMD WiFi Port number, you can leave this empty and it will default to 3333
+WiFiPort = 3333
+
 [Pixelcade]
 # Set to 1 if Pixelcade is attached
 Enabled = 1
diff --git a/dmdserver.ini b/dmdserver.ini
@@ -1,7 +1,8 @@
 
 [DMDServer]
-# The address (interface) to listen for TCP connections.
-Addr = localhost
+# Address (interface) to bind for incoming connections
+# Use 0.0.0.0 to accept connections from external devices on all interfaces
+Addr = 127.0.0.1
 # The port to listen for TCP connections.
 Port = 6789
 # Set to 1 if Serum colorization should be used, 0 if not.
@@ -34,6 +35,14 @@ Brightness = -1
 # Set to 1 to permantenly store the overwritten settings above in ZeDMD internally.
 SaveSettings = 0
 
+[ZeDMD-WiFi]
+# Set to 1 if ZeDMD-WiFi is available.
+Enabled = 0
+# Enter your ZeDMD WiFi IP address here
+WiFiAddr = 
+# Set the ZeDMD WiFi Port number, you can leave this empty and it will default to 3333
+WiFiPort = 3333
+
 [Pixelcade]
 # Set to 1 if Pixelcade is attached
 Enabled = 1
diff --git a/include/DMDUtil/Config.h b/include/DMDUtil/Config.h
@@ -62,6 +62,12 @@ class DMDUTILAPI Config
   void SetZeDMDBrightness(int brightness) { m_zedmdBrightness = brightness; }
   bool IsZeDMDSaveSettings() const { return m_zedmdSaveSettings; }
   void SetZeDMDSaveSettings(bool saveSettings) { m_zedmdSaveSettings = saveSettings; }
+  bool IsZeDMDWiFiEnabled() const { return m_zedmdWiFiEnabled; }
+  void SetZeDMDWiFiEnabled(bool WiFiEnabled) { m_zedmdWiFiEnabled = WiFiEnabled; }
+  const char* GetZeDMDWiFiAddr() const { return m_zedmdWiFiAddr.c_str(); }
+  void SetZeDMDWiFiAddr(const char* ipaddr) { m_zedmdWiFiAddr = ipaddr; }
+  int GetZeDMDWiFiPort() const { return m_zedmdWiFiPort; }
+  void SetZeDMDWiFiPort(int port) { m_zedmdWiFiPort = port; }
   bool IsPixelcade() const { return m_pixelcade; }
   void SetPixelcade(bool pixelcade) { m_pixelcade = pixelcade; }
   void SetPixelcadeDevice(const char* port) { m_pixelcadeDevice = port; }
@@ -101,6 +107,9 @@ class DMDUTILAPI Config
   int m_zedmdRgbOrder;
   int m_zedmdBrightness;
   bool m_zedmdSaveSettings;
+  bool m_zedmdWiFiEnabled;
+  std::string m_zedmdWiFiAddr;
+  int m_zedmdWiFiPort;
   bool m_dmdServer;
   std::string m_dmdServerAddr;
   int m_dmdServerPort;
diff --git a/include/DMDUtil/DMDUtil.h b/include/DMDUtil/DMDUtil.h
@@ -2,7 +2,7 @@
 
 #define DMDUTIL_VERSION_MAJOR 0  // X Digits
 #define DMDUTIL_VERSION_MINOR 7  // Max 2 Digits
-#define DMDUTIL_VERSION_PATCH 0  // Max 2 Digits
+#define DMDUTIL_VERSION_PATCH 1  // Max 2 Digits
 
 #define _DMDUTIL_STR(x) #x
 #define DMDUTIL_STR(x) _DMDUTIL_STR(x)
diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=927a519efcff79f9876fecb9d5a04c9ba5fc2348
+LIBZEDMD_SHA=a7c9ba92d1ca3418ff3d93b2f99a62f60e99d672
 LIBSERUM_SHA=5329017fe093ecd46e382c3fd7f08da0c5b84797
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
diff --git a/platforms/ios-simulator/arm64/external.sh b/platforms/ios-simulator/arm64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=927a519efcff79f9876fecb9d5a04c9ba5fc2348
+LIBZEDMD_SHA=a7c9ba92d1ca3418ff3d93b2f99a62f60e99d672
 LIBSERUM_SHA=5329017fe093ecd46e382c3fd7f08da0c5b84797
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=927a519efcff79f9876fecb9d5a04c9ba5fc2348
+LIBZEDMD_SHA=a7c9ba92d1ca3418ff3d93b2f99a62f60e99d672
 LIBSERUM_SHA=5329017fe093ecd46e382c3fd7f08da0c5b84797
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=927a519efcff79f9876fecb9d5a04c9ba5fc2348
+LIBZEDMD_SHA=a7c9ba92d1ca3418ff3d93b2f99a62f60e99d672
 LIBSERUM_SHA=5329017fe093ecd46e382c3fd7f08da0c5b84797
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=927a519efcff79f9876fecb9d5a04c9ba5fc2348
+LIBZEDMD_SHA=a7c9ba92d1ca3418ff3d93b2f99a62f60e99d672
 LIBSERUM_SHA=5329017fe093ecd46e382c3fd7f08da0c5b84797
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=927a519efcff79f9876fecb9d5a04c9ba5fc2348
+LIBZEDMD_SHA=a7c9ba92d1ca3418ff3d93b2f99a62f60e99d672
 LIBSERUM_SHA=5329017fe093ecd46e382c3fd7f08da0c5b84797
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=927a519efcff79f9876fecb9d5a04c9ba5fc2348
+LIBZEDMD_SHA=a7c9ba92d1ca3418ff3d93b2f99a62f60e99d672
 LIBSERUM_SHA=5329017fe093ecd46e382c3fd7f08da0c5b84797
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=927a519efcff79f9876fecb9d5a04c9ba5fc2348
+LIBZEDMD_SHA=a7c9ba92d1ca3418ff3d93b2f99a62f60e99d672
 LIBSERUM_SHA=5329017fe093ecd46e382c3fd7f08da0c5b84797
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=927a519efcff79f9876fecb9d5a04c9ba5fc2348
+LIBZEDMD_SHA=a7c9ba92d1ca3418ff3d93b2f99a62f60e99d672
 LIBSERUM_SHA=5329017fe093ecd46e382c3fd7f08da0c5b84797
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh
@@ -3,7 +3,7 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=927a519efcff79f9876fecb9d5a04c9ba5fc2348
+LIBZEDMD_SHA=a7c9ba92d1ca3418ff3d93b2f99a62f60e99d672
 LIBSERUM_SHA=5329017fe093ecd46e382c3fd7f08da0c5b84797
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
diff --git a/src/DMD.cpp b/src/DMD.cpp
@@ -468,19 +468,42 @@ void DMD::FindDisplays()
         [this]()
         {
           Config* const pConfig = Config::GetInstance();
-
           ZeDMD* pZeDMD = nullptr;
 
-          if (pConfig->IsZeDMD())
+          bool openSerial = false;
+          bool openWiFi = false;
+
+          if (pConfig->IsZeDMD() || pConfig->IsZeDMDWiFiEnabled())
           {
             pZeDMD = new ZeDMD();
             pZeDMD->SetLogCallback(ZeDMDLogCallback, nullptr);
+          }
+
+          if (pConfig->IsZeDMDWiFiEnabled())
+          {
+            std::string WiFiAddr = pConfig->GetZeDMDWiFiAddr() ? pConfig->GetZeDMDWiFiAddr() : "";
+            uint16_t udpPortNumber = pConfig->GetZeDMDWiFiPort() > 0 ? pConfig->GetZeDMDWiFiPort() : 3333;
+
+            if (WiFiAddr.empty())
+            {
+              DMDUtil::Log(DMDUtil_LogLevel_ERROR, "ERROR: ZeDMD WiFi IP address is not configured.");
+            }
+
+            // Proceed only if the WiFiAddr is valid.
+            if (!WiFiAddr.empty() && (openWiFi = pZeDMD->OpenWiFi(WiFiAddr.c_str(), udpPortNumber)))
+            {
+              std::stringstream logMessage;
+              logMessage << "ZeDMD WiFi enabled, connected to " << WiFiAddr << ":" << udpPortNumber << ".";
+              DMDUtil::Log(DMDUtil_LogLevel_INFO, logMessage.str().c_str());
+            }
+          }
 
+          if (pConfig->IsZeDMD())
+          {
             if (pConfig->GetZeDMDDevice() != nullptr && pConfig->GetZeDMDDevice()[0] != '\0')
               pZeDMD->SetDevice(pConfig->GetZeDMDDevice());
 
-            bool open = false;
-            if ((open = pZeDMD->Open()))
+            if ((openSerial = pZeDMD->Open()))
             {
               if (pConfig->GetZeDMDBrightness() != -1) pZeDMD->SetBrightness(pConfig->GetZeDMDBrightness());
               if (pConfig->IsZeDMDSaveSettings())
@@ -494,22 +517,23 @@ void DMD::FindDisplays()
                   std::this_thread::sleep_for(std::chrono::seconds(8));
                   pZeDMD->Close();
                   std::this_thread::sleep_for(std::chrono::seconds(1));
-                  open = pZeDMD->Open();
+                  openSerial = pZeDMD->Open();
                 }
               }
             }
-            if (open)
-            {
-              if (pConfig->IsZeDMDDebug()) pZeDMD->EnableDebug();
-              pZeDMD->EnablePreDownscaling();
-              pZeDMD->EnablePreUpscaling();
-              m_pZeDMDThread = new std::thread(&DMD::ZeDMDThread, this);
-            }
-            else
-            {
-              delete pZeDMD;
-              pZeDMD = nullptr;
-            }
+          }
+
+          if (openSerial || openWiFi)
+          {
+            if (pConfig->IsZeDMDDebug()) pZeDMD->EnableDebug();
+            pZeDMD->EnablePreDownscaling();
+            pZeDMD->EnablePreUpscaling();
+            m_pZeDMDThread = new std::thread(&DMD::ZeDMDThread, this);
+          }
+          else
+          {
+            delete pZeDMD;
+            pZeDMD = nullptr;
           }
 
           m_pZeDMD = pZeDMD;
@@ -1386,7 +1410,7 @@ void DMD::AdjustRGB24Depth(uint8_t* pData, uint8_t* pDstData, int length, uint8_
         level = (uint8_t)(v >> 4);
 
       int pos2 = level * 3;
-      pDstData[pos    ] = palette[pos2];
+      pDstData[pos] = palette[pos2];
       pDstData[pos + 1] = palette[pos2 + 1];
       pDstData[pos + 2] = palette[pos2 + 2];
     }
diff --git a/src/dmdServer.cpp b/src/dmdServer.cpp
@@ -286,6 +286,10 @@ int main(int argc, char* argv[])
       pConfig->SetZeDMDRGBOrder(r.Get<int>("ZeDMD", "RGBOrder", -1));
       pConfig->SetZeDMDBrightness(r.Get<int>("ZeDMD", "Brightness", -1));
       pConfig->SetZeDMDSaveSettings(r.Get<bool>("ZeDMD", "SaveSettings", false));
+      // ZeDMD WiFi
+      pConfig->SetZeDMDWiFiEnabled(r.Get<bool>("ZeDMD-WiFi", "Enabled", false));
+      pConfig->SetZeDMDWiFiAddr(r.Get<string>("ZeDMD-WiFi", "WiFiAddr", "").c_str());
+      pConfig->SetZeDMDWiFiPort(r.Get<int>("ZeDMD-WiFi", "WiFiPort", 3333));
       // Pixelcade
       pConfig->SetPixelcade(r.Get<bool>("Pixelcade", "Enabled", true));
       pConfig->SetPixelcadeDevice(r.Get<string>("Pixelcade", "Device", "").c_str());
@@ -334,7 +338,7 @@ int main(int argc, char* argv[])
 
   sockpp::initialize();
   if (opt_verbose)
-    DMDUtil::Log(DMDUtil_LogLevel_INFO, "Opening DMDServer, listining for TCP connections on %s:%d",
+    DMDUtil::Log(DMDUtil_LogLevel_INFO, "Opening DMDServer, listening for TCP connections on %s:%d",
                  pConfig->GetDMDServerAddr(), pConfig->GetDMDServerPort());
   sockpp::tcp_acceptor acc({pConfig->GetDMDServerAddr(), (in_port_t)pConfig->GetDMDServerPort()});
   if (!acc)
