addressed review comments

Thirsrin · Jul 5, 2024 · ddc8750 · ddc8750
1 parent 4fdadff
commit ddc8750
Show file tree

Hide file tree

Showing 28 changed files with 45 additions and 37 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -5460,7 +5460,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -4008,7 +4008,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -1433,7 +1433,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -1534,7 +1534,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/common/imgui_ui/windows/light.cpp b/examples/common/imgui_ui/windows/light.cpp
@@ -155,14 +155,14 @@ void Light::Render()
     ImGui::Text("Color Control:");
     ImGui::Indent();
     const char * mode = // based on ColorMode attribute: spec 3.2.7.9
-        (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation) ? "Hue/Saturation"
-        : (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kCurrentXAndCurrentY)          ? "X/Y"
-        : (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kColorTemperatureMireds)       ? "Temperature/Mireds"
+        (mColorMode == ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation) ? "Hue/Saturation"
+        : (mColorMode == ColorControl::ColorModeEnum::kCurrentXAndCurrentY)          ? "X/Y"
+        : (mColorMode == ColorControl::ColorModeEnum::kColorTemperatureMireds)       ? "Temperature/Mireds"
                                                                                                           : "UNKNOWN";
 
     ImGui::Text("Mode: %s", mode);
 
-    if (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation)
+    if (mColorMode == ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation)
     {
         const float hueDegrees        = (mColorHue * 360.0f) / 254.0f;
         const float saturationPercent = 100.0f * (mColorSaturation / 254.0f);
@@ -173,12 +173,12 @@ void Light::Render()
         ImGui::ColorButton("LightColor", HueSaturationToColor(hueDegrees, saturationPercent), 0 /* ImGuiColorEditFlags_* */,
                            ImVec2(80, 80));
     }
-    else if (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kCurrentXAndCurrentY)
+    else if (mColorMode == ColorControl::ColorModeEnum::kCurrentXAndCurrentY)
     {
         ImGui::Text("Current X: %d", mColorX);
         ImGui::Text("Current Y: %d", mColorY);
     }
-    else if (mColorMode == chip::app::Clusters::ColorControl::ColorModeEnum::kColorTemperatureMireds)
+    else if (mColorMode == ColorControl::ColorModeEnum::kColorTemperatureMireds)
     {
         ImGui::Text("Color Temperature Mireds: %d", mColorTemperatureMireds);
     }

diff --git a/examples/common/m5stack-tft/repo b/examples/common/m5stack-tft/repo
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -2211,7 +2211,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/light-switch-app/qpg/zap/switch.matter b/examples/light-switch-app/qpg/zap/switch.matter
@@ -2008,7 +2008,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
@@ -1573,7 +1573,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -1697,7 +1697,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -1608,7 +1608,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -2021,7 +2021,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
@@ -1636,7 +1636,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -1725,7 +1725,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
@@ -2016,7 +2016,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/lighting-app/tizen/src/DBusInterface.cpp b/examples/lighting-app/tizen/src/DBusInterface.cpp
@@ -92,7 +92,7 @@ void DBusInterface::SetCurrentLevel(uint8_t value)
         light_app_level_control_set_current_level(mIfaceLevelControl, value);
 }
 
