Matter Thermostat: Use fanMode capability

nickolas-deboom · nickolas-deboom · commit 10c58efc4d60 · 2025-06-18T11:42:03.000-05:00
This change replaces the use of thermostatFanMode with fanMode, to
better align with the fan modes and sequences defined by the Fan Control
cluster.

Also, fanMode is now used in fan profiles over airConditionerFanMode.
diff --git a/drivers/SmartThings/matter-thermostat/profiles/fan-generic.yml b/drivers/SmartThings/matter-thermostat/profiles/fan-generic.yml
@@ -2,7 +2,7 @@ name: fan-generic
 components:
 - id: main
   capabilities:
-  - id: airConditionerFanMode
+  - id: fanMode
     version: 1
   - id: fanSpeedPercent
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/fan-rock-wind.yml b/drivers/SmartThings/matter-thermostat/profiles/fan-rock-wind.yml
@@ -2,7 +2,7 @@ name: fan-rock-wind
 components:
 - id: main
   capabilities:
-  - id: airConditionerFanMode
+  - id: fanMode
     version: 1
   - id: fanSpeedPercent
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/fan-rock.yml b/drivers/SmartThings/matter-thermostat/profiles/fan-rock.yml
@@ -2,7 +2,7 @@ name: fan-rock
 components:
 - id: main
   capabilities:
-  - id: airConditionerFanMode
+  - id: fanMode
     version: 1
   - id: fanSpeedPercent
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/fan-wind.yml b/drivers/SmartThings/matter-thermostat/profiles/fan-wind.yml
@@ -2,7 +2,7 @@ name: fan-wind
 components:
 - id: main
   capabilities:
-  - id: airConditionerFanMode
+  - id: fanMode
     version: 1
   - id: fanSpeedPercent
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/fan.yml b/drivers/SmartThings/matter-thermostat/profiles/fan.yml
@@ -2,7 +2,7 @@ name: fan
 components:
 - id: main
   capabilities:
-  - id: airConditionerFanMode
+  - id: fanMode
     version: 1
   - id: fanSpeedPercent
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-batteryLevel.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-batteryLevel.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-cooling-only-batteryLevel.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-cooling-only-batteryLevel.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatCoolingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-cooling-only-nostate-batteryLevel.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-cooling-only-nostate-batteryLevel.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatCoolingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-cooling-only-nostate-nobattery.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-cooling-only-nostate-nobattery.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatCoolingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-cooling-only-nostate.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-cooling-only-nostate.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatCoolingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-cooling-only.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-cooling-only.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatCoolingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-heating-only-batteryLevel.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-heating-only-batteryLevel.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-heating-only-nostate-batteryLevel.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-heating-only-nostate-batteryLevel.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-heating-only-nostate-nobattery.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-heating-only-nostate-nobattery.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-heating-only-nostate.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-heating-only-nostate.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-heating-only.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-heating-only.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-nostate-batteryLevel.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-nostate-batteryLevel.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-nostate-nobattery.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-nostate-nobattery.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-nostate.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan-nostate.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-fan.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-batteryLevel.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-batteryLevel.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-cooling-only-nostate-nobattery.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-cooling-only-nostate-nobattery.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatCoolingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-cooling-only-nostate.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-cooling-only-nostate.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatCoolingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-cooling-only.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-cooling-only.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatCoolingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-heating-only-batteryLevel.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-heating-only-batteryLevel.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-heating-only-nostate-batteryLevel.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-heating-only-nostate-batteryLevel.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-heating-only-nostate-nobattery.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-heating-only-nostate-nobattery.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-heating-only-nostate.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-heating-only-nostate.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-heating-only.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-heating-only.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-nostate-batteryLevel.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-nostate-batteryLevel.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-nostate-nobattery.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-nostate-nobattery.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-nostate.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan-nostate.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-humidity-fan.yml
@@ -6,7 +6,7 @@ components:
     version: 1
   - id: thermostatMode
     version: 1
-  - id: thermostatFanMode
+  - id: fanMode
     version: 1
   - id: thermostatHeatingSetpoint
     version: 1
diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-modular.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-modular.yml
@@ -6,7 +6,7 @@ components:
         version: 1
       - id: thermostatMode
         version: 1
-      - id: thermostatFanMode
+      - id: fanMode
         version: 1
         optional: true
       - id: thermostatHeatingSetpoint
diff --git a/drivers/SmartThings/matter-thermostat/src/init.lua b/drivers/SmartThings/matter-thermostat/src/init.lua
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier.lua
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_api9.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_api9.lua
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_modular.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_modular.lua
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_fan.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_fan.lua
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat.lua
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_composed_bridged.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_composed_bridged.lua
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_modular.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_modular.lua
