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

Jump to bottom

Make Ballast Configuration Cluster match the spec #29957

Merged
merged 3 commits into from
Oct 24, 2023
Merged

Make Ballast Configuration Cluster match the spec #29957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa0be9e
Adding manage access for write for several attributes
andreilitvin Oct 24, 2023
472053b
More access controls
andreilitvin Oct 24, 2023
c5adfac
Zap regen
andreilitvin Oct 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
20 changes: 10 additions & 10 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 @@ -4046,17 +4046,17 @@ provisional server cluster BallastConfiguration = 769 {
readonly attribute int8u physicalMinLevel = 0;
readonly attribute int8u physicalMaxLevel = 1;
readonly attribute BallastStatusBitmap ballastStatus = 2;
attribute int8u minLevel = 16;
attribute int8u maxLevel = 17;
attribute nullable int8u intrinsicBallastFactor = 20;
attribute nullable int8u ballastFactorAdjustment = 21;
attribute access(write: manage) int8u minLevel = 16;
attribute access(write: manage) int8u maxLevel = 17;
attribute access(write: manage) nullable int8u intrinsicBallastFactor = 20;
attribute access(write: manage) nullable int8u ballastFactorAdjustment = 21;
readonly attribute int8u lampQuantity = 32;
attribute char_string<16> lampType = 48;
attribute char_string<16> lampManufacturer = 49;
attribute nullable int24u lampRatedHours = 50;
attribute nullable int24u lampBurnHours = 51;
attribute LampAlarmModeBitmap lampAlarmMode = 52;
attribute nullable int24u lampBurnHoursTripPoint = 53;
attribute access(write: manage) char_string<16> lampType = 48;
attribute access(write: manage) char_string<16> lampManufacturer = 49;
attribute access(write: manage) nullable int24u lampRatedHours = 50;
attribute access(write: manage) nullable int24u lampBurnHours = 51;
attribute access(write: manage) LampAlarmModeBitmap lampAlarmMode = 52;
attribute access(write: manage) nullable int24u lampBurnHoursTripPoint = 53;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
4 changes: 2 additions & 2 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2990,8 +2990,8 @@ provisional server cluster BallastConfiguration = 769 {

readonly attribute int8u physicalMinLevel = 0;
readonly attribute int8u physicalMaxLevel = 1;
attribute int8u minLevel = 16;
attribute int8u maxLevel = 17;
attribute access(write: manage) int8u minLevel = 16;
attribute access(write: manage) int8u maxLevel = 17;
readonly attribute int8u lampQuantity = 32;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
50 changes: 40 additions & 10 deletions src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,49 @@ limitations under the License.
<attribute side="server" code="0x0001" define="PHYSICAL_MAX_LEVEL" type="int8u" min="0x01" max="0xFE" writable="false" default="0xFE" optional="false">PhysicalMaxLevel</attribute>
<attribute side="server" code="0x0002" define="BALLAST_STATUS" type="BallastStatusBitmap" min="0x00" max="0x03" writable="false" default="0x00" optional="true">BallastStatus</attribute>
<!-- Ballast Settings Attribute Set -->
<attribute side="server" code="0x0010" define="MIN_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0x01" optional="false">MinLevel</attribute>
<attribute side="server" code="0x0011" define="MAX_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0xFE" optional="false">MaxLevel</attribute>
<attribute side="server" code="0x0010" define="MIN_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0x01" optional="false">
<description>MinLevel</description>
<access op="write" privilege="manage"/>
</attribute>
<attribute side="server" code="0x0011" define="MAX_LEVEL" type="int8u" min="0x01" max="0xFE" writable="true" default="0xFE" optional="false">
<description>MaxLevel</description>
<access op="write" privilege="manage"/>
</attribute>
<!-- PowerOnLevel and PowerOnFadeTime are deprecated -->
<attribute side="server" code="0x0014" define="INTRINSIC_BALLAST_FACTOR" type="int8u" writable="true" isNullable="true" optional="true">IntrinsicBallastFactor</attribute>
<attribute side="server" code="0x0015" define="BALLAST_FACTOR_ADJUSTMENT" type="int8u" min="0x64" writable="true" default="0xFF" isNullable="true" optional="true">BallastFactorAdjustment</attribute>
<attribute side="server" code="0x0014" define="INTRINSIC_BALLAST_FACTOR" type="int8u" writable="true" isNullable="true" optional="true">
<description>IntrinsicBallastFactor</description>
<access op="write" privilege="manage"/>
</attribute>
<attribute side="server" code="0x0015" define="BALLAST_FACTOR_ADJUSTMENT" type="int8u" min="0x64" writable="true" default="0xFF" isNullable="true" optional="true">
<description>BallastFactorAdjustment</description>
<access op="write" privilege="manage"/>
</attribute>
<!-- Lamp Information Attribute Set -->
<attribute side="server" code="0x0020" define="LAMP_QUANTITY" type="int8u" writable="false" optional="false">LampQuantity</attribute>
<!-- Lamp Settings Attribute Set -->
<attribute side="server" code="0x0030" define="LAMP_TYPE" type="char_string" length="16" writable="true" optional="true">LampType</attribute>
<attribute side="server" code="0x0031" define="LAMP_MANUFACTURER" type="char_string" length="16" writable="true" optional="true">LampManufacturer</attribute>
<attribute side="server" code="0x0032" define="LAMP_RATED_HOURS" type="int24u" writable="true" default="0xFFFFFF" isNullable="true" optional="true">LampRatedHours</attribute>
<attribute side="server" code="0x0033" define="LAMP_BURN_HOURS" type="int24u" writable="true" default="0x000000" isNullable="true" optional="true">LampBurnHours</attribute>
<attribute side="server" code="0x0034" define="LAMP_ALARM_MODE" type="LampAlarmModeBitmap" min="0x00" max="0x01" writable="true" default="0x00" optional="true">LampAlarmMode</attribute>
<attribute side="server" code="0x0035" define="LAMP_BURN_HOURS_TRIP_POINT" type="int24u" writable="true" default="0xFFFFFF" isNullable="true" optional="true">LampBurnHoursTripPoint</attribute>
<attribute side="server" code="0x0030" define="LAMP_TYPE" type="char_string" length="16" writable="true" optional="true">
<description>LampType</description>
<access op="write" privilege="manage"/>
</attribute>
<attribute side="server" code="0x0031" define="LAMP_MANUFACTURER" type="char_string" length="16" writable="true" optional="true">
<description>LampManufacturer</description>
<access op="write" privilege="manage"/>
</attribute>
<attribute side="server" code="0x0032" define="LAMP_RATED_HOURS" type="int24u" writable="true" default="0xFFFFFF" isNullable="true" optional="true">
<description>LampRatedHours</description>
<access op="write" privilege="manage"/>
</attribute>
<attribute side="server" code="0x0033" define="LAMP_BURN_HOURS" type="int24u" writable="true" default="0x000000" isNullable="true" optional="true">
<description>LampBurnHours</description>
<access op="write" privilege="manage"/>
</attribute>
<attribute side="server" code="0x0034" define="LAMP_ALARM_MODE" type="LampAlarmModeBitmap" min="0x00" max="0x01" writable="true" default="0x00" optional="true">
<description>LampAlarmMode</description>
<access op="write" privilege="manage"/>
</attribute>
<attribute side="server" code="0x0035" define="LAMP_BURN_HOURS_TRIP_POINT" type="int24u" writable="true" default="0xFFFFFF" isNullable="true" optional="true">
<description>LampBurnHoursTripPoint</description>
<access op="write" privilege="manage"/>
</attribute>
</cluster>
</configurator>
20 changes: 10 additions & 10 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5056,17 +5056,17 @@ provisional client cluster BallastConfiguration = 769 {
readonly attribute int8u physicalMinLevel = 0;
readonly attribute int8u physicalMaxLevel = 1;
readonly attribute optional BallastStatusBitmap ballastStatus = 2;
attribute int8u minLevel = 16;
attribute int8u maxLevel = 17;
attribute optional nullable int8u intrinsicBallastFactor = 20;
attribute optional nullable int8u ballastFactorAdjustment = 21;
attribute access(write: manage) int8u minLevel = 16;
attribute access(write: manage) int8u maxLevel = 17;
attribute access(write: manage) optional nullable int8u intrinsicBallastFactor = 20;
attribute access(write: manage) optional nullable int8u ballastFactorAdjustment = 21;
readonly attribute int8u lampQuantity = 32;
attribute optional char_string<16> lampType = 48;
attribute optional char_string<16> lampManufacturer = 49;
attribute optional nullable int24u lampRatedHours = 50;
attribute optional nullable int24u lampBurnHours = 51;
attribute optional LampAlarmModeBitmap lampAlarmMode = 52;
attribute optional nullable int24u lampBurnHoursTripPoint = 53;
attribute access(write: manage) optional char_string<16> lampType = 48;
attribute access(write: manage) optional char_string<16> lampManufacturer = 49;
attribute access(write: manage) optional nullable int24u lampRatedHours = 50;
attribute access(write: manage) optional nullable int24u lampBurnHours = 51;
attribute access(write: manage) optional LampAlarmModeBitmap lampAlarmMode = 52;
attribute access(write: manage) optional nullable int24u lampBurnHoursTripPoint = 53;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Loading