Skip to content

Commit

Permalink
Rename AlarmMap to AlarmBitmap. (#31517)
Browse files Browse the repository at this point in the history
* Rename AlarmMap to AlarmBitmap.

The spec renamed this in
CHIP-Specifications/connectedhomeip-spec#7628

Fixes #29667

* Auto-update ZAP files.

* Regenerate generated code.
  • Loading branch information
bzbarsky-apple authored Jan 19, 2024
1 parent d758a67 commit d8ef6fc
Show file tree
Hide file tree
Showing 99 changed files with 5,292 additions and 7,392 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7583,6 +7583,5 @@
"endpointId": 4,
"networkId": 0
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -6063,6 +6063,5 @@
"endpointId": 1,
"networkId": 0
}
],
"log": []
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3056,20 +3056,20 @@ cluster TemperatureControl = 86 {
cluster RefrigeratorAlarm = 87 {
revision 1; // NOTE: Default/not specifically set

bitmap AlarmMap : bitmap32 {
bitmap AlarmBitmap : bitmap32 {
kDoorOpen = 0x1;
}

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

readonly attribute AlarmMap mask = 0;
readonly attribute AlarmMap state = 2;
readonly attribute AlarmMap supported = 3;
readonly attribute AlarmBitmap mask = 0;
readonly attribute AlarmBitmap state = 2;
readonly attribute AlarmBitmap supported = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -3274,7 +3274,7 @@ cluster SmokeCoAlarm = 92 {
cluster DishwasherAlarm = 93 {
revision 1; // NOTE: Default/not specifically set

bitmap AlarmMap : bitmap32 {
bitmap AlarmBitmap : bitmap32 {
kInflowError = 0x1;
kDrainError = 0x2;
kDoorError = 0x4;
Expand All @@ -3288,16 +3288,16 @@ cluster DishwasherAlarm = 93 {
}

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

readonly attribute AlarmMap mask = 0;
readonly attribute optional AlarmMap latch = 1;
readonly attribute AlarmMap state = 2;
readonly attribute AlarmMap supported = 3;
readonly attribute AlarmBitmap mask = 0;
readonly attribute optional AlarmBitmap latch = 1;
readonly attribute AlarmBitmap state = 2;
readonly attribute AlarmBitmap supported = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -3306,11 +3306,11 @@ cluster DishwasherAlarm = 93 {
readonly attribute int16u clusterRevision = 65533;

request struct ResetRequest {
AlarmMap alarms = 0;
AlarmBitmap alarms = 0;
}

request struct ModifyEnabledAlarmsRequest {
AlarmMap mask = 0;
AlarmBitmap mask = 0;
}

/** Reset alarm */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9778,7 +9778,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"type": "AlarmBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -9794,7 +9794,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"type": "AlarmBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -9810,7 +9810,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"type": "AlarmBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -10560,7 +10560,7 @@
"code": 0,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"type": "AlarmBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -10576,7 +10576,7 @@
"code": 1,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"type": "AlarmBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -10592,7 +10592,7 @@
"code": 2,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"type": "AlarmBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand All @@ -10608,7 +10608,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
"type": "AlarmMap",
"type": "AlarmBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -24193,6 +24193,5 @@
"endpointId": 65534,
"networkId": 0
}
],
"log": []
]
}
Loading

0 comments on commit d8ef6fc

Please sign in to comment.