Merge remote-tracking branch 'netmindz/WLED-discovery' into main

platformio.ini

@@ -11,6 +11,7 @@ lib_deps =
     https://github.com/me-no-dev/ESPAsyncWebServer.git
     ; https://github.com/lost-hope/ESPAsyncWebServer.git#master
     https://github.com/bblanchon/ArduinoJson.git
+    https://github.com/netmindz/Dictionary.git#first
 
 [appmod_leds]
 build_flags = 

src/User/UserModArtNet.h

@@ -31,7 +31,7 @@ class UserModArtNet:public Module {
   void setup() {
     Module::setup();
     print->print("%s %s\n", __PRETTY_FUNCTION__, name);
-    targetIp = IPAddress(192,168,178,161); // TODO allow setting at runtime
+    targetIp = IPAddress(0,0,0,0); // TODO allow setting at runtime
     print->print("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
   }
 

src/User/UserModDDP.h

@@ -47,7 +47,6 @@ class UserModDDP:public Module {
   void setup() {
     Module::setup();
     print->print("%s %s\n", __PRETTY_FUNCTION__, name);
-    targetIp = IPAddress(192,168,178,161); // TODO allow setting at runtime
     print->print("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
   }
 
@@ -61,8 +60,17 @@ class UserModDDP:public Module {
 
     if(!SysModModules::isConnected) return;
 
+
+    if((!targetIp) && (wledDiscoveryMod->nodes.length() >= 1)) {
+      targetIp = wledDiscoveryMod->nodes.firstKey(); // TODO: replace with WebUI setting
+      print->print("Start DDP to %s\n", targetIp.toString().c_str());
+    }
+
+    if(!targetIp) return;
+
     if(!lds->newFrame) return;
 
+
     // calculate the number of UDP packets we need to send
     bool isRGBW = false;
 

src/User/UserModWLEDDiscovery.h

@@ -0,0 +1,61 @@
+/*
+   @title     StarMod
+   @file      UserModWLEDDiscovery.h
+   @date      20230730
+   @repo      https://github.com/ewoudwijma/StarMod
+   @Authors   https://github.com/ewoudwijma/StarMod/commits/main
+   @Copyright (c) 2023 Github StarMod Commit Authors
+   @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+*/
+
+#include <Dictionary.h>
+
+
+class UserModWLEDDiscovery:public Module {
+
+public:
+
+  Dictionary<IPAddress, String> nodes;
+
+  UserModWLEDDiscovery() :Module("WLED Discovery") {
+    print->print("%s %s\n", __PRETTY_FUNCTION__, name);
+
+    print->print("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
+  };
+
+  //setup filesystem
+  void setup() {
+    Module::setup();
+    print->print("%s %s\n", __PRETTY_FUNCTION__, name);
+
+    print->print("%s %s %s\n", __PRETTY_FUNCTION__, name, success?"success":"failed");
+  }
+
+  void connected() {
+    isConnected = true;
+    udp.begin(65506);
+  }
+
+  void loop(){
+    // Module::loop();
+    if(!isConnected) return;
+
+    int packetSize = udp.parsePacket();
+
+    if (packetSize) {
+      IPAddress remoteIp = udp.remoteIP();
+      // TODO: actually look at the contents of the packet to fetch version, name etc
+      print->print("WLED: %s (%u)\n", remoteIp.toString().c_str(), packetSize);
+      udp.read(packetBuffer, packetSize);
+      nodes.set(remoteIp, remoteIp.toString().c_str());
+    }
+  }
+
+  private:
+    bool isConnected = false;
+    char packetBuffer[255];
+    WiFiUDP udp;
+
+};
+
+static UserModWLEDDiscovery *wledDiscoveryMod;

src/main.cpp

@@ -22,6 +22,7 @@
 #include "Sys/SysModModel.h"
 #include "Sys/SysModNetwork.h"
 #include "Sys/SysModPins.h"
+#include "User/UserModWLEDDiscovery.h"
 #ifdef APPMOD_LEDS
   #include "App/AppModLeds.h"
   #include "App/AppModLedFixGen.h"
@@ -51,6 +52,7 @@ void setup() {
   ui = new SysModUI();
   sys = new SysModSystem();
   pins = new SysModPins();
+  wledDiscoveryMod = new UserModWLEDDiscovery();
   #ifdef APPMOD_LEDS
     lds = new AppModLeds();
     lfg = new AppModLedFixGen();
@@ -95,6 +97,7 @@ void setup() {
   #ifdef USERMOD_HA
     mdls->add(hamod);
   #endif
+  mdls->add(wledDiscoveryMod);
 
   //do not add mdls itself as it does setup and loop for itself!!! (it is the orchestrator)
   mdls->setup();