Build Success, Testing and Optimization needed

lib/MQTT/HomeAssistantDiscoveryClient.cpp

@@ -37,7 +37,7 @@ void HomeAssistantDiscoveryClient::addConfig(const char* alias, const BulbId& bu
   DynamicJsonDocument config(1024);
   
   char uniqidBuffer[30];
-  sprintf_P(uniqidBuffer, PSTR("%X-%s"), ESP.getChipId(), alias);
+  //sprintf_P(uniqidBuffer, PSTR("%X-%s"), ESP.getChipId(), alias);
 
   config[F("schema")] = F("json");
   config[F("name")] = alias;
@@ -50,7 +50,7 @@ void HomeAssistantDiscoveryClient::addConfig(const char* alias, const BulbId& bu
   deviceMetadata[F("sw_version")] = QUOTE(MILIGHT_HUB_VERSION);
 
   JsonArray identifiers = deviceMetadata.createNestedArray(F("identifiers"));
-  identifiers.add(ESP.getChipId());
+  //identifiers.add(ESP.getChipId());
   bulbId.serialize(identifiers);
 
   // HomeAssistant only supports simple client availability
@@ -142,7 +142,7 @@ String HomeAssistantDiscoveryClient::buildTopic(const BulbId& bulbId) {
 
   topic += "light/";
   // Use a static ID that doesn't depend on configuration.
-  topic += "milight_hub_" + String(ESP.getChipId());
+  topic += "milight_hub_"; //+ String(ESP.getChipId());
 
   // make the object ID based on the actual parameters rather than the alias.
   topic += "/";

lib/MQTT/MqttClient.cpp

@@ -56,7 +56,7 @@ void MqttClient::begin() {
 
 bool MqttClient::connect() {
   char nameBuffer[30];
-  sprintf_P(nameBuffer, PSTR("milight-hub-%u"), ESP.getChipId());
+  sprintf_P(nameBuffer, "milight-hub-esp32"); //ESP.getChipId()
 
 #ifdef MQTT_DEBUG
     Serial.println(F("MqttClient - connecting using name"));

lib/Udp/MiLightDiscoveryServer.cpp

@@ -1,6 +1,6 @@
 #include <MiLightDiscoveryServer.h>
 #include <Size.h>
-#include <ESP8266WiFi.h>
+#include <ETH.h>
 
 const char V3_SEARCH_STRING[] = "Link_Wi-Fi";
 const char V6_SEARCH_STRING[] = "HF-A11ASSISTHREAD";
@@ -85,6 +85,6 @@ void MiLightDiscoveryServer::sendResponse(char* buffer) {
 #endif
 
   socket.beginPacket(socket.remoteIP(), socket.remotePort());
-  socket.write(buffer);
+  socket.write(int(buffer));
   socket.endPacket();
 }

lib/Udp/MiLightUdpServer.cpp

@@ -1,7 +1,7 @@
 #include <MiLightUdpServer.h>
 #include <V5MiLightUdpServer.h>
 #include <V6MiLightUdpServer.h>
-#include <ESP8266WiFi.h>
+#include <ETH.h>
 
 MiLightUdpServer::MiLightUdpServer(MiLightClient*& client, uint16_t port, uint16_t deviceId)
   : client(client),

lib/Udp/V6MiLightUdpServer.cpp

@@ -1,5 +1,5 @@
 #include <V6MiLightUdpServer.h>
-#include <ESP8266WiFi.h>
+#include <ETH.h>
 #include <Arduino.h>
 #include <Size.h>
 #include <V6CommandHandler.h>

lib/WebServer/MiLightHttpServer.cpp

@@ -449,7 +449,7 @@ void MiLightHttpServer::handleUpdateGroupAlias(RequestContext& request) {
 
   if (config == NULL) {
     char buffer[40];
-    sprintf_P(buffer, PSTR("Unknown device type: %s"), bulbId.deviceType);
+    sprintf_P(buffer, PSTR("Unknown device type: %u"), bulbId.deviceType);
     request.response.setCode(400);
     request.response.json["error"] = buffer;
     return;

src/main.cpp

@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <FS.h>
 #include "SPIFFS.h"
+#include <WebServer.h>
 #include <IntParsing.h>
 #include <Size.h>
 #include <LinkedList.h>
@@ -31,7 +32,6 @@
 #include <PacketSender.h>
 #include <HomeAssistantDiscoveryClient.h>
 #include <TransitionController.h>
-#include <WebServer.h>
 
 #include <vector>
 #include <memory>
@@ -454,16 +454,12 @@ void setup() {
     ledStatus->continuous(settings.ledModeWifiFailed);
     Serial.println(F("Wifi failed.  Restarting in 10 seconds.\n"));
 */
-    delay(10000);
-    ESP.restart();
-  }
-
   MDNS.addService("http", "tcp", 80);
 
   SSDP.setSchemaURL("description.xml");
   SSDP.setHTTPPort(80);
   SSDP.setName("ESP8266 MiLight Gateway");
-  SSDP.setSerialNumber(ESP.getChipId());
+  //SSDP.setSerialNumber(ESP.getChipId());
   SSDP.setURL("/");
   SSDP.setDeviceType("upnp:rootdevice");
   SSDP.begin();