Only add temperatureMeasurement capability if not already added

Author: ctowns

drivers/SmartThings/matter-thermostat/src/init.lua

@@ -883,32 +883,32 @@ local function match_modular_profile_air_purifer(driver, device)
   local CAPABILITIES_LIST_IDX = 2
 
   local humidity_eps = device:get_endpoints(clusters.RelativeHumidityMeasurement.ID)
-  local temp_eps = embedded_cluster_utils.get_endpoints(device, clusters.temperatureMeasurement.ID)
+  local temp_eps = embedded_cluster_utils.get_endpoints(device, clusters.TemperatureMeasurement.ID)
   if #humidity_eps > 0 then
     table.insert(main_component_capabilities, capabilities.relativeHumidityMeasurement.ID)
   end
   if #temp_eps > 0 then
-    table.insert(main_component_capabilities, capabilities.relativeHumidityMeasurement.ID)
+    table.insert(main_component_capabilities, capabilities.temperatureMeasurement.ID)
   end
 
   local hepa_filter_eps = embedded_cluster_utils.get_endpoints(device, clusters.HepaFilterMonitoring.ID)
   local ac_filter_eps = embedded_cluster_utils.get_endpoints(device, clusters.ActivatedCarbonFilterMonitoring.ID)
 
   if #hepa_filter_eps > 0 then
-    table.insert(hepa_filter_component_capabilities, capabilities.filterStatus.ID)
-
     local filter_state_eps = embedded_cluster_utils.get_endpoints(device, clusters.HepaFilterMonitoring.ID, {feature_bitmap = clusters.HepaFilterMonitoring.types.Feature.CONDITION})
     if #filter_state_eps > 0 then
       table.insert(hepa_filter_component_capabilities, capabilities.filterState.ID)
     end
+
+    table.insert(hepa_filter_component_capabilities, capabilities.filterStatus.ID)
   end
   if #ac_filter_eps > 0 then
-    table.insert(ac_filter_component_capabilties, capabilities.filterStatus.ID)
-
     local filter_state_eps = embedded_cluster_utils.get_endpoints(device, clusters.ActivatedCarbonFilterMonitoring.ID, {feature_bitmap = clusters.ActivatedCarbonFilterMonitoring.types.Feature.CONDITION})
     if #filter_state_eps > 0 then
       table.insert(ac_filter_component_capabilties, capabilities.filterState.ID)
     end
+
+    table.insert(ac_filter_component_capabilties, capabilities.filterStatus.ID)
   end
 
   -- determine fan capabilities, note that airPurifierFanMode is already mandatory
@@ -927,7 +927,11 @@ local function match_modular_profile_air_purifer(driver, device)
   if #thermostat_eps > 0 then
     -- thermostatMode and temperatureMeasurement should be expected if thermostat is present
     table.insert(main_component_capabilities, capabilities.thermostatMode.ID)
-    table.insert(main_component_capabilities, capabilities.temperatureMeasurement.ID)
+
+    -- only add temperatureMeasurement if it is not already added via TemperatureMeasurement cluster support
+    if #temp_eps == 0 then
+      table.insert(main_component_capabilities, capabilities.temperatureMeasurement.ID)
+    end
     local thermostat_capabilities = get_thermostat_optional_capabilities(device)
     for _, capability_id in pairs(thermostat_capabilities) do
       table.insert(main_component_capabilities, capability_id)

drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_modular.lua

@@ -302,10 +302,10 @@ local expected_update_metadata= {
       "main",
       {
         "relativeHumidityMeasurement",
+        "temperatureMeasurement",
         "fanOscillationMode",
         "windMode",
         "thermostatMode",
-        "temperatureMeasurement",
         "thermostatHeatingSetpoint",
         "airQualityHealthConcern",
         "dustSensor",