Skip to content

Commit

Permalink
[zcl] Generate Power Source cluster enums (#14307)
Browse files Browse the repository at this point in the history 
After some recent changes Power Source cluster enums are no
longer generated as they have no assigned cluster ID.
  • Loading branch information
@Damian-Nordic @pull
Damian-Nordic authored and pull[bot] committed Nov 1, 2023
1 parent 05cd47b commit 1631804
Show file tree
Hide file tree
Showing 16 changed files with 1,775 additions and 1 deletion.
58 changes: 58 additions & 0 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2179,6 +2179,64 @@ server cluster OperationalCredentials = 62 {
}

server cluster PowerSource = 47 {
enum BatChargeFaultType : ENUM8 {
kUnspecfied = 0;
kAmbientTooHot = 1;
kAmbientTooCold = 2;
kBatteryTooHot = 3;
kBatteryTooCold = 4;
kBatteryAbsent = 5;
kBatteryOverVoltage = 6;
kBatteryUnderVoltage = 7;
kChargerOverVoltage = 8;
kChargerUnderVoltage = 9;
kSafetyTimeout = 10;
}

enum BatChargeLevel : ENUM8 {
kOk = 0;
kWarning = 1;
kCritical = 2;
}

enum BatChargeState : ENUM8 {
kUnknown = 0;
kIsCharging = 1;
kIsAtFullCharge = 2;
kIsNotCharging = 3;
}

enum BatFaultType : ENUM8 {
kUnspecfied = 0;
kOverTemp = 1;
kUnderTemp = 2;
}

enum BatReplaceability : ENUM8 {
kUnspecified = 0;
kNotReplaceable = 1;
kUserReplaceable = 2;
kFactoryReplaceable = 3;
}

enum PowerSourceStatus : ENUM8 {
kUnspecfied = 0;
kActive = 1;
kStandby = 2;
kUnavailable = 3;
}

enum WiredCurrentType : ENUM8 {
kAc = 0;
kDc = 1;
}

enum WiredFaultType : ENUM8 {
kUnspecfied = 0;
kOverVoltage = 1;
kUnderVoltage = 2;
}

readonly attribute enum8 status = 0;
readonly attribute int8u order = 1;
readonly attribute char_string<60> description = 2;
Expand Down
58 changes: 58 additions & 0 deletions examples/door-lock-app/door-lock-common/door-lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,64 @@ server cluster OperationalCredentials = 62 {
}

server cluster PowerSource = 47 {
enum BatChargeFaultType : ENUM8 {
kUnspecfied = 0;
kAmbientTooHot = 1;
kAmbientTooCold = 2;
kBatteryTooHot = 3;
kBatteryTooCold = 4;
kBatteryAbsent = 5;
kBatteryOverVoltage = 6;
kBatteryUnderVoltage = 7;
kChargerOverVoltage = 8;
kChargerUnderVoltage = 9;
kSafetyTimeout = 10;
}

enum BatChargeLevel : ENUM8 {
kOk = 0;
kWarning = 1;
kCritical = 2;
}

enum BatChargeState : ENUM8 {
kUnknown = 0;
kIsCharging = 1;
kIsAtFullCharge = 2;
kIsNotCharging = 3;
}

enum BatFaultType : ENUM8 {
kUnspecfied = 0;
kOverTemp = 1;
kUnderTemp = 2;
}

enum BatReplaceability : ENUM8 {
kUnspecified = 0;
kNotReplaceable = 1;
kUserReplaceable = 2;
kFactoryReplaceable = 3;
}

enum PowerSourceStatus : ENUM8 {
kUnspecfied = 0;
kActive = 1;
kStandby = 2;
kUnavailable = 3;
}

enum WiredCurrentType : ENUM8 {
kAc = 0;
kDc = 1;
}

enum WiredFaultType : ENUM8 {
kUnspecfied = 0;
kOverVoltage = 1;
kUnderVoltage = 2;
}

readonly attribute enum8 status = 0;
readonly attribute int8u order = 1;
readonly attribute char_string<60> description = 2;
Expand Down
58 changes: 58 additions & 0 deletions examples/lock-app/lock-common/lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,64 @@ server cluster OperationalCredentials = 62 {
}

server cluster PowerSource = 47 {
enum BatChargeFaultType : ENUM8 {
kUnspecfied = 0;
kAmbientTooHot = 1;
kAmbientTooCold = 2;
kBatteryTooHot = 3;
kBatteryTooCold = 4;
kBatteryAbsent = 5;
kBatteryOverVoltage = 6;
kBatteryUnderVoltage = 7;
kChargerOverVoltage = 8;
kChargerUnderVoltage = 9;
kSafetyTimeout = 10;
}

enum BatChargeLevel : ENUM8 {
kOk = 0;
kWarning = 1;
kCritical = 2;
}

enum BatChargeState : ENUM8 {
kUnknown = 0;
kIsCharging = 1;
kIsAtFullCharge = 2;
kIsNotCharging = 3;
}

enum BatFaultType : ENUM8 {
kUnspecfied = 0;
kOverTemp = 1;
kUnderTemp = 2;
}

enum BatReplaceability : ENUM8 {
kUnspecified = 0;
kNotReplaceable = 1;
kUserReplaceable = 2;
kFactoryReplaceable = 3;
}

enum PowerSourceStatus : ENUM8 {
kUnspecfied = 0;
kActive = 1;
kStandby = 2;
kUnavailable = 3;
}

enum WiredCurrentType : ENUM8 {
kAc = 0;
kDc = 1;
}

enum WiredFaultType : ENUM8 {
kUnspecfied = 0;
kOverVoltage = 1;
kUnderVoltage = 2;
}

readonly attribute enum8 status = 0;
readonly attribute int8u order = 1;
readonly attribute char_string<60> description = 2;
Expand Down
58 changes: 58 additions & 0 deletions examples/window-app/common/window-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,64 @@ server cluster OperationalCredentials = 62 {
}

server cluster PowerSource = 47 {
enum BatChargeFaultType : ENUM8 {
kUnspecfied = 0;
kAmbientTooHot = 1;
kAmbientTooCold = 2;
kBatteryTooHot = 3;
kBatteryTooCold = 4;
kBatteryAbsent = 5;
kBatteryOverVoltage = 6;
kBatteryUnderVoltage = 7;
kChargerOverVoltage = 8;
kChargerUnderVoltage = 9;
kSafetyTimeout = 10;
}

enum BatChargeLevel : ENUM8 {
kOk = 0;
kWarning = 1;
kCritical = 2;
}

enum BatChargeState : ENUM8 {
kUnknown = 0;
kIsCharging = 1;
kIsAtFullCharge = 2;
kIsNotCharging = 3;
}

enum BatFaultType : ENUM8 {
kUnspecfied = 0;
kOverTemp = 1;
kUnderTemp = 2;
}

enum BatReplaceability : ENUM8 {
kUnspecified = 0;
kNotReplaceable = 1;
kUserReplaceable = 2;
kFactoryReplaceable = 3;
}

enum PowerSourceStatus : ENUM8 {
kUnspecfied = 0;
kActive = 1;
kStandby = 2;
kUnavailable = 3;
}

enum WiredCurrentType : ENUM8 {
kAc = 0;
kDc = 1;
}

enum WiredFaultType : ENUM8 {
kUnspecfied = 0;
kOverVoltage = 1;
kUnderVoltage = 2;
}

readonly attribute enum8 status = 0;
readonly attribute int8u order = 1;
readonly attribute char_string<60> description = 2;
Expand Down
13 changes: 12 additions & 1 deletion src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,26 +83,29 @@ limitations under the License.
</cluster>

<bitmap name="PowerSourceFeature" type="BITMAP32">
<cluster code="0x002F"/>
<cluster code="0x002F"/>
<field name="Wired" mask="0x1"/>
<field name="Battery" mask="0x2"/>
<field name="Rechargeable" mask="0x4"/>
<field name="Replaceable" mask="0x8"/>
</bitmap>

<enum name="WiredFaultType" type="ENUM8">
<cluster code="0x002F"/>
<item name="Unspecfied" value="0x00"/>
<item name="OverVoltage" value="0x01"/>
<item name="UnderVoltage" value="0x02"/>
</enum>

<enum name="BatFaultType" type="ENUM8">
<cluster code="0x002F"/>
<item name="Unspecfied" value="0x00"/>
<item name="OverTemp" value="0x01"/>
<item name="UnderTemp" value="0x02"/>
</enum>

<enum name="BatChargeFaultType" type="ENUM8">
<cluster code="0x002F"/>
<item name="Unspecfied" value="0x00"/>
<item name="AmbientTooHot" value="0x01"/>
<item name="AmbientTooCold" value="0x02"/>
Expand All @@ -117,48 +120,56 @@ limitations under the License.
</enum>

<enum name="PowerSourceStatus" type="ENUM8">
<cluster code="0x002F"/>
<item name="Unspecfied" value="0x00"/>
<item name="Active" value="0x01"/>
<item name="Standby" value="0x02"/>
<item name="Unavailable" value="0x03"/>
</enum>

<enum name="WiredCurrentType" type="ENUM8">
<cluster code="0x002F"/>
<item name="AC" value="0x00"/>
<item name="DC" value="0x01"/>
</enum>

<enum name="BatChargeLevel" type="ENUM8">
<cluster code="0x002F"/>
<item name="Ok" value="0x00"/>
<item name="Warning" value="0x01"/>
<item name="Critical" value="0x02"/>
</enum>

<enum name="BatReplaceability" type="ENUM8">
<cluster code="0x002F"/>
<item name="Unspecified" value="0x00"/>
<item name="NotReplaceable" value="0x01"/>
<item name="UserReplaceable" value="0x02"/>
<item name="FactoryReplaceable" value="0x03"/>
</enum>

<enum name="BatChargeState" type="ENUM8">
<cluster code="0x002F"/>
<item name="Unknown" value="0x00"/>
<item name="IsCharging" value="0x01"/>
<item name="IsAtFullCharge" value="0x02"/>
<item name="IsNotCharging" value="0x03"/>
</enum>

<struct name="WiredFaultChangeType">
<cluster code="0x002F"/>
<item name="current" type="WiredFaultType" array="true" length="8"/>
<item name="previous" type="WiredFaultType" array="true" length="8"/>
</struct>

<struct name="BatFaultChangeType">
<cluster code="0x002F"/>
<item name="current" type="BatFaultType" array="true" length="8"/>
<item name="previous" type="BatFaultType" array="true" length="8"/>
</struct>

<struct name="BatChargeFaultChangeType">
<cluster code="0x002F"/>
<item name="current" type="BatChargeFaultType" array="true" length="16"/>
<item name="previous" type="BatChargeFaultType" array="true" length="16"/>
</struct>
Expand Down
Loading

0 comments on commit 1631804

Please sign in to comment.