diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index bbfa01b1e8ef59..c3b7e958c928c1 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -15261,7 +15261,7 @@
"enabled": 1,
"attributes": [
{
- "name": "fan mode",
+ "name": "FanMode",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -15277,7 +15277,7 @@
"reportableChange": 0
},
{
- "name": "fan mode sequence",
+ "name": "FanModeSequence",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -15293,7 +15293,7 @@
"reportableChange": 0
},
{
- "name": "percent setting",
+ "name": "PercentSetting",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -15309,7 +15309,7 @@
"reportableChange": 0
},
{
- "name": "percent current",
+ "name": "PercentCurrent",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -15325,7 +15325,7 @@
"reportableChange": 0
},
{
- "name": "speed max",
+ "name": "SpeedMax",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -15341,7 +15341,7 @@
"reportableChange": 0
},
{
- "name": "speed setting",
+ "name": "SpeedSetting",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -15357,7 +15357,7 @@
"reportableChange": 0
},
{
- "name": "speed current",
+ "name": "SpeedCurrent",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -15373,7 +15373,7 @@
"reportableChange": 0
},
{
- "name": "rock support",
+ "name": "RockSupport",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -15389,7 +15389,7 @@
"reportableChange": 0
},
{
- "name": "rock setting",
+ "name": "RockSetting",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -15405,7 +15405,7 @@
"reportableChange": 0
},
{
- "name": "wind support",
+ "name": "WindSupport",
"code": 9,
"mfgCode": null,
"side": "server",
@@ -15421,7 +15421,7 @@
"reportableChange": 0
},
{
- "name": "wind setting",
+ "name": "WindSetting",
"code": 10,
"mfgCode": null,
"side": "server",
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
index becea153ff9209..0c48849b157dcf 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -14753,7 +14753,7 @@
"enabled": 1,
"attributes": [
{
- "name": "fan mode",
+ "name": "FanMode",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -14769,7 +14769,7 @@
"reportableChange": 0
},
{
- "name": "fan mode sequence",
+ "name": "FanModeSequence",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -14785,7 +14785,7 @@
"reportableChange": 0
},
{
- "name": "percent setting",
+ "name": "PercentSetting",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -14801,7 +14801,7 @@
"reportableChange": 0
},
{
- "name": "percent current",
+ "name": "PercentCurrent",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -14817,7 +14817,7 @@
"reportableChange": 0
},
{
- "name": "speed max",
+ "name": "SpeedMax",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -14833,7 +14833,7 @@
"reportableChange": 0
},
{
- "name": "speed setting",
+ "name": "SpeedSetting",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -14849,7 +14849,7 @@
"reportableChange": 0
},
{
- "name": "speed current",
+ "name": "SpeedCurrent",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -14865,7 +14865,7 @@
"reportableChange": 0
},
{
- "name": "rock support",
+ "name": "RockSupport",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -14881,7 +14881,7 @@
"reportableChange": 0
},
{
- "name": "rock setting",
+ "name": "RockSetting",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -14897,7 +14897,7 @@
"reportableChange": 0
},
{
- "name": "wind support",
+ "name": "WindSupport",
"code": 9,
"mfgCode": null,
"side": "server",
@@ -14913,7 +14913,7 @@
"reportableChange": 0
},
{
- "name": "wind setting",
+ "name": "WindSetting",
"code": 10,
"mfgCode": null,
"side": "server",
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index 3c9a0e0a964793..18f92fc60a8cdd 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
@@ -6037,7 +6037,7 @@
"enabled": 1,
"attributes": [
{
- "name": "fan mode",
+ "name": "FanMode",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6053,7 +6053,7 @@
"reportableChange": 0
},
{
- "name": "fan mode sequence",
+ "name": "FanModeSequence",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6069,7 +6069,7 @@
"reportableChange": 0
},
{
- "name": "percent setting",
+ "name": "PercentSetting",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6085,7 +6085,7 @@
"reportableChange": 0
},
{
- "name": "percent current",
+ "name": "PercentCurrent",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6101,7 +6101,7 @@
"reportableChange": 0
},
{
- "name": "speed max",
+ "name": "SpeedMax",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6117,7 +6117,7 @@
"reportableChange": 0
},
{
- "name": "speed setting",
+ "name": "SpeedSetting",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6133,7 +6133,7 @@
"reportableChange": 0
},
{
- "name": "speed current",
+ "name": "SpeedCurrent",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6149,7 +6149,7 @@
"reportableChange": 0
},
{
- "name": "rock support",
+ "name": "RockSupport",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -6165,7 +6165,7 @@
"reportableChange": 0
},
{
- "name": "rock setting",
+ "name": "RockSetting",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -6181,7 +6181,7 @@
"reportableChange": 0
},
{
- "name": "wind support",
+ "name": "WindSupport",
"code": 9,
"mfgCode": null,
"side": "server",
@@ -6197,7 +6197,7 @@
"reportableChange": 0
},
{
- "name": "wind setting",
+ "name": "WindSetting",
"code": 10,
"mfgCode": null,
"side": "server",
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index 442e68a63b04c5..389dfb13326814 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
@@ -7709,7 +7709,7 @@
"enabled": 1,
"attributes": [
{
- "name": "fan mode",
+ "name": "FanMode",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7725,7 +7725,7 @@
"reportableChange": 0
},
{
- "name": "fan mode sequence",
+ "name": "FanModeSequence",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7741,7 +7741,7 @@
"reportableChange": 0
},
{
- "name": "percent setting",
+ "name": "PercentSetting",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -7757,7 +7757,7 @@
"reportableChange": 0
},
{
- "name": "percent current",
+ "name": "PercentCurrent",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -7773,7 +7773,7 @@
"reportableChange": 0
},
{
- "name": "speed max",
+ "name": "SpeedMax",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -7789,7 +7789,7 @@
"reportableChange": 0
},
{
- "name": "speed setting",
+ "name": "SpeedSetting",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -7805,7 +7805,7 @@
"reportableChange": 0
},
{
- "name": "speed current",
+ "name": "SpeedCurrent",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -7821,7 +7821,7 @@
"reportableChange": 0
},
{
- "name": "rock support",
+ "name": "RockSupport",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -7837,7 +7837,7 @@
"reportableChange": 0
},
{
- "name": "rock setting",
+ "name": "RockSetting",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -7853,7 +7853,7 @@
"reportableChange": 0
},
{
- "name": "wind support",
+ "name": "WindSupport",
"code": 9,
"mfgCode": null,
"side": "server",
@@ -7869,7 +7869,7 @@
"reportableChange": 0
},
{
- "name": "wind setting",
+ "name": "WindSetting",
"code": 10,
"mfgCode": null,
"side": "server",
diff --git a/src/app/tests/suites/TestFanControl.yaml b/src/app/tests/suites/TestFanControl.yaml
index 6e4abf0164b7ef..b27fa4d143e546 100644
--- a/src/app/tests/suites/TestFanControl.yaml
+++ b/src/app/tests/suites/TestFanControl.yaml
@@ -30,144 +30,144 @@ tests:
- label: "Write fan mode"
command: "writeAttribute"
- attribute: "fan mode"
+ attribute: "FanMode"
arguments:
value: 3
- label: "Read back fan mode"
command: "readAttribute"
- attribute: "fan mode"
+ attribute: "FanMode"
response:
value: 3
- label: "Write fan mode sequence"
command: "writeAttribute"
- attribute: "fan mode sequence"
+ attribute: "FanModeSequence"
arguments:
value: 5
- label: "Read back fan mode sequence"
command: "readAttribute"
- attribute: "fan mode sequence"
+ attribute: "FanModeSequence"
response:
value: 5
- label: "Write percent setting"
command: "writeAttribute"
- attribute: "percent setting"
+ attribute: "PercentSetting"
arguments:
value: 84
- label: "Read back percent setting"
command: "readAttribute"
- attribute: "percent setting"
+ attribute: "PercentSetting"
response:
value: 84
- label: "Read back speed setting"
command: "readAttribute"
- attribute: "speed setting"
+ attribute: "SpeedSetting"
response:
value: 84
- label: "Read back speed current"
command: "readAttribute"
- attribute: "speed current"
+ attribute: "SpeedCurrent"
response:
value: 84
- label: "Write percent setting"
command: "writeAttribute"
- attribute: "percent setting"
+ attribute: "PercentSetting"
arguments:
value: null
- label: "Read back percent setting"
command: "readAttribute"
- attribute: "percent setting"
+ attribute: "PercentSetting"
response:
value: 84
- label: "Write speed setting"
command: "writeAttribute"
- attribute: "speed setting"
+ attribute: "SpeedSetting"
arguments:
value: 73
- label: "Read back speed setting"
command: "readAttribute"
- attribute: "speed setting"
+ attribute: "SpeedSetting"
response:
value: 73
- label: "Read back percent setting"
command: "readAttribute"
- attribute: "percent setting"
+ attribute: "PercentSetting"
response:
value: 73
- label: "Read back percent current"
command: "readAttribute"
- attribute: "percent current"
+ attribute: "PercentCurrent"
response:
value: 73
- label: "Write speed setting"
command: "writeAttribute"
- attribute: "speed setting"
+ attribute: "SpeedSetting"
arguments:
value: null
- label: "Read back speed setting"
command: "readAttribute"
- attribute: "speed setting"
+ attribute: "SpeedSetting"
response:
value: 73
- label: "Write fan mode"
command: "writeAttribute"
- attribute: "fan mode"
+ attribute: "FanMode"
arguments:
value: 0x00
- label: "Read back percent setting"
command: "readAttribute"
- attribute: "percent setting"
+ attribute: "PercentSetting"
response:
value: 0
- label: "Read back percent current"
command: "readAttribute"
- attribute: "percent current"
+ attribute: "PercentCurrent"
response:
value: 0
- label: "Read back speed setting"
command: "readAttribute"
- attribute: "speed setting"
+ attribute: "SpeedSetting"
response:
value: 0
- label: "Read back speed current"
command: "readAttribute"
- attribute: "speed current"
+ attribute: "SpeedCurrent"
response:
value: 0
- label: "Write fan mode"
command: "writeAttribute"
- attribute: "fan mode"
+ attribute: "FanMode"
arguments:
value: 0x05
- label: "Read back percent setting"
command: "readAttribute"
- attribute: "percent setting"
+ attribute: "PercentSetting"
response:
value: null
- label: "Read back speed setting"
command: "readAttribute"
- attribute: "speed setting"
+ attribute: "SpeedSetting"
response:
value: null
diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
index 50e44915a729e3..58446ef5e155ac 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
@@ -34,17 +34,17 @@ limitations under the License.
FAN_CONTROL_CLUSTER
true
true
- fan mode
- fan mode sequence
- percent setting
- percent current
- speed max
- speed setting
- speed current
- rock support
- rock setting
- wind support
- wind setting
+ FanMode
+ FanModeSequence
+ PercentSetting
+ PercentCurrent
+ SpeedMax
+ SpeedSetting
+ SpeedCurrent
+ RockSupport
+ RockSetting
+ WindSupport
+ WindSetting
@@ -68,7 +68,7 @@ limitations under the License.
-
+
@@ -81,13 +81,13 @@ limitations under the License.
-
-
+
+
-
-
+
+
Thermostat User Interface Configuration
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index c76c3e64502ae8..db4536f713fe83 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -11981,7 +11981,7 @@
"enabled": 0,
"attributes": [
{
- "name": "fan mode",
+ "name": "FanMode",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -11997,7 +11997,7 @@
"reportableChange": 0
},
{
- "name": "fan mode sequence",
+ "name": "FanModeSequence",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -12013,7 +12013,7 @@
"reportableChange": 0
},
{
- "name": "percent setting",
+ "name": "PercentSetting",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -12029,7 +12029,7 @@
"reportableChange": 0
},
{
- "name": "percent current",
+ "name": "PercentCurrent",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -12045,7 +12045,7 @@
"reportableChange": 0
},
{
- "name": "speed max",
+ "name": "SpeedMax",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -12061,7 +12061,7 @@
"reportableChange": 0
},
{
- "name": "speed setting",
+ "name": "SpeedSetting",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -12077,7 +12077,7 @@
"reportableChange": 0
},
{
- "name": "speed current",
+ "name": "SpeedCurrent",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -12093,7 +12093,7 @@
"reportableChange": 0
},
{
- "name": "rock support",
+ "name": "RockSupport",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -12109,7 +12109,7 @@
"reportableChange": 0
},
{
- "name": "rock setting",
+ "name": "RockSetting",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -12125,7 +12125,7 @@
"reportableChange": 0
},
{
- "name": "wind support",
+ "name": "WindSupport",
"code": 9,
"mfgCode": null,
"side": "server",
@@ -12141,7 +12141,7 @@
"reportableChange": 0
},
{
- "name": "wind setting",
+ "name": "WindSetting",
"code": 10,
"mfgCode": null,
"side": "server",
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
index e11f54965a6ee9..14e9b024dfebe1 100644
--- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
@@ -333,10 +333,10 @@
{ (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* SystemMode */ \
\
/* Endpoint: 1, Cluster: Fan Control (server) */ \
- { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 }, /* fan mode */ \
- { (uint16_t) 0x2, (uint16_t) 0x0, (uint16_t) 0x5 }, /* fan mode sequence */ \
- { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* percent setting */ \
- { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* speed setting */ \
+ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 }, /* FanMode */ \
+ { (uint16_t) 0x2, (uint16_t) 0x0, (uint16_t) 0x5 }, /* FanModeSequence */ \
+ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* PercentSetting */ \
+ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* SpeedSetting */ \
\
/* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \
{ (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */ \
@@ -1062,20 +1062,20 @@
\
/* Endpoint: 1, Cluster: Fan Control (server) */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(22), 0x00000000, 1, ZAP_TYPE(ENUM8), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* fan mode */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* FanMode */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(23), 0x00000001, 1, ZAP_TYPE(ENUM8), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* fan mode sequence */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* FanModeSequence */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(24), 0x00000002, 1, ZAP_TYPE(INT8U), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* percent setting */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(INT8U), 0 }, /* percent current */ \
- { ZAP_SIMPLE_DEFAULT(100), 0x00000004, 1, ZAP_TYPE(INT8U), 0 }, /* speed max */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PercentSetting */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(INT8U), 0 }, /* PercentCurrent */ \
+ { ZAP_SIMPLE_DEFAULT(100), 0x00000004, 1, ZAP_TYPE(INT8U), 0 }, /* SpeedMax */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(25), 0x00000005, 1, ZAP_TYPE(INT8U), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* speed setting */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000006, 1, ZAP_TYPE(INT8U), 0 }, /* speed current */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000007, 1, ZAP_TYPE(BITMAP8), 0 }, /* rock support */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000008, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* rock setting */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000009, 1, ZAP_TYPE(BITMAP8), 0 }, /* wind support */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000A, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* wind setting */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SpeedSetting */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000006, 1, ZAP_TYPE(INT8U), 0 }, /* SpeedCurrent */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000007, 1, ZAP_TYPE(BITMAP8), 0 }, /* RockSupport */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000008, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* RockSetting */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000009, 1, ZAP_TYPE(BITMAP8), 0 }, /* WindSupport */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000A, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* WindSetting */ \
{ ZAP_SIMPLE_DEFAULT(0x0F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
{ ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
index 3163785fd7637d..994d8d9bcf6ce2 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
@@ -273,9 +273,9 @@
{ (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x7 }, /* SystemMode */ \
\
/* Endpoint: 1, Cluster: Fan Control (server) */ \
- { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 }, /* fan mode */ \
- { (uint16_t) 0x2, (uint16_t) 0x0, (uint16_t) 0x5 }, /* fan mode sequence */ \
- { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* percent setting */ \
+ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 }, /* FanMode */ \
+ { (uint16_t) 0x2, (uint16_t) 0x0, (uint16_t) 0x5 }, /* FanModeSequence */ \
+ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* PercentSetting */ \
\
/* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \
{ (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* temperature display mode */ \
@@ -699,12 +699,12 @@
\
/* Endpoint: 1, Cluster: Fan Control (server) */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(8), 0x00000000, 1, ZAP_TYPE(ENUM8), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* fan mode */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* FanMode */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(9), 0x00000001, 1, ZAP_TYPE(ENUM8), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* fan mode sequence */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* FanModeSequence */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(10), 0x00000002, 1, ZAP_TYPE(INT8U), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* percent setting */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(INT8U), 0 }, /* percent current */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PercentSetting */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(INT8U), 0 }, /* PercentCurrent */ \
{ ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
{ ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
diff --git a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h
index eb802c479d5d38..59797304473336 100644
--- a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h
@@ -76,12 +76,12 @@
{ (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* HourFormat */ \
\
/* Endpoint: 1, Cluster: Fan Control (server) */ \
- { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 }, /* fan mode */ \
- { (uint16_t) 0x2, (uint16_t) 0x0, (uint16_t) 0x5 }, /* fan mode sequence */ \
- { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* percent setting */ \
+ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 }, /* FanMode */ \
+ { (uint16_t) 0x2, (uint16_t) 0x0, (uint16_t) 0x5 }, /* FanModeSequence */ \
+ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* PercentSetting */ \
{ \
(uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 \
- } /* speed setting */ \
+ } /* SpeedSetting */ \
}
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
@@ -306,20 +306,20 @@
\
/* Endpoint: 1, Cluster: Fan Control (server) */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(1), 0x00000000, 1, ZAP_TYPE(ENUM8), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* fan mode */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* FanMode */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(2), 0x00000001, 1, ZAP_TYPE(ENUM8), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* fan mode sequence */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* FanModeSequence */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(3), 0x00000002, 1, ZAP_TYPE(INT8U), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* percent setting */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(INT8U), 0 }, /* percent current */ \
- { ZAP_SIMPLE_DEFAULT(1), 0x00000004, 1, ZAP_TYPE(INT8U), 0 }, /* speed max */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PercentSetting */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(INT8U), 0 }, /* PercentCurrent */ \
+ { ZAP_SIMPLE_DEFAULT(1), 0x00000004, 1, ZAP_TYPE(INT8U), 0 }, /* SpeedMax */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(4), 0x00000005, 1, ZAP_TYPE(INT8U), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* speed setting */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x00000006, 1, ZAP_TYPE(INT8U), 0 }, /* speed current */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000007, 1, ZAP_TYPE(BITMAP8), 0 }, /* rock support */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000008, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* rock setting */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000009, 1, ZAP_TYPE(BITMAP8), 0 }, /* wind support */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000A, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* wind setting */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SpeedSetting */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x00000006, 1, ZAP_TYPE(INT8U), 0 }, /* SpeedCurrent */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000007, 1, ZAP_TYPE(BITMAP8), 0 }, /* RockSupport */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000008, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* RockSetting */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000009, 1, ZAP_TYPE(BITMAP8), 0 }, /* WindSupport */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000A, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* WindSetting */ \
{ ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
{ ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
}
diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h
index a843bc4882d8ed..fe21617fa52415 100644
--- a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h
@@ -76,12 +76,12 @@
{ (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x1 }, /* HourFormat */ \
\
/* Endpoint: 1, Cluster: Fan Control (server) */ \
- { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 }, /* fan mode */ \
- { (uint16_t) 0x2, (uint16_t) 0x0, (uint16_t) 0x5 }, /* fan mode sequence */ \
- { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* percent setting */ \
+ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 }, /* FanMode */ \
+ { (uint16_t) 0x2, (uint16_t) 0x0, (uint16_t) 0x5 }, /* FanModeSequence */ \
+ { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 }, /* PercentSetting */ \
{ \
(uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x64 \
- } /* speed setting */ \
+ } /* SpeedSetting */ \
}
#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
@@ -307,16 +307,16 @@
\
/* Endpoint: 1, Cluster: Fan Control (server) */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(1), 0x00000000, 1, ZAP_TYPE(ENUM8), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* fan mode */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* FanMode */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(2), 0x00000001, 1, ZAP_TYPE(ENUM8), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* fan mode sequence */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* FanModeSequence */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(3), 0x00000002, 1, ZAP_TYPE(INT8U), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* percent setting */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(INT8U), 0 }, /* percent current */ \
- { ZAP_SIMPLE_DEFAULT(10), 0x00000004, 1, ZAP_TYPE(INT8U), 0 }, /* speed max */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PercentSetting */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(INT8U), 0 }, /* PercentCurrent */ \
+ { ZAP_SIMPLE_DEFAULT(10), 0x00000004, 1, ZAP_TYPE(INT8U), 0 }, /* SpeedMax */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(4), 0x00000005, 1, ZAP_TYPE(INT8U), \
- ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* speed setting */ \
- { ZAP_SIMPLE_DEFAULT(0x00), 0x00000006, 1, ZAP_TYPE(INT8U), 0 }, /* speed current */ \
+ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SpeedSetting */ \
+ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000006, 1, ZAP_TYPE(INT8U), 0 }, /* SpeedCurrent */ \
{ ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
{ ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
}
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index 3b3e7a407c4511..b8d98ea160ab6d 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -7596,57 +7596,57 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
case FanControl::Attributes::FanMode::Id: {
chip::app::Clusters::FanControl::FanModeType value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("fan mode", 1, value);
+ return DataModelLogger::LogValue("FanMode", 1, value);
}
case FanControl::Attributes::FanModeSequence::Id: {
chip::app::Clusters::FanControl::FanModeSequenceType value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("fan mode sequence", 1, value);
+ return DataModelLogger::LogValue("FanModeSequence", 1, value);
}
case FanControl::Attributes::PercentSetting::Id: {
chip::app::DataModel::Nullable value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("percent setting", 1, value);
+ return DataModelLogger::LogValue("PercentSetting", 1, value);
}
case FanControl::Attributes::PercentCurrent::Id: {
uint8_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("percent current", 1, value);
+ return DataModelLogger::LogValue("PercentCurrent", 1, value);
}
case FanControl::Attributes::SpeedMax::Id: {
uint8_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("speed max", 1, value);
+ return DataModelLogger::LogValue("SpeedMax", 1, value);
}
case FanControl::Attributes::SpeedSetting::Id: {
chip::app::DataModel::Nullable value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("speed setting", 1, value);
+ return DataModelLogger::LogValue("SpeedSetting", 1, value);
}
case FanControl::Attributes::SpeedCurrent::Id: {
uint8_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("speed current", 1, value);
+ return DataModelLogger::LogValue("SpeedCurrent", 1, value);
}
case FanControl::Attributes::RockSupport::Id: {
uint8_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("rock support", 1, value);
+ return DataModelLogger::LogValue("RockSupport", 1, value);
}
case FanControl::Attributes::RockSetting::Id: {
uint8_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("rock setting", 1, value);
+ return DataModelLogger::LogValue("RockSetting", 1, value);
}
case FanControl::Attributes::WindSupport::Id: {
uint8_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("wind support", 1, value);
+ return DataModelLogger::LogValue("WindSupport", 1, value);
}
case FanControl::Attributes::WindSetting::Id: {
uint8_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("wind setting", 1, value);
+ return DataModelLogger::LogValue("WindSetting", 1, value);
}
case FanControl::Attributes::GeneratedCommandList::Id: {
chip::app::DataModel::DecodableList value;
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index d97c7a72260270..8ac138182e76fc 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -101170,7 +101170,7 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValue("fan mode", actualValue, 3U));
+ VerifyOrReturn(CheckValue("FanMode", actualValue, 3U));
}
NextTest();
@@ -101214,7 +101214,7 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValue("fan mode sequence", actualValue, 5U));
+ VerifyOrReturn(CheckValue("FanModeSequence", actualValue, 5U));
}
NextTest();
@@ -101258,8 +101258,8 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValueNonNull("percent setting", actualValue));
- VerifyOrReturn(CheckValue("percent setting", actualValue, 84U));
+ VerifyOrReturn(CheckValueNonNull("PercentSetting", actualValue));
+ VerifyOrReturn(CheckValue("PercentSetting", actualValue, 84U));
}
NextTest();
@@ -101282,8 +101282,8 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValueNonNull("speed setting", actualValue));
- VerifyOrReturn(CheckValue("speed setting", actualValue, 84U));
+ VerifyOrReturn(CheckValueNonNull("SpeedSetting", actualValue));
+ VerifyOrReturn(CheckValue("SpeedSetting", actualValue, 84U));
}
NextTest();
@@ -101306,7 +101306,7 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValue("speed current", actualValue, 84U));
+ VerifyOrReturn(CheckValue("SpeedCurrent", actualValue, 84U));
}
NextTest();
@@ -101350,8 +101350,8 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValueNonNull("percent setting", actualValue));
- VerifyOrReturn(CheckValue("percent setting", actualValue, 84U));
+ VerifyOrReturn(CheckValueNonNull("PercentSetting", actualValue));
+ VerifyOrReturn(CheckValue("PercentSetting", actualValue, 84U));
}
NextTest();
@@ -101395,8 +101395,8 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValueNonNull("speed setting", actualValue));
- VerifyOrReturn(CheckValue("speed setting", actualValue, 73U));
+ VerifyOrReturn(CheckValueNonNull("SpeedSetting", actualValue));
+ VerifyOrReturn(CheckValue("SpeedSetting", actualValue, 73U));
}
NextTest();
@@ -101419,8 +101419,8 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValueNonNull("percent setting", actualValue));
- VerifyOrReturn(CheckValue("percent setting", actualValue, 73U));
+ VerifyOrReturn(CheckValueNonNull("PercentSetting", actualValue));
+ VerifyOrReturn(CheckValue("PercentSetting", actualValue, 73U));
}
NextTest();
@@ -101443,7 +101443,7 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValue("percent current", actualValue, 73U));
+ VerifyOrReturn(CheckValue("PercentCurrent", actualValue, 73U));
}
NextTest();
@@ -101487,8 +101487,8 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValueNonNull("speed setting", actualValue));
- VerifyOrReturn(CheckValue("speed setting", actualValue, 73U));
+ VerifyOrReturn(CheckValueNonNull("SpeedSetting", actualValue));
+ VerifyOrReturn(CheckValue("SpeedSetting", actualValue, 73U));
}
NextTest();
@@ -101532,8 +101532,8 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValueNonNull("percent setting", actualValue));
- VerifyOrReturn(CheckValue("percent setting", actualValue, 0U));
+ VerifyOrReturn(CheckValueNonNull("PercentSetting", actualValue));
+ VerifyOrReturn(CheckValue("PercentSetting", actualValue, 0U));
}
NextTest();
@@ -101556,7 +101556,7 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValue("percent current", actualValue, 0U));
+ VerifyOrReturn(CheckValue("PercentCurrent", actualValue, 0U));
}
NextTest();
@@ -101579,8 +101579,8 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValueNonNull("speed setting", actualValue));
- VerifyOrReturn(CheckValue("speed setting", actualValue, 0U));
+ VerifyOrReturn(CheckValueNonNull("SpeedSetting", actualValue));
+ VerifyOrReturn(CheckValue("SpeedSetting", actualValue, 0U));
}
NextTest();
@@ -101603,7 +101603,7 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValue("speed current", actualValue, 0U));
+ VerifyOrReturn(CheckValue("SpeedCurrent", actualValue, 0U));
}
NextTest();
@@ -101647,7 +101647,7 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValueNull("percent setting", actualValue));
+ VerifyOrReturn(CheckValueNull("PercentSetting", actualValue));
}
NextTest();
@@ -101670,7 +101670,7 @@ class TestFanControl : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValueNull("speed setting", actualValue));
+ VerifyOrReturn(CheckValueNull("SpeedSetting", actualValue));
}
NextTest();