proper name for RGB+CCT

lib/MiLight/MiLightClient.cpp

@@ -8,8 +8,8 @@ MiLightRadio* MiLightClient::getRadio(const MiLightRadioType type) {
     stack = rgbwRadio;
   } else if (type == CCT) {
     stack = cctRadio;
-  } else if (type == RGBW_CCT) {
-    stack = rgbwCctRadio;
+  } else if (type == RGB_CCT) {
+    stack = rgbCctRadio;
   }
   
   if (stack != NULL) {
@@ -267,8 +267,8 @@ MiLightRadioType MiLightClient::getRadioType(const String& typeName) {
     return RGBW;
   } else if (typeName.equalsIgnoreCase("cct")) {
     return CCT;
-  } else if (typeName.equalsIgnoreCase("rgbw_cct")) {
-    return RGBW_CCT;
+  } else if (typeName.equalsIgnoreCase("rgb_cct")) {
+    return RGB_CCT;
   } else {
     return UNKNOWN;
   }
@@ -280,8 +280,8 @@ const MiLightRadioConfig& MiLightClient::getRadioConfig(const String& typeName)
       return MilightRgbwConfig;
     case CCT:
       return MilightCctConfig;
-    case RGBW_CCT:
-      return MilightRgbwCctConfig;
+    case RGB_CCT:
+      return MilightRgbCctConfig;
     default:
       Serial.print("Unknown radio type: ");
       Serial.println(typeName);

lib/MiLight/MiLightClient.h

@@ -47,19 +47,19 @@ class MiLightClient {
     {
       rgbwRadio = new MiLightRadioStack(rf, MilightRgbwConfig);
       cctRadio = new MiLightRadioStack(rf, MilightCctConfig);
-      rgbwCctRadio = new MiLightRadioStack(rf, MilightRgbwCctConfig);
+      rgbCctRadio = new MiLightRadioStack(rf, MilightRgbCctConfig);
     }
     
     ~MiLightClient() {
       delete rgbwRadio;
       delete cctRadio;
-      delete rgbwCctRadio;
+      delete rgbCctRadio;
     }
     
     void begin() {
       rgbwRadio->getRadio()->begin();
       cctRadio->getRadio()->begin();
-      rgbwCctRadio->getRadio()->begin();
+      rgbCctRadio->getRadio()->begin();
     }
     
     void setResendCount(const unsigned int resendCount);
@@ -116,7 +116,7 @@ class MiLightClient {
     RF24 rf;
     MiLightRadioStack* rgbwRadio;
     MiLightRadioStack* cctRadio;
-    MiLightRadioStack* rgbwCctRadio;
+    MiLightRadioStack* rgbCctRadio;
     MiLightRadioType currentRadio;
     
     uint8_t sequenceNum;

lib/MiLight/MiLightRadioConfig.h

@@ -7,7 +7,7 @@ enum MiLightRadioType {
   UNKNOWN = 0,
   RGBW  = 0xB8,
   CCT   = 0x5A,
-  RGBW_CCT = 0x99
+  RGB_CCT = 0x99
 };
 
 class MiLightRadioConfig {
@@ -44,9 +44,9 @@ static MiLightRadioConfig MilightCctConfig(
   0x050A, 0x55AA, 7, CCT_CHANNELS, 3, CCT
 );
 
-const uint8_t RGBWCCT_CHANNELS[] = {70, 39, 8};
-static MiLightRadioConfig MilightRgbwCctConfig(
-  0x7236, 0x1809, 9, RGBWCCT_CHANNELS, 3, RGBW_CCT
+const uint8_t RGBCCT_CHANNELS[] = {70, 39, 8};
+static MiLightRadioConfig MilightRgbCctConfig(
+  0x7236, 0x1809, 9, RGBCCT_CHANNELS, 3, RGB_CCT
 );
 
 #endif