Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/dishwasher alarm impl #27748

Merged
merged 81 commits into from
Jul 24, 2023
Merged

Feature/dishwasher alarm impl #27748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
88c9785
init disdwasher alarm
fengdx4 Jul 7, 2023
7be9e66
add dishwasher alarm zap
fengdx4 Jul 7, 2023
6eb88f8
Merge branch 'master' into feature/dishwasher_alarm_impl
fengdx4 Jul 7, 2023
c3daf3e
format file
fengdx4 Jul 7, 2023
1ada5be
Restyled by whitespace
restyled-commits Jul 7, 2023
76b02d9
Restyled by clang-format
restyled-commits Jul 7, 2023
d7c092a
init disdwasher alarm
fengdx4 Jul 7, 2023
28b2e9b
add dishwasher alarm zap
fengdx4 Jul 7, 2023
a2bf947
format file
fengdx4 Jul 7, 2023
3d883d1
Restyled by whitespace
restyled-commits Jul 7, 2023
eb8ee88
Restyled by clang-format
restyled-commits Jul 7, 2023
991e53b
modify dishwasheralarm Supported
fengdx4 Jul 12, 2023
3499cb0
Merge branch 'chip_matter' into feature/dishwasher_alarm_impl
fengdx4 Jul 12, 2023
bb66085
modify dishwasher alarm cluster
fengdx4 Jul 12, 2023
378b8c6
revert
fengdx4 Jul 12, 2023
4c78870
Restyled by clang-format
restyled-commits Jul 12, 2023
52a25e8
modify dishwasher alarm
fengdx4 Jul 13, 2023
cba2039
modify dishwasher alarm latch support
fengdx4 Jul 14, 2023
2158d8b
add all cluster zap
fengdx4 Jul 14, 2023
46666c6
Merge branch 'chip_matter' into feature/dishwasher_alarm_impl
fengdx4 Jul 14, 2023
915aa83
modify dishwasher alarm latch support
fengdx4 Jul 14, 2023
707a66f
modify all cluster zap
fengdx4 Jul 14, 2023
f5c63c1
Restyled by whitespace
restyled-commits Jul 14, 2023
3daea4e
Restyled by clang-format
restyled-commits Jul 14, 2023
95291b8
Add TestDishwasherAlarm
mideayanghui Jul 17, 2023
1f12c48
Modify dishwasher cluster definition in all-cluster-app
mideayanghui Jul 17, 2023
6633635
add dishwasher alarm cluster
fengdx4 Jul 18, 2023
239020a
Restyled by whitespace and Tab
mideayanghui Jul 18, 2023
86f3ec2
Merge branch 'master' into feature/dishwasher_alarm_impl
mideayanghui Jul 18, 2023
6917506
Optimize the dishwasher alarm cluster
mideayanghui Jul 18, 2023
8d2d54a
Optimize the alarm dishwasher alarm server
mideayanghui Jul 18, 2023
c8218c7
Using namespace to optimize the head file
mideayanghui Jul 18, 2023
44a06c0
Add dishwasher alarm cluster delegate
mideayanghui Jul 18, 2023
834f91b
optimize TestDishwasherAlarm
mideayanghui Jul 18, 2023
5488f69
init DishwasherAlarmServer instance in all-cluster-app
mideayanghui Jul 18, 2023
1f4fa93
Move the dishwasher alarm plugin server init
mideayanghui Jul 18, 2023
0a5a15f
Merge branch 'master' into feature/dishwasher_alarm_impl
mideayanghui Jul 18, 2023
d602dd0
Restyled by whitespace
restyled-commits Jul 18, 2023
88dc3a6
Restyled by clang-format
restyled-commits Jul 18, 2023
eecfc58
Restyled by gn
restyled-commits Jul 18, 2023
8417a5e
Restyled by prettier-yaml
restyled-commits Jul 18, 2023
67f71d9
Merge branch 'master' into feature/dishwasher_alarm_impl
mideayanghui Jul 19, 2023
5633cb4
optimize the note for dishwasher alarm server and delegate
mideayanghui Jul 19, 2023
6873541
Merge branch 'master' into feature/dishwasher_alarm_impl
mideayanghui Jul 19, 2023
9e567c1
optimize the note in ciTest
mideayanghui Jul 19, 2023
8c31779
rename and note the function.
mideayanghui Jul 19, 2023
a75eb1b
use static to modify variable
mideayanghui Jul 19, 2023
8089462
Fix some bug not match with dishwasher alarm cluster's spec
mideayanghui Jul 20, 2023
f95fde5
modify the init value of attribute in dishwasher alarm cluster in all…
mideayanghui Jul 20, 2023
8acfd91
optimize the TestDishwasherAlarm
mideayanghui Jul 20, 2023
cb7d912
take off prefix of variable chip::
mideayanghui Jul 20, 2023
a146983
Optimize SetStateByLatch api
mideayanghui Jul 20, 2023
32445ab
merge master branch into feature/dishwasher_alarm_impl
mideayanghui Jul 20, 2023
2aac368
fix CI build error
mideayanghui Jul 20, 2023
2c7c130
merge master branch to feature/dishwasher_alarm_impl
mideayanghui Jul 21, 2023
88f01b4
optimize document of function in dishwasher alarm cluster
mideayanghui Jul 21, 2023
5321c8a
modify with review advice
mideayanghui Jul 21, 2023
c1bec6c
Optimize StateStateValue and ResetStateValue function
mideayanghui Jul 21, 2023
d9d2428
fix SetStateValue function error
mideayanghui Jul 21, 2023
7930bf8
Restyled by whitespace
restyled-commits Jul 21, 2023
504e873
Restyled by clang-format
restyled-commits Jul 21, 2023
4d6a9ec
fix zap error
mideayanghui Jul 21, 2023
02a4c94
modify the State attribute in Dishwasher alarm in zap
mideayanghui Jul 21, 2023
1f18b00
fix CI build error
mideayanghui Jul 21, 2023
9fa6693
Merge branch 'master' into feature/dishwasher_alarm_impl
mideayanghui Jul 21, 2023
9946f09
Merging from master
rbultman Jul 21, 2023
a049946
Remove function.
rbultman Jul 21, 2023
c21d10b
Update src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-serv…
rbultman Jul 21, 2023
058ee79
Update src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-serv…
rbultman Jul 21, 2023
319dabe
Update src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-serv…
rbultman Jul 21, 2023
4d81c1a
Update src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-serv…
rbultman Jul 21, 2023
73dd08d
Updates per review
rbultman Jul 21, 2023
c065667
Merge branch 'feature/dishwasher_alarm_impl' of https://github.com/fe…
rbultman Jul 21, 2023
a3363f2
Update src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-serv…
rbultman Jul 21, 2023
db78472
fix TestScript error in TestDishwasherAlarm
mideayanghui Jul 22, 2023
87a09db
zap regen all
mideayanghui Jul 22, 2023
04c9db0
Merge branch 'master' into feature/dishwasher_alarm_impl
mideayanghui Jul 22, 2023
d178e27
fix the document
mideayanghui Jul 22, 2023
ee95dec
Restyled by whitespace
restyled-commits Jul 22, 2023
c168c99
Restyled by gn
restyled-commits Jul 22, 2023
3d0ec9d
Merge branch 'master' into feature/dishwasher_alarm_impl
mideayanghui Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2919,6 +2919,47 @@ server cluster SmokeCoAlarm = 92 {
command SelfTestRequest(): DefaultSuccess = 0;
}

