Skip to content

Commit e7f323d

Browse files
[SL-ONLY] Themostat datamodel (SiliconLabsSoftware#858) (SiliconLabsSoftware#904)
1 parent 8d424f4 commit e7f323d

8 files changed

Lines changed: 6817 additions & 183 deletions

File tree

.github/workflows/silabs-zap-failure-regen.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
./scripts/tools/zap/generate.py examples/base-platform-app/silabs/data_model/platform-wifi-app.zap &&
7272
./scripts/tools/zap/generate.py examples/base-platform-app/silabs/data_model/platform-wifi-icd-app.zap &&
7373
./scripts/tools/zap/generate.py examples/thermostat/silabs/data_model/thermostat-thread-app.zap &&
74+
./scripts/tools/zap/generate.py examples/thermostat/silabs/data_model/thermostat-wifi-app.zap &&
7475
./scripts/tools/zap/generate.py examples/oven-app/oven-app-common/oven-app.zap &&
7576
./scripts/tools/zap/generate.py examples/oven-app/silabs/data_model/oven-wifi-app.zap &&
7677
./scripts/tools/zap/generate.py examples/rangehood-app/silabs/data_model/rangehood-wifi-app.zap

examples/thermostat/silabs/data_model/BUILD.gn

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ import("${chip_root}/src/app/chip_data_model.gni")
1717
import("${chip_root}/src/platform/device.gni")
1818

1919
chip_data_model("silabs-thermostat") {
20-
zap_file = "thermostat-thread-app.zap"
20+
if (chip_enable_wifi) {
21+
zap_file = "thermostat-wifi-app.zap"
22+
} else {
23+
zap_file = "thermostat-thread-app.zap"
24+
}
2125
is_server = true
2226
}

examples/thermostat/silabs/data_model/thermostat-thread-app.matter

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2695,10 +2695,6 @@ endpoint 1 {
26952695
ram attribute activePresetHandle;
26962696
callback attribute presets;
26972697
ram attribute setpointHoldExpiryTimestamp;
2698-
callback attribute maxThermostatSuggestions;
2699-
callback attribute thermostatSuggestions;
2700-
callback attribute currentThermostatSuggestion;
2701-
callback attribute thermostatSuggestionNotFollowingReason;
27022698
callback attribute generatedCommandList;
27032699
callback attribute acceptedCommandList;
27042700
callback attribute attributeList;
@@ -2707,8 +2703,6 @@ endpoint 1 {
27072703

27082704
handle command SetpointRaiseLower;
27092705
handle command SetActivePresetRequest;
2710-
handle command AddThermostatSuggestion;
2711-
handle command RemoveThermostatSuggestion;
27122706
handle command AtomicRequest;
27132707
}
27142708

examples/thermostat/silabs/data_model/thermostat-thread-app.zap

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -4168,14 +4168,6 @@
41684168
"isIncoming": 1,
41694169
"isEnabled": 1
41704170
},
4171-
{
4172-
"name": "AddThermostatSuggestionResponse",
4173-
"code": 2,
4174-
"mfgCode": null,
4175-
"source": "server",
4176-
"isIncoming": 0,
4177-
"isEnabled": 1
4178-
},
41794171
{
41804172
"name": "SetActivePresetRequest",
41814173
"code": 6,
@@ -4184,22 +4176,6 @@
41844176
"isIncoming": 1,
41854177
"isEnabled": 1
41864178
},
4187-
{
4188-
"name": "AddThermostatSuggestion",
4189-
"code": 7,
4190-
"mfgCode": null,
4191-
"source": "client",
4192-
"isIncoming": 1,
4193-
"isEnabled": 1
4194-
},
4195-
{
4196-
"name": "RemoveThermostatSuggestion",
4197-
"code": 8,
4198-
"mfgCode": null,
4199-
"source": "client",
4200-
"isIncoming": 1,
4201-
"isEnabled": 1
4202-
},
42034179
{
42044180
"name": "AtomicResponse",
42054181
"code": 253,
@@ -4538,70 +4514,6 @@
45384514
"maxInterval": 65534,
45394515
"reportableChange": 0
45404516
},
4541-
{
4542-
"name": "MaxThermostatSuggestions",
4543-
"code": 83,
4544-
"mfgCode": null,
4545-
"side": "server",
4546-
"type": "int8u",
4547-
"included": 1,
4548-
"storageOption": "External",
4549-
"singleton": 0,
4550-
"bounded": 0,
4551-
"defaultValue": null,
4552-
"reportable": 1,
4553-
"minInterval": 1,
4554-
"maxInterval": 65534,
4555-
"reportableChange": 0
4556-
},
4557-
{
4558-
"name": "ThermostatSuggestions",
4559-
"code": 84,
4560-
"mfgCode": null,
4561-
"side": "server",
4562-
"type": "array",
4563-
"included": 1,
4564-
"storageOption": "External",
4565-
"singleton": 0,
4566-
"bounded": 0,
4567-
"defaultValue": null,
4568-
"reportable": 1,
4569-
"minInterval": 1,
4570-
"maxInterval": 65534,
4571-
"reportableChange": 0
4572-
},
4573-
{
4574-
"name": "CurrentThermostatSuggestion",
4575-
"code": 85,
4576-
"mfgCode": null,
4577-
"side": "server",
4578-
"type": "ThermostatSuggestionStruct",
4579-
"included": 1,
4580-
"storageOption": "External",
4581-
"singleton": 0,
4582-
"bounded": 0,
4583-
"defaultValue": null,
4584-
"reportable": 1,
4585-
"minInterval": 1,
4586-
"maxInterval": 65534,
4587-
"reportableChange": 0
4588-
},
4589-
{
4590-
"name": "ThermostatSuggestionNotFollowingReason",
4591-
"code": 86,
4592-
"mfgCode": null,
4593-
"side": "server",
4594-
"type": "ThermostatSuggestionNotFollowingReasonBitmap",
4595-
"included": 1,
4596-
"storageOption": "External",
4597-
"singleton": 0,
4598-
"bounded": 0,
4599-
"defaultValue": null,
4600-
"reportable": 1,
4601-
"minInterval": 1,
4602-
"maxInterval": 65534,
4603-
"reportableChange": 0
4604-
},
46054517
{
46064518
"name": "GeneratedCommandList",
46074519
"code": 65528,

0 commit comments

Comments
 (0)