few bugfixes

Author: Henk Courtz

lib/MQTT/MqttClient.cpp

@@ -110,9 +110,6 @@ void MqttClient::fromMeshCallback(const char *topic, const char *msg) {
 
     milightClient->prepare(config, deviceId, groupId);
     milightClient->update(obj);
-    //sometimes bulbs are missing commands regeardless repeats, send twice:
-    //milightClient->prepare(config, deviceId, groupId);
-    //milightClient->update(obj);
     }
   }
 }

lib/WebServer/MiLightHttpServer.cpp

@@ -79,7 +79,7 @@ void MiLightHttpServer::handleSystemPost() {
         Serial.println(F("Resetting Wifi and then Restarting..."));
         server.send_P(200, TEXT_PLAIN, PSTR("true"));
 
-         delay(100);
+        delay(100);
         ESP.eraseConfig();
 		delay(100);
         SPIFFS.format();

platformio.ini

@@ -53,7 +53,7 @@ platform = ${common.platform}
 framework = ${common.framework}
 board = d1_mini
 upload_speed = ${common.upload_speed}
-upload_port = COM7
+upload_port = COM9
 build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=d1_mini
 extra_scripts = ${common.extra_scripts}
 lib_deps =

src/main.cpp

@@ -65,7 +65,8 @@ void onPacketSentHandler(uint8_t* packet, const MiLightRemoteConfig& config) {
     return;
   }
 
-  const MiLightRemoteConfig& remoteConfig = *MiLightRemoteConfig::fromType(bulbId.deviceType);
+  const MiLightRemoteConfig& remoteConfig =
+  	*MiLightRemoteConfig::fromType(bulbId.deviceType);
 
   //update the status of groups for the first UDP device
   if (settings.numGatewayConfigs > 0) {
@@ -75,9 +76,13 @@ void onPacketSentHandler(uint8_t* packet, const MiLightRemoteConfig& config) {
   		Serial.println(F("onPacketSentHandler - update the status of groups for the first UDP device\r\n"));
   		#endif
 
-      GroupState* groupState = stateStore->get(bulbId);
-      groupState->patch(result);
-      stateStore->set(bulbId, *groupState);
+      // update state to reflect changes from this packet
+	    GroupState* groupState = stateStore->get(bulbId);
+
+	    if (groupState != NULL) {
+	      groupState->patch(result);
+	      stateStore->set(bulbId, *groupState);
+	    }
 
   		if (mqttClient) {
 
@@ -87,11 +92,12 @@ void onPacketSentHandler(uint8_t* packet, const MiLightRemoteConfig& config) {
   			mqttClient->sendUpdate(remoteConfig, bulbId.deviceId, bulbId.groupId, output);
 
   			// Sends the entire state
-  			bulbStateUpdater->enqueueUpdate(bulbId, *groupState);
-  		}
-  	}
+    		if (groupState != NULL) {
+      		bulbStateUpdater->enqueueUpdate(bulbId, *groupState);
+  		  }
+  	  }
+    }
   }
-
   httpServer->handlePacketSent(packet, remoteConfig);
 }
 
@@ -133,6 +139,8 @@ void handleListen() {
 #endif
         return;
       }
+
+      // update state to reflect this packet
       onPacketSentHandler(readPacket, *remoteConfig);
     }
   }