/** Attributes and commands for configuring the Dishwasher alarm. */
server cluster DishwasherAlarm = 93 {
bitmap AlarmMap : BITMAP32 {
kInflowError = 0x1;
kDrainError = 0x2;
kDoorError = 0x4;
kTempTooLow = 0x8;
kTempTooHigh = 0x10;
kWaterLevelError = 0x20;
}

info event Notify = 0 {
AlarmMap active = 0;
AlarmMap inactive = 1;
AlarmMap state = 2;
AlarmMap mask = 3;
}

readonly attribute AlarmMap mask = 0;
readonly attribute AlarmMap latch = 1;
readonly attribute AlarmMap state = 2;
readonly attribute AlarmMap supported = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct ResetRequest {
AlarmMap alarms = 0;
}

request struct ModifyEnabledAlarmsRequest {
AlarmMap mask = 0;
}

command Reset(ResetRequest): DefaultSuccess = 0;
command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1;
}

/** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
server cluster OperationalState = 96 {
enum ErrorStateEnum : ENUM8 {
Expand Down Expand Up @@ -6676,6 +6717,20 @@ endpoint 1 {
ram attribute clusterRevision default = 1;
}

server cluster DishwasherAlarm {
emits event Notify;
ram attribute mask default = 1;
ram attribute latch default = 1;
ram attribute state default = 0;
ram attribute supported default = 15;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 1;
ram attribute clusterRevision default = 1;
}

server cluster OperationalState {
emits event OperationalError;
emits event OperationCompletion;
Expand Down
239 changes: 239 additions & 0 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15739,6 +15739,245 @@
}
]
},
{
"name": "Dishwasher Alarm",
"code": 93,
"mfgCode": null,
"define": "DISHWASHER_ALARM_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
{
"name": "Reset",
"code": 0,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 0
},
{
"name": "ModifyEnabledAlarms",
"code": 1,
"mfgCode": null,
"source": "client",
"incoming": 1,
"outgoing": 0
}
],
"attributes": [
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "client",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "client",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
}
]
},
{
"name": "Dishwasher Alarm",
"code": 93,
"mfgCode": null,
"define": "DISHWASHER_ALARM_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
{
"name": "Mask",
"code": 0,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "Latch",
"code": 1,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "State",
"code": 2,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "Supported",
"code": 3,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "15",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AcceptedCommandList",
"code": 65529,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
}
],
"events": [
{
"name": "Notify",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
"name": "Operational State",
"code": 96,
Expand Down
Loading