-void DBusInterface::SetColorMode(chip::app::Clusters::ColorControl::ColorModeEnum colorMode)
+void DBusInterface::SetColorMode(chip::app::Clusters::ColorControl::ColorMode colorMode)
 {
     InternalSetGuard guard(this);
     if (light_app_color_control_get_color_mode(mIfaceColorControl) != chip::to_underlying(colorMode))
@@ -217,12 +217,11 @@ void DBusInterface::InitOnOff()
 void DBusInterface::InitColor()
 {
     {
-        chip::app::Clusters::ColorControl::ColorModeEnum value =
-            chip::app::Clusters::ColorControl::ColorModeEnum::kCurrentHueAndCurrentSaturation;
+        auto value = 0;
         auto status = Clusters::ColorControl::Attributes::ColorMode::Get(mEndpointId, &value);
         VerifyOrReturn(status == Protocols::InteractionModel::Status::Success,
                        ChipLogError(NotSpecified, "Error getting ColorMode: 0x%x", to_underlying(status)));
-        light_app_color_control_set_color_mode(mIfaceColorControl, static_cast<guchar>(value));
+        light_app_color_control_set_color_mode(mIfaceColorControl, value);
     }
     {
         uint16_t value = 0;

diff --git a/examples/lighting-app/tizen/src/DBusInterface.h b/examples/lighting-app/tizen/src/DBusInterface.h
@@ -39,7 +39,7 @@ class DBusInterface
     void Identify(uint16_t time);
     void SetOnOff(bool on);
     void SetCurrentLevel(uint8_t value);
-    void SetColorMode(chip::app::Clusters::ColorControl::ColorModeEnum colorMode);
+    void SetColorMode(chip::app::Clusters::ColorControl::ColorMode colorMode);
     void SetColorTemperature(uint16_t value);
 
 private:

diff --git a/examples/lighting-app/tizen/src/main.cpp b/examples/lighting-app/tizen/src/main.cpp
@@ -103,7 +103,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
         switch (attributePath.mAttributeId)
         {
         case Clusters::ColorControl::Attributes::ColorMode::Id:
-            sDBusInterface.SetColorMode(static_cast<Clusters::ColorControl::ColorModeEnum>(*value));
+            sDBusInterface.SetColorMode(static_cast<Clusters::ColorControl::ColorMode>(*value));
             break;
         case Clusters::ColorControl::Attributes::ColorTemperatureMireds::Id:
             VerifyOrDie(size == sizeof(uint16_t));

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -5577,7 +5577,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }
@@ -5905,7 +5905,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -5534,7 +5534,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }
@@ -5862,7 +5862,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
@@ -2872,7 +2872,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/src/app/common/CompatEnumNames.h b/src/app/common/CompatEnumNames.h
@@ -80,6 +80,15 @@ using StepMode            = StepModeEnum;
 using LevelControlOptions = OptionsBitmap;
 } // namespace LevelControl
 
+namespace ColorControl {
+// https://github.com/project-chip/connectedhomeip/pull/33612 renamed this
+using ColorMode            = ColorModeEnum;
+using ColorTemperature     = ColorTemperatureMireds;
+using ColorCapabilities    = ColorCapabilitiesBitmap;
+using ColorLoopUpdateFlags = UpdateFlagsBitmap;
+using ColorLoopAction      = ColorLoopActionEnum;
+} // namespace ColorControl
+
 namespace RefrigeratorAlarm {
 // https://github.com/project-chip/connectedhomeip/pull/31517 renamed this
 using AlarmMap = AlarmBitmap;

diff --git a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml
@@ -86,7 +86,7 @@ limitations under the License.
     <cluster code="0x0300"/>
     <item name="None" value="0x00"/>
     <item name="OtherOrUnknown" value="0x01"/>
-    <item name="Temperaturemonitoring" value="0x02"/>
+    <item name="TemperatureMonitoring" value="0x02"/>
     <item name="OpticalLuminanceMonitoringAndFeedback" value="0x03"/>
     <item name="OpticalColorMonitoringAndFeedback" value="0x04"/>
   </enum>

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -6933,7 +6933,7 @@ cluster ColorControl = 768 {
   enum DriftCompensationEnum : enum8 {
     kNone = 0;
     kOtherOrUnknown = 1;
-    kTemperaturemonitoring = 2;
+    kTemperatureMonitoring = 2;
     kOpticalLuminanceMonitoringAndFeedback = 3;
     kOpticalColorMonitoringAndFeedback = 4;
   }

diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+1 −1		components/spidriver/spi_master_lobo.c
+7 −7		components/spiffs/spiffs_vfs.c