Skip to content

Commit 9b65af5

Browse files
Michail-AntropovMichail-Antropov
committed
Update XML using the alchemy tool
1 parent ce3dac7 commit 9b65af5

27 files changed

+1179
-1694
lines changed

‎src/app/zap-templates/zcl/data-model/chip/energy-calendar-cluster.xml

+29-41
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ limitations under the License.
1313
-->
1414
<configurator>
1515
<domain name="Energy Management"/>
16-
1716
<enum name="PeakPeriodSeverityEnum" type="enum8">
1817
<cluster code="0x009A"/>
1918
<item name="Unused" value="0x00"/>
@@ -45,42 +44,34 @@ limitations under the License.
4544
<field name="Saturday" mask="0x40"/>
4645
</bitmap>
4746

48-
<struct name="Date">
49-
<cluster code="0x009A"/>
50-
<item fieldId="0" name="Year" type="int16u" default="0" isNullable="true" optional="true"/>
51-
<item fieldId="1" name="Month" type="int8u" min="1" max="12" default="1" isNullable="true" optional="true"/>
52-
<item fieldId="2" name="Day" type="int8u" min="1" max="31" default="1" isNullable="true" optional="true"/>
53-
<item fieldId="3" name="DayOfWeek" type="int8u" min="1" max="7" isNullable="true" optional="true"/>
54-
</struct>
55-
56-
<struct name="CalendarPeriod">
47+
<struct name="CalendarPeriodStruct">
5748
<cluster code="0x009A"/>
58-
<item fieldId="0" name="StartDate" type="epoch_s" default="0"/>
59-
<item fieldId="1" name="Days" type="DayStruct" array="true" min="1"/>
49+
<item fieldId="0" name="StartDate" type="epoch_s" isNullable="true"/>
50+
<item fieldId="1" name="Days" type="DayStruct" array="true" length="7" minLength="1"/>
6051
</struct>
6152

6253
<struct name="DayStruct">
6354
<cluster code="0x009A"/>
64-
<item fieldId="0" name="Date" type="Date" optional="true"/>
65-
<item fieldId="1" name="DaysOfWeek" type="TransitionDayOfWeekBitmap" optional="true"/>
66-
<item fieldId="2" name="Transitions" type="TransitionStruct" array="true" min="1"/>
67-
<item fieldId="3" name="CalendarID" type="int32u" default="0" optional="true"/>
55+
<item fieldId="0" name="Date" type="date" optional="true"/>
56+
<item fieldId="1" name="DaysOfWeek" type="TransitionDayOfWeekBitmap" optional="true" min="0x00" max="0x7F"/>
57+
<item fieldId="2" name="Transitions" type="TransitionStruct" array="true" length="48" minLength="1"/>
58+
<item fieldId="3" name="CalendarID" type="int32u" optional="true"/>
6859
</struct>
6960

7061
<struct name="PeakPeriodStruct">
7162
<cluster code="0x009A"/>
72-
<item fieldId="0" name="Severity" type="PeakPeriodSeverityEnum"/>
73-
<item fieldId="1" name="PeakPeriod" type="int16u"/>
74-
<item fieldId="2" name="StartTime" type="epoch_s"/>
75-
<item fieldId="3" name="EndTime" type="epoch_s"/>
63+
<item fieldId="0" name="Severity" type="PeakPeriodSeverityEnum" min="0x00" max="0x03"/>
64+
<item fieldId="1" name="PeakPeriod" type="int16u" default="0"/>
65+
<item fieldId="2" name="StartTime" type="epoch_s" isNullable="true"/>
66+
<item fieldId="3" name="EndTime" type="epoch_s" isNullable="true"/>
7667
</struct>
7768

7869
<struct name="TransitionStruct">
7970
<cluster code="0x009A"/>
80-
<item fieldId="0" name="TransitionTime" type="int16u" min="0" max="1439" default="0"/>
71+
<item fieldId="0" name="TransitionTime" type="int16u" max="1499"/>
8172
<item fieldId="1" name="PriceTier" type="int32u" optional="true"/>
8273
<item fieldId="2" name="FriendlyCredit" type="boolean" optional="true"/>
83-
<item fieldId="3" name="AuxiliaryLoad" type="AuxiliaryLoadBitmap" optional="true"/>
74+
<item fieldId="3" name="AuxiliaryLoad" type="AuxiliaryLoadBitmap" optional="true" min="0x00" max="0xFF"/>
8475
</struct>
8576

