Skip to content

Commit ba877a8

Browse files
hastyhasty
committed
Remove PresetsSchedulesEditable and QueuedPreset from various places
1 parent c37228c commit ba877a8

File tree

7 files changed

+119
-100
lines changed

7 files changed

+119
-100
lines changed

‎scripts/tools/zap/tests/inputs/all-clusters-app.zap

+46-62
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
}
1818
],
1919
"package": [
20-
{
21-
"pathRelativity": "relativeToZap",
22-
"path": "../../../../../src/app/zap-templates/app-templates.json",
23-
"type": "gen-templates-json",
24-
"category": "matter",
25-
"version": "chip-v1"
26-
},
2720
{
2821
"pathRelativity": "relativeToZap",
2922
"path": "../../../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
3023
"type": "zcl-properties",
3124
"category": "matter",
3225
"version": 1,
3326
"description": "Matter SDK ZCL data with some extensions"
27+
},
28+
{
29+
"pathRelativity": "relativeToZap",
30+
"path": "../../../../../src/app/zap-templates/app-templates.json",
31+
"type": "gen-templates-json",
32+
"category": "matter",
33+
"version": "chip-v1"
3434
}
3535
],
3636
"endpointTypes": [
@@ -15920,6 +15920,38 @@
1592015920
"source": "client",
1592115921
"isIncoming": 1,
1592215922
"isEnabled": 1
15923+
},
15924+
{
15925+
"name": "SetActiveScheduleRequest",
15926+
"code": 5,
15927+
"mfgCode": null,
15928+
"source": "client",
15929+
"isIncoming": 1,
15930+
"isEnabled": 1
15931+
},
15932+
{
15933+
"name": "SetActivePresetRequest",
15934+
"code": 6,
15935+
"mfgCode": null,
15936+
"source": "client",
15937+
"isIncoming": 1,
15938+
"isEnabled": 1
15939+
},
15940+
{
15941+
"name": "AtomicResponse",
15942+
"code": 253,
15943+
"mfgCode": null,
15944+
"source": "server",
15945+
"isIncoming": 0,
15946+
"isEnabled": 1
15947+
},
15948+
{
15949+
"name": "AtomicRequest",
15950+
"code": 254,
15951+
"mfgCode": null,
15952+
"source": "client",
15953+
"isIncoming": 1,
15954+
"isEnabled": 1
1592315955
}
1592415956
],
1592515957
"attributes": [
@@ -16008,7 +16040,7 @@
1600816040
"code": 17,
1600916041
"mfgCode": null,
1601016042
"side": "server",
16011-
"type": "int16s",
16043+
"type": "temperature",
1601216044
"included": 1,
1601316045
"storageOption": "RAM",
1601416046
"singleton": 0,
@@ -16024,7 +16056,7 @@
1602416056
"code": 18,
1602516057
"mfgCode": null,
1602616058
"side": "server",
16027-
"type": "int16s",
16059+
"type": "temperature",
1602816060
"included": 1,
1602916061
"storageOption": "RAM",
1603016062
"singleton": 0,
@@ -16040,7 +16072,7 @@
1604016072
"code": 21,
1604116073
"mfgCode": null,
1604216074
"side": "server",
16043-
"type": "int16s",
16075+
"type": "temperature",
1604416076
"included": 1,
1604516077
"storageOption": "RAM",
1604616078
"singleton": 0,
@@ -16056,7 +16088,7 @@
1605616088
"code": 22,
1605716089
"mfgCode": null,
1605816090
"side": "server",
16059-
"type": "int16s",
16091+
"type": "temperature",
1606016092
"included": 1,
1606116093
"storageOption": "RAM",
1606216094
"singleton": 0,
@@ -16072,7 +16104,7 @@
1607216104
"code": 23,
1607316105
"mfgCode": null,
1607416106
"side": "server",
16075-
"type": "int16s",
16107+
"type": "temperature",
1607616108
"included": 1,
1607716109
"storageOption": "RAM",
1607816110
"singleton": 0,
@@ -16088,7 +16120,7 @@
1608816120
"code": 24,
1608916121
"mfgCode": null,
1609016122
"side": "server",
16091-
"type": "int16s",
16123+
"type": "temperature",
1609216124
"included": 1,
1609316125
"storageOption": "RAM",
1609416126
"singleton": 0,
@@ -16291,41 +16323,9 @@
1629116323
"maxInterval": 65534,
1629216324
"reportableChange": 0
1629316325
},
16294-
{
16295-
"name": "PresetsSchedulesEditable",
16296-
"code": 82,
16297-
"mfgCode": null,
16298-
"side": "server",
16299-
"type": "boolean",
16300-
"included": 1,
16301-
"storageOption": "RAM",
16302-
"singleton": 0,
16303-
"bounded": 0,
16304-
"defaultValue": "",
16305-
"reportable": 1,
16306-
"minInterval": 1,
16307-
"maxInterval": 65534,
16308-
"reportableChange": 0
16309-
},
16310-
{
16311-
"name": "TemperatureSetpointHoldPolicy",
16312-
"code": 83,
16313-
"mfgCode": null,
16314-
"side": "server",
16315-
"type": "TemperatureSetpointHoldPolicyBitmap",
16316-
"included": 1,
16317-
"storageOption": "RAM",
16318-
"singleton": 0,
16319-
"bounded": 0,
16320-
"defaultValue": "0",
16321-
"reportable": 1,
16322-
"minInterval": 1,
16323-
"maxInterval": 65534,
16324-
"reportableChange": 0
16325-
},
1632616326
{
1632716327
"name": "SetpointHoldExpiryTimestamp",
16328-
"code": 84,
16328+
"code": 82,
1632916329
"mfgCode": null,
1633016330
"side": "server",
1633116331
"type": "epoch_s",
@@ -16339,22 +16339,6 @@
1633916339
"maxInterval": 65534,
1634016340
"reportableChange": 0
1634116341
},
16342-
{
16343-
"name": "QueuedPreset",
16344-
"code": 85,
16345-
"mfgCode": null,
16346-
"side": "server",
16347-
"type": "QueuedPresetStruct",
16348-
"included": 1,
16349-
"storageOption": "External",
16350-
"singleton": 0,
16351-
"bounded": 0,
16352-
"defaultValue": null,
16353-
"reportable": 1,
16354-
"minInterval": 1,
16355-
"maxInterval": 65534,
16356-
"reportableChange": 0
16357-
},
1635816342
{
1635916343
"name": "GeneratedCommandList",
1636016344
"code": 65528,

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp

+27
Original file line numberDiff line numberDiff line change
@@ -1420,6 +1420,33 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
14201420
}
14211421
break;
14221422
}
1423+
case Commands::SetActiveScheduleRequest::Id: {
1424+
Commands::SetActiveScheduleRequest::DecodableType commandData;
1425+
TLVError = DataModel::Decode(aDataTlv, commandData);
1426+
if (TLVError == CHIP_NO_ERROR)
1427+
{
1428+
wasHandled = emberAfThermostatClusterSetActiveScheduleRequestCallback(apCommandObj, aCommandPath, commandData);
1429+
}
1430+
break;
1431+
}
1432+
case Commands::SetActivePresetRequest::Id: {
1433+
Commands::SetActivePresetRequest::DecodableType commandData;
1434+
TLVError = DataModel::Decode(aDataTlv, commandData);
1435+
if (TLVError == CHIP_NO_ERROR)
1436+
{
1437+
wasHandled = emberAfThermostatClusterSetActivePresetRequestCallback(apCommandObj, aCommandPath, commandData);
1438+
}
1439+
break;
1440+
}
1441+
case Commands::AtomicRequest::Id: {
1442+
Commands::AtomicRequest::DecodableType commandData;
1443+
TLVError = DataModel::Decode(aDataTlv, commandData);
1444+
if (TLVError == CHIP_NO_ERROR)
1445+
{
1446+
wasHandled = emberAfThermostatClusterAtomicRequestCallback(apCommandObj, aCommandPath, commandData);
1447+
}
1448+
break;
1449+
}
14231450
default: {
14241451
// Unrecognized command ID, error status will apply.
14251452
apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand);

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h

