Implementing changes from code review: edit of the device profile name and capability order, edit of the match_profile's condition

Author: JanJakubiszyn

drivers/SmartThings/matter-switch/fingerprints.yml

@@ -141,7 +141,7 @@ matterManufacturer:
     deviceLabel: "Motion Detector II [+M]"
     vendorId: 0x1209
     productId: 0x3013
-    deviceProfileName:  light-level-motion-illuminance-battery-temp
+    deviceProfileName:  light-level-battery-illuminance-motion-temperature
 #Chengdu
   - id: "5218/8197"
     deviceLabel: Magic Cube DS001

drivers/SmartThings/matter-switch/profiles/light-level-motion-illuminance-battery-temp.yml renamed to drivers/SmartThings/matter-switch/profiles/light-level-battery-illuminance-motion-temperature.yml

@@ -1,4 +1,4 @@
-name: light-level-motion-illuminance-battery-temp
+name: light-level-battery-illuminance-motion-temperature
 components:
   - id: main
     capabilities:
@@ -8,12 +8,6 @@ components:
         version: 1
       - id: illuminanceMeasurement
         version: 1
-      - id: battery
-        version: 1
-      - id: firmwareUpdate
-        version: 1
-      - id: refresh
-        version: 1
       - id: switch
         version: 1
       - id: switchLevel
@@ -22,6 +16,12 @@ components:
           values:
             - key: "level.value"
               range: [1, 100]
+      - id: battery
+        version: 1
+      - id: firmwareUpdate
+        version: 1
+      - id: refresh
+        version: 1
     categories:
       - name: MotionSensor
 preferences:

drivers/SmartThings/matter-switch/src/switch_utils/device_configuration.lua

@@ -192,10 +192,7 @@ function DeviceConfiguration.match_profile(driver, device)
     elseif generic_profile("light-color-level") and #device:get_endpoints(clusters.FanControl.ID) > 0 then
       updated_profile = "light-color-level-fan"
     elseif generic_profile("light-level") and #device:get_endpoints(clusters.OccupancySensing.ID) > 0 then
-      updated_profile = "light-level-motion"
-      if switch_utils.check_switch_category_vendor_overrides(device) then
-        updated_profile = fields.vendor_overrides[device.manufacturer_info.vendor_id][device.manufacturer_info.product_id].target_profile
-      end
+      updated_profile = switch_utils.get_product_override_field(device, "target_profile") or "light-level-motion"
     elseif generic_profile("light-level-colorTemperature") or generic_profile("light-color-level") then
       -- ignore attempts to dynamically profile light-level-colorTemperature and light-color-level devices for now, since
       -- these may lose fingerprinted Kelvin ranges when dynamically profiled.

drivers/SmartThings/matter-switch/src/switch_utils/fields.lua

@@ -119,7 +119,7 @@ SwitchFields.vendor_overrides = {
     [0x2004] = { is_climate_sensor_w100 = true }, -- Climate Sensor W100, requires unique profile
   },
   [0x1209] = { -- Bosch
-    [0x3013] = {target_profile = "light-level-motion-illuminance-battery-temp"}
+    [0x3013] = {target_profile = "light-level-battery-illuminance-motion-temperature"}
   }
 }