8677
<cluster>
@@ -91,36 +82,33 @@ limitations under the License.
9182
<client init="false" tick="false">true</client>
9283
<server init="false" tick="false">true</server>
9384
<description>The Energy Calendar Cluster provides a mechanism for communicating schedules associated with various forms of energy consumption.</description>
94-
<globalAttribute side="either" code="0xFFFD" value="2"/>
95-
85+
<globalAttribute side="either" code="0xFFFD" value="3"/>
9686
<features>
9787
<feature bit="0" code="PTIER" name="PricingTier" summary="Supports information about pricing tiers">
98-
<optionalConform choice="a" more="true"/>
88+
<optionalConform choice="a" more="true" min="1"/>
9989
</feature>
10090
<feature bit="1" code="FCRED" name="FriendlyCredit" summary="Supports information about when friendly credit periods begin and end">
101-
<optionalConform choice="a" more="true"/>
91+
<optionalConform choice="a" more="true" min="1"/>
10292
</feature>
10393
<feature bit="2" code="AUXLD" name="AuxiliaryLoad" summary="Supports information about when auxiliary loads should be enabled or disabled">
104-
<optionalConform choice="a" more="true"/>
94+
<optionalConform choice="a" more="true" min="1"/>
10595
</feature>
10696
<feature bit="3" code="PEAKP" name="PeakPeriod" summary="Supports information about peak periods">
10797
<optionalConform/>
10898
</feature>
10999
</features>
110-
111100
<!--Attributes-->
112-
<attribute code="0x0000" side="server" type="int32u" define="CALENDARID" isNullable="true" writable="false" optional="false">CalendarID</attribute>
113-
<attribute code="0x0001" side="server" type="char_string" define="NAME" isNullable="true" length="12" writable="false">Name</attribute>
114-
<attribute code="0x0002" side="server" type="int32u" define="PROVIDERID" isNullable="true" writable="false" optional="false">ProviderID</attribute>
115-
<attribute code="0x0003" side="server" type="int32u" define="EVENTID" isNullable="true" writable="false" optional="false">EventID</attribute>
116-
<attribute code="0x0004" side="server" type="epoch_s" define="START_DATE" isNullable="true" default="0" writable="false" optional="false">StartDate</attribute>
117-
<attribute code="0x0005" side="server" type="array" define="CALENDAR_PERIODS" entryType="CalendarPeriod" length="254" writable="false" optional="false">CalendarPeriods</attribute>
118-
<attribute code="0x0006" side="server" type="array" define="SPECIASL_DAYS" entryType="DayStruct" length="254" writable="false" optional="false">SpecialDays</attribute>
119-
<attribute code="0x0007" side="server" type="DayStruct" define="CURRENT_DAY" isNullable="true" writable="false" optional="false">CurrentDay</attribute>
120-
<attribute code="0x0008" side="server" type="DayStruct" define="NEXT_DAY" isNullable="true" writable="false" optional="false">NextDay</attribute>
121-
<attribute code="0x0009" side="server" type="TransitionStruct" define="CURRENT_TRANSITION" isNullable="true" writable="false" optional="false">CurrentTransition</attribute>
122-
<attribute code="0x000A" side="server" type="PeakPeriodStruct" define="CURRENT_PEAK_PERIOD" isNullable="true" writable="false" optional="true">CurrentPeakPeriod</attribute>
123-
<attribute code="0x000B" side="server" type="PeakPeriodStruct" define="NEXT_PEAK_PERIOD" isNullable="true" writable="false" optional="true">NextPeakPeriod</attribute>
101+
<attribute code="0x0000" side="server" type="int32u" define="CALENDARID" isNullable="true">CalendarID</attribute>
102+
<attribute code="0x0001" side="server" type="char_string" define="NAME" isNullable="true" length="12">Name</attribute>
103+
<attribute code="0x0002" side="server" type="int32u" define="PROVIDERID" isNullable="true">ProviderID</attribute>
104+
<attribute code="0x0003" side="server" type="int32u" define="EVENTID" isNullable="true">EventID</attribute>
105+
<attribute code="0x0004" side="server" type="epoch_s" define="START_DATE" isNullable="true">StartDate</attribute>
106+
<attribute code="0x0005" side="server" type="array" define="CALENDAR_PERIODS" entryType="CalendarPeriodStruct" length="4" isNullable="true" minLength="1">CalendarPeriods</attribute>
107+
<attribute code="0x0006" side="server" type="array" define="SPECIASL_DAYS" entryType="DayStruct" length="50" isNullable="true">SpecialDays</attribute>
108+
<attribute code="0x0007" side="server" type="DayStruct" define="CURRENT_DAY" isNullable="true">CurrentDay</attribute>
109+
<attribute code="0x0008" side="server" type="DayStruct" define="NEXT_DAY" isNullable="true">NextDay</attribute>
110+
<attribute code="0x0009" side="server" type="TransitionStruct" define="CURRENT_TRANSITION" isNullable="true">CurrentTransition</attribute>
111+
<attribute code="0x000A" side="server" type="PeakPeriodStruct" define="CURRENT_PEAK_PERIOD" isNullable="true" optional="true">CurrentPeakPeriod</attribute>
112+
<attribute code="0x000B" side="server" type="PeakPeriodStruct" define="NEXT_PEAK_PERIOD" isNullable="true" optional="true">NextPeakPeriod</attribute>
124113
</cluster>
125-
126114
</configurator>

0 commit comments

Comments
 (0)