+3
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@
400400
0x00000062, /* Cluster: Scenes Management, Command: RemoveScene, Privilege: manage */ \
401401
0x00000062, /* Cluster: Scenes Management, Command: RemoveAllScenes, Privilege: manage */ \
402402
0x00000062, /* Cluster: Scenes Management, Command: StoreScene, Privilege: manage */ \
403+
0x00000201, /* Cluster: Thermostat, Command: AtomicRequest, Privilege: manage */ \
403404
0xFFF1FC06, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \
404405
0xFFF1FC06, /* Cluster: Fault Injection, Command: FailRandomlyAtFault, Privilege: manage */ \
405406
}
@@ -449,6 +450,7 @@
449450
0x00000002, /* Cluster: Scenes Management, Command: RemoveScene, Privilege: manage */ \
450451
0x00000003, /* Cluster: Scenes Management, Command: RemoveAllScenes, Privilege: manage */ \
451452
0x00000004, /* Cluster: Scenes Management, Command: StoreScene, Privilege: manage */ \
453+
0x000000FE, /* Cluster: Thermostat, Command: AtomicRequest, Privilege: manage */ \
452454
0x00000000, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \
453455
0x00000001, /* Cluster: Fault Injection, Command: FailRandomlyAtFault, Privilege: manage */ \
454456
}
@@ -498,6 +500,7 @@
498500
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: RemoveScene, Privilege: manage */ \
499501
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: RemoveAllScenes, Privilege: manage */ \
500502
chip::Access::Privilege::kManage, /* Cluster: Scenes Management, Command: StoreScene, Privilege: manage */ \
503+
chip::Access::Privilege::kManage, /* Cluster: Thermostat, Command: AtomicRequest, Privilege: manage */ \
501504
chip::Access::Privilege::kManage, /* Cluster: Fault Injection, Command: FailAtFault, Privilege: manage */ \
502505
chip::Access::Privilege::kManage, /* Cluster: Fault Injection, Command: FailRandomlyAtFault, Privilege: manage */ \
503506
}

0 commit comments

Comments
 (0)