Optimized RGBW:enableNightMode() & Removed debugging stuff

lib/MiLight/RgbwPacketFormatter.cpp

@@ -87,23 +87,10 @@ void RgbwPacketFormatter::updateColorWhite() {
 }
 
 void RgbwPacketFormatter::enableNightMode() {
-  if (groupId == 0) {
-    //Serial.print("Sending RGBW_ALL_NIGHT... Group ");
-    command(RGBW_ALL_NIGHT, 0);
-  } else if (groupId == 1) {
-    //Serial.print("Sending RGBW_GROUP_1_NIGHT... Group ");
-    command(RGBW_GROUP_1_NIGHT, 0);
-  } else if (groupId == 2) {
-    //Serial.print("Sending RGBW_GROUP_2_NIGHT... Group ");
-    command(RGBW_GROUP_2_NIGHT, 0);
-  } else if (groupId == 3) {
-    //Serial.print("Sending RGBW_GROUP_3_NIGHT... Group ");
-    command(RGBW_GROUP_3_NIGHT, 0);
-  } else if (groupId == 4) {
-    //Serial.print("Sending RGBW_GROUP_4_NIGHT... Group ");
-    command(RGBW_GROUP_4_NIGHT, 0);
-  }
-  //Serial.println(groupId);
+  uint8_t button = STATUS_COMMAND(OFF, groupId);
+
+  //command(button, 0);
+  command(button | 0x10, 0);
 }
 
 void RgbwPacketFormatter::parsePacket(const uint8_t* packet, JsonObject& result) {

lib/MiLight/RgbwPacketFormatter.h

@@ -36,6 +36,7 @@ enum MiLightRgbwButton {
   RGBW_GROUP_4_MIN_LEVEL = 0x1A,
 
   // Button codes for night mode. A long press on the corresponding OFF button
+  // Not actually needed/used.
   RGBW_ALL_NIGHT = 0x12,
   RGBW_GROUP_1_NIGHT = 0x14,
   RGBW_GROUP_2_NIGHT = 0x16,

lib/Udp/V5MiLightUdpServer.cpp

@@ -19,14 +19,6 @@ void V5MiLightUdpServer::handleCommand(uint8_t command, uint8_t commandArg) {
     client->prepare(&FUT096Config, deviceId, groupId);
     client->updateStatus(status);
 
-    // Just some debugging stuff
-    //Serial.print("MiLight-RGBW Command received: Device ");
-    //Serial.print(deviceId);
-    //Serial.print(" - Group ");
-    //Serial.print(groupId);
-    //Serial.print(" - Command ");
-    //Serial.println(command);
-
     this->lastGroup = groupId;
   // Command set_white for RGBW
 } else if (command == UDP_RGBW_GROUP_ALL_WHITE || command == UDP_RGBW_GROUP_1_WHITE || command == UDP_RGBW_GROUP_2_WHITE || command == UDP_RGBW_GROUP_3_WHITE || command == UDP_RGBW_GROUP_4_WHITE) {
@@ -34,14 +26,6 @@ void V5MiLightUdpServer::handleCommand(uint8_t command, uint8_t commandArg) {
     client->prepare(&FUT096Config, deviceId, groupId);
     client->updateColorWhite();
 
-    // Just some debugging stuff
-    //Serial.print("MiLight-RGBW SetToWhite command received: Device ");
-    //Serial.print(deviceId);
-    //Serial.print(" - Group ");
-    //Serial.print(groupId);
-    //Serial.print(" - Command ");
-    //Serial.println(command);
-
     this->lastGroup = groupId;
   } else {
     client->prepare(&FUT096Config, deviceId, lastGroup);
@@ -82,47 +66,22 @@ void V5MiLightUdpServer::handleCommand(uint8_t command, uint8_t commandArg) {
         break;
 
       case UDP_RGBW_GROUP_ALL_NIGHT:
-        // Just some debugging stuff
-        //Serial.print("MiLight-RGBW: GROUP_ALL_NIGHT received! Device ");
-        //Serial.print(deviceId);
-        //Serial.print(" - Group ");
-        //Serial.println(lastGroup);
         client->enableNightMode();
         break;
 
       case UDP_RGBW_GROUP_1_NIGHT:
-        // Just some debugging stuff
-        //Serial.print("MiLight-RGBW: GROUP_1_NIGHT received! Device ");
-        //Serial.print(deviceId);
-        //Serial.print(" - Group ");
-        //Serial.println(lastGroup);
         client->enableNightMode();
         break;
 
       case UDP_RGBW_GROUP_2_NIGHT:
-        // Just some debugging stuff
-        //Serial.print("MiLight-RGBW: GROUP_2_NIGHT received! Device ");
-        //Serial.print(deviceId);
-        //Serial.print(" - Group ");
-        //Serial.println(lastGroup);
         client->enableNightMode();
         break;
 
       case UDP_RGBW_GROUP_3_NIGHT:
-        // Just some debugging stuff
-        //Serial.print("MiLight-RGBW: GROUP_3_NIGHT received! Device ");
-        //Serial.print(deviceId);
-        //Serial.print(" - Group ");
-        //Serial.println(lastGroup);
         client->enableNightMode();
         break;
 
       case UDP_RGBW_GROUP_4_NIGHT:
-        // Just some debugging stuff
-        //Serial.print("MiLight-RGBW: GROUP_4_NIGHT received! Device ");
-        //Serial.print(deviceId);
-        //Serial.print(" - Group ");
-        //Serial.println(lastGroup);
         client->enableNightMode();
         break;