Skip to content

Commit e6e050b

Browse files
Michail-AntropovMichail-Antropov
committed
Rebase on latest master
1 parent daecb95 commit e6e050b

File tree

12 files changed

+37
-205
lines changed

12 files changed

+37
-205
lines changed

‎src/app/zap-templates/zcl/data-model/chip/global-structs.xml

-10
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,4 @@ limitations under the License.
3939
<item fieldId="1" name="MyBitmap" type="TestGlobalBitmap" isNullable="true" optional="false"/>
4040
<item fieldId="2" name="MyEnum" type="TestGlobalEnum" isNullable="true" optional="true"/>
4141
</struct>
42-
43-
<struct name="DateStruct">
44-
<cluster code="0x009A"/> <!-- Energy Calendar -->
45-
<cluster code="0x0B06"/> <!-- Without this scripts/tools/zap_regen_all.py pushes global DateStruct to EnergyCalendar namespace -->
46-
47-
<item fieldId="0" name="Year" type="int8u" isNullable="true" optional="false"/>
48-
<item fieldId="1" name="Month" type="int8u" min="1" max="12" isNullable="true" optional="false"/>
49-
<item fieldId="2" name="Day" type="int8u" min="1" max="31" isNullable="true" optional="false"/>
50-
<item fieldId="3" name="DayOfWeek" type="int8u" min="1" max="7" isNullable="true" optional="false"/>
51-
</struct>
5242
</configurator>

‎src/app/zap-templates/zcl/zcl-with-test-extensions.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"microwave-oven-control-cluster.xml",
4848
"door-lock-cluster.xml",
4949
"ecosystem-information-cluster.xml",
50+
"energy-calendar-cluster.xml",
5051
"energy-preference-cluster.xml",
5152
"electrical-energy-measurement-cluster.xml",
5253
"electrical-power-measurement-cluster.xml",
@@ -135,7 +136,6 @@
135136
"window-covering.xml",
136137
"matter-devices.xml",
137138
"sample-mei-cluster.xml",
138-
"energy-calendar-cluster.xml",
139139
"types/door-lock.xml",
140140
"types/occupancy-sensing.xml",
141141
"types/thermostat-user-interface-configuration.xml"
@@ -660,6 +660,16 @@
660660
"NeutralCurrent",
661661
"FeatureMap"
662662
],
663+
"Energy Calendar": [
664+
"CalendarPeriods",
665+
"SpecialDays",
666+
"CurrentDay",
667+
"NextDay",
668+
"CurrentTransition",
669+
"CurrentPeakPeriod",
670+
"NextPeakPeriod",
671+
"FeatureMap"
672+
],
663673
"Power Topology": ["FeatureMap"],
664674
"Valve Configuration and Control": ["RemainingDuration"],
665675
"Boolean State Configuration": ["CurrentSensitivityLevel"],
@@ -681,16 +691,6 @@
681691
"ThreadNetworkTableSize"
682692
],
683693
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
684-
"Energy Calendar": [
685-
"CalendarPeriods",
686-
"SpecialDays",
687-
"CurrentDay",
688-
"NextDay",
689-
"CurrentTransition",
690-
"CurrentPeakPeriod",
691-
"NextPeakPeriod",
692-
"FeatureMap"
693-
]
694694
},
695695
"defaultReportingPolicy": "mandatory",
696696
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],

‎src/app/zap-templates/zcl/zcl.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"ecosystem-information-cluster.xml",
4444
"electrical-energy-measurement-cluster.xml",
4545
"electrical-power-measurement-cluster.xml",
46+
"energy-calendar-cluster.xml",
4647
"energy-evse-cluster.xml",
4748
"energy-evse-mode-cluster.xml",
4849
"energy-preference-cluster.xml",
@@ -129,7 +130,6 @@
129130
"window-covering.xml",
130131
"matter-devices.xml",
131132
"sample-mei-cluster.xml",
132-
"energy-calendar-cluster.xml",
133133
"types/door-lock.xml",
134134
"types/occupancy-sensing.xml",
135135
"types/thermostat-user-interface-configuration.xml"
@@ -654,6 +654,16 @@
654654
"NeutralCurrent",
655655
"FeatureMap"
656656
],
657+
"Energy Calendar": [
658+
"CalendarPeriods",
659+
"SpecialDays",
660+
"CurrentDay",
661+
"NextDay",
662+
"CurrentTransition",
663+
"CurrentPeakPeriod",
664+
"NextPeakPeriod",
665+
"FeatureMap"
666+
],
657667
"Power Topology": ["FeatureMap"],
658668
"Valve Configuration and Control": ["RemainingDuration"],
659669
"Boolean State Configuration": ["CurrentSensitivityLevel"],
@@ -675,16 +685,6 @@
675685
"ThreadNetworkTableSize"
676686
],
677687
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
678-
"Energy Calendar": [
679-
"CalendarPeriods",
680-
"SpecialDays",
681-
"CurrentDay",
682-
"NextDay",
683-
"CurrentTransition",
684-
"CurrentPeakPeriod",
685-
"NextPeakPeriod",
686-
"FeatureMap"
687-
]
688688
},
689689
"defaultReportingPolicy": "mandatory",
690690
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],

‎src/app/zap_cluster_list.json

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"DIAGNOSTIC_LOGS_CLUSTER": [],
3434
"DISHWASHER_ALARM_CLUSTER": [],
3535
"DISHWASHER_MODE_CLUSTER": [],
36+
"ENERGY_CALENDAR_CLUSTER": [],
3637
"MICROWAVE_OVEN_MODE_CLUSTER": [],
3738
"DOOR_LOCK_CLUSTER": [],
3839
"ECOSYSTEM_INFORMATION_CLUSTER": [],
@@ -179,6 +180,7 @@
179180
"DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"],
180181
"DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"],
181182
"DISHWASHER_MODE_CLUSTER": ["mode-base-server"],
183+
"ENERGY_CALENDAR_CLUSTER": [],
182184
"MICROWAVE_OVEN_MODE_CLUSTER": ["mode-base-server"],
183185
"DOOR_LOCK_CLUSTER": ["door-lock-server"],
184186
"ECOSYSTEM_INFORMATION_CLUSTER": ["ecosystem-information-server"],

‎src/controller/python/chip/clusters/Objects.py

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp

-51
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/app-common/app-common/zap-generated/cluster-objects.h

-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp

-42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp

-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)