Skip to content

Commit 8a8a187

Browse files
Michail-AntropovMichail-Antropov
committed
Rebase on latest master
1 parent 62e862d commit 8a8a187

File tree

12 files changed

+37
-207
lines changed

12 files changed

+37
-207
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
@@ -49,6 +49,7 @@
4949
"microwave-oven-control-cluster.xml",
5050
"door-lock-cluster.xml",
5151
"ecosystem-information-cluster.xml",
52+
"energy-calendar-cluster.xml",
5253
"energy-preference-cluster.xml",
5354
"electrical-energy-measurement-cluster.xml",
5455
"electrical-measurement-cluster.xml",
@@ -140,7 +141,6 @@
140141
"window-covering.xml",
141142
"matter-devices.xml",
142143
"sample-mei-cluster.xml",
143-
"energy-calendar-cluster.xml",
144144
"types/door-lock.xml",
145145
"types/occupancy-sensing.xml",
146146
"types/thermostat-user-interface-configuration.xml"
@@ -665,6 +665,16 @@
665665
"NeutralCurrent",
666666
"FeatureMap"
667667
],
668+
"Energy Calendar": [
669+
"CalendarPeriods",
670+
"SpecialDays",
671+
"CurrentDay",
672+
"NextDay",
673+
"CurrentTransition",
674+
"CurrentPeakPeriod",
675+
"NextPeakPeriod",
676+
"FeatureMap"
677+
],
668678
"Power Topology": ["FeatureMap"],
669679
"Valve Configuration and Control": ["RemainingDuration"],
670680
"Boolean State Configuration": ["CurrentSensitivityLevel"],
@@ -686,16 +696,6 @@
686696
"ThreadNetworkTableSize"
687697
],
688698
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
689-
"Energy Calendar": [
690-
"CalendarPeriods",
691-
"SpecialDays",
692-
"CurrentDay",
693-
"NextDay",
694-
"CurrentTransition",
695-
"CurrentPeakPeriod",
696-
"NextPeakPeriod",
697-
"FeatureMap"
698-
]
699699
},
700700
"defaultReportingPolicy": "mandatory",
701701
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"electrical-energy-measurement-cluster.xml",
5151
"electrical-measurement-cluster.xml",
5252
"electrical-power-measurement-cluster.xml",
53+
"energy-calendar-cluster.xml",
5354
"energy-evse-cluster.xml",
5455
"energy-evse-mode-cluster.xml",
5556
"energy-preference-cluster.xml",
@@ -138,7 +139,6 @@
138139
"window-covering.xml",
139140
"matter-devices.xml",
140141
"sample-mei-cluster.xml",
141-
"energy-calendar-cluster.xml",
142142
"types/door-lock.xml",
143143
"types/occupancy-sensing.xml",
144144
"types/thermostat-user-interface-configuration.xml"
@@ -663,6 +663,16 @@
663663
"NeutralCurrent",
664664
"FeatureMap"
665665
],
666+
"Energy Calendar": [
667+
"CalendarPeriods",
668+
"SpecialDays",
669+
"CurrentDay",
670+
"NextDay",
671+
"CurrentTransition",
672+
"CurrentPeakPeriod",
673+
"NextPeakPeriod",
674+
"FeatureMap"
675+
],
666676
"Power Topology": ["FeatureMap"],
667677
"Valve Configuration and Control": ["RemainingDuration"],
668678
"Boolean State Configuration": ["CurrentSensitivityLevel"],
@@ -684,16 +694,6 @@
684694
"ThreadNetworkTableSize"
685695
],
686696
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
687-
"Energy Calendar": [
688-
"CalendarPeriods",
689-
"SpecialDays",
690-
"CurrentDay",
691-
"NextDay",
692-
"CurrentTransition",
693-
"CurrentPeakPeriod",
694-
"NextPeakPeriod",
695-
"FeatureMap"
696-
]
697697
},
698698
"defaultReportingPolicy": "mandatory",
699699
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],

‎src/app/zap_cluster_list.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"DIAGNOSTIC_LOGS_CLUSTER": [],
3636
"DISHWASHER_ALARM_CLUSTER": [],
3737
"DISHWASHER_MODE_CLUSTER": [],
38+
"ENERGY_CALENDAR_CLUSTER": [],
3839
"MICROWAVE_OVEN_MODE_CLUSTER": [],
3940
"DOOR_LOCK_CLUSTER": [],
4041
"ECOSYSTEM_INFORMATION_CLUSTER": [],
@@ -137,7 +138,6 @@
137138
"WATER_HEATER_MODE_CLUSTER": [],
138139
"WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
139140
"WINDOW_COVERING_CLUSTER": [],
140-
"ENERGY_CALENDAR_CLUSTER": [],
141141
"ZLL_COMMISSIONING_CLUSTER": []
142142
},
143143
"ServerDirectories": {
@@ -187,6 +187,7 @@
187187
"DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"],
188188
"DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"],
189189
"DISHWASHER_MODE_CLUSTER": ["mode-base-server"],
190+
"ENERGY_CALENDAR_CLUSTER": [],
190191
"MICROWAVE_OVEN_MODE_CLUSTER": ["mode-base-server"],
191192
"DOOR_LOCK_CLUSTER": ["door-lock-server"],
192193
"ECOSYSTEM_INFORMATION_CLUSTER": ["ecosystem-information-server"],
@@ -325,7 +326,6 @@
325326
"WINDOW_COVERING_CLUSTER": ["window-covering-server"],
326327
"WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"],
327328
"WATER_HEATER_MODE_CLUSTER": ["mode-base-server"],
328-
"ENERGY_CALENDAR_CLUSTER": ["energy-calendar-server"],
329329
"ZLL_COMMISSIONING_CLUSTER": []
330330
}
331331
}

‎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.

0 commit comments

Comments
 (0)