Rebase on latest master

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

@@ -39,14 +39,4 @@ limitations under the License.
     <item fieldId="1" name="MyBitmap" type="TestGlobalBitmap" isNullable="true" optional="false"/>
     <item fieldId="2" name="MyEnum" type="TestGlobalEnum" isNullable="true" optional="true"/>
   </struct>
-
-  <struct name="DateStruct">
-    <cluster code="0x009A"/> <!-- Energy Calendar  -->
-    <cluster code="0x0B06"/> <!-- Without this scripts/tools/zap_regen_all.py pushes global DateStruct to EnergyCalendar namespace   -->
-
-    <item fieldId="0" name="Year"      type="int8u"                  isNullable="true" optional="false"/>
-    <item fieldId="1" name="Month"     type="int8u" min="1" max="12" isNullable="true" optional="false"/>
-    <item fieldId="2" name="Day"       type="int8u" min="1" max="31" isNullable="true" optional="false"/>
-    <item fieldId="3" name="DayOfWeek" type="int8u" min="1" max="7"  isNullable="true" optional="false"/>
-  </struct>
 </configurator>

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

@@ -49,6 +49,7 @@
         "microwave-oven-control-cluster.xml",
         "door-lock-cluster.xml",
         "ecosystem-information-cluster.xml",
+        "energy-calendar-cluster.xml",
         "energy-preference-cluster.xml",
         "electrical-energy-measurement-cluster.xml",
         "electrical-measurement-cluster.xml",
@@ -140,7 +141,6 @@
         "window-covering.xml",
         "matter-devices.xml",
         "sample-mei-cluster.xml",
-        "energy-calendar-cluster.xml",
         "types/door-lock.xml",
         "types/occupancy-sensing.xml",
         "types/thermostat-user-interface-configuration.xml"
@@ -665,6 +665,16 @@
             "NeutralCurrent",
             "FeatureMap"
         ],
+        "Energy Calendar": [
+            "CalendarPeriods",
+            "SpecialDays",
+            "CurrentDay",
+            "NextDay",
+            "CurrentTransition",
+            "CurrentPeakPeriod",
+            "NextPeakPeriod",
+            "FeatureMap"
+        ],
         "Power Topology": ["FeatureMap"],
         "Valve Configuration and Control": ["RemainingDuration"],
         "Boolean State Configuration": ["CurrentSensitivityLevel"],
@@ -686,16 +696,6 @@
             "ThreadNetworkTableSize"
         ],
         "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
-        "Energy Calendar": [
-            "CalendarPeriods",
-            "SpecialDays",
-            "CurrentDay",
-            "NextDay",
-            "CurrentTransition",
-            "CurrentPeakPeriod",
-            "NextPeakPeriod",
-            "FeatureMap"
-        ]
     },
     "defaultReportingPolicy": "mandatory",
     "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],

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

@@ -50,6 +50,7 @@
         "electrical-energy-measurement-cluster.xml",
         "electrical-measurement-cluster.xml",
         "electrical-power-measurement-cluster.xml",
+        "energy-calendar-cluster.xml",
         "energy-evse-cluster.xml",
         "energy-evse-mode-cluster.xml",
         "energy-preference-cluster.xml",
@@ -138,7 +139,6 @@
         "window-covering.xml",
         "matter-devices.xml",
         "sample-mei-cluster.xml",
-        "energy-calendar-cluster.xml",
         "types/door-lock.xml",
         "types/occupancy-sensing.xml",
         "types/thermostat-user-interface-configuration.xml"
@@ -663,6 +663,16 @@
             "NeutralCurrent",
             "FeatureMap"
         ],
+        "Energy Calendar": [
+            "CalendarPeriods",
+            "SpecialDays",
+            "CurrentDay",
+            "NextDay",
+            "CurrentTransition",
+            "CurrentPeakPeriod",
+            "NextPeakPeriod",
+            "FeatureMap"
+        ],
         "Power Topology": ["FeatureMap"],
         "Valve Configuration and Control": ["RemainingDuration"],
         "Boolean State Configuration": ["CurrentSensitivityLevel"],
@@ -684,16 +694,6 @@
             "ThreadNetworkTableSize"
         ],
         "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
-        "Energy Calendar": [
-            "CalendarPeriods",
-            "SpecialDays",
-            "CurrentDay",
-            "NextDay",
-            "CurrentTransition",
-            "CurrentPeakPeriod",
-            "NextPeakPeriod",
-            "FeatureMap"
-        ]
     },
     "defaultReportingPolicy": "mandatory",
     "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],

src/app/zap_cluster_list.json

@@ -35,6 +35,7 @@
         "DIAGNOSTIC_LOGS_CLUSTER": [],
         "DISHWASHER_ALARM_CLUSTER": [],
         "DISHWASHER_MODE_CLUSTER": [],
+        "ENERGY_CALENDAR_CLUSTER": [],
         "MICROWAVE_OVEN_MODE_CLUSTER": [],
         "DOOR_LOCK_CLUSTER": [],
         "ECOSYSTEM_INFORMATION_CLUSTER": [],
@@ -137,7 +138,6 @@
         "WATER_HEATER_MODE_CLUSTER": [],
         "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
         "WINDOW_COVERING_CLUSTER": [],
-        "ENERGY_CALENDAR_CLUSTER": [],
         "ZLL_COMMISSIONING_CLUSTER": []
     },
     "ServerDirectories": {
@@ -187,6 +187,7 @@
         "DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"],
         "DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"],
         "DISHWASHER_MODE_CLUSTER": ["mode-base-server"],
+        "ENERGY_CALENDAR_CLUSTER": [],
         "MICROWAVE_OVEN_MODE_CLUSTER": ["mode-base-server"],
         "DOOR_LOCK_CLUSTER": ["door-lock-server"],
         "ECOSYSTEM_INFORMATION_CLUSTER": ["ecosystem-information-server"],
@@ -325,7 +326,6 @@
         "WINDOW_COVERING_CLUSTER": ["window-covering-server"],
         "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"],
         "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"],
-        "ENERGY_CALENDAR_CLUSTER": ["energy-calendar-server"],
         "ZLL_COMMISSIONING_CLUSTER": []
     }
 }