From d4cb3fb960bff518c0042c249c358b118657b63b Mon Sep 17 00:00:00 2001
From: jamesharrow <93921463+jamesharrow@users.noreply.github.com>
Date: Sat, 20 Jan 2024 00:25:39 +0000
Subject: [PATCH] Fixes 31540 / 31543 Energy EVSE & DEM cluster xml (Events are
 8bit not 16bit codes) (#31559)

* Fixes 31540

* Fixes #31543
---
 .../chip/device-energy-management-cluster.xml        |  8 ++++----
 .../zcl/data-model/chip/energy-evse-cluster.xml      | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml
index 01aef8e7bc06ae..85762181765590 100644
--- a/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/device-energy-management-cluster.xml
@@ -84,19 +84,19 @@ limitations under the License.
     <command source="client" code="0x07" name="CancelRequest" optional="true">
       <description>Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command</description>
     </command>
-    <event code="0x0000" name="PowerAdjustStart" priority="info" side="server" apiMaturity="provisional" optional="true">
+    <event code="0x00" name="PowerAdjustStart" priority="info" side="server" apiMaturity="provisional" optional="true">
       <description>PowerAdjustStart</description>
     </event>
-    <event code="0x0001" name="PowerAdjustEnd" priority="info" side="server" apiMaturity="provisional" optional="true">
+    <event code="0x01" name="PowerAdjustEnd" priority="info" side="server" apiMaturity="provisional" optional="true">
       <description>PowerAdjustEnd</description>
       <field id="0" name="Cause" type="CauseEnum" apiMaturity="provisional" default="0x00" min="0x00" max="0x04"/>
       <field id="1" name="Duration" type="elapsed_s" apiMaturity="provisional"/>
       <field id="2" name="EnergyUse" type="energy_mwh" apiMaturity="provisional"/>
     </event>
-    <event code="0x0002" name="Paused" priority="info" side="server" apiMaturity="provisional" optional="true">
+    <event code="0x02" name="Paused" priority="info" side="server" apiMaturity="provisional" optional="true">
       <description>Paused</description>
     </event>
-    <event code="0x0003" name="Resumed" priority="info" side="server" apiMaturity="provisional" optional="true">
+    <event code="0x03" name="Resumed" priority="info" side="server" apiMaturity="provisional" optional="true">
       <description>Resumed</description>
       <field id="0" name="Cause" type="CauseEnum" apiMaturity="provisional" default="0x00" min="0x00" max="0x04"/>
     </event>
diff --git a/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml
index a95a5adbd2e34b..107cc9cab7b103 100644
--- a/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml
@@ -187,11 +187,11 @@ limitations under the License.
       <arg name="ChargingTargetSchedules" type="ChargingTargetScheduleStruct" array="true" length="7"/>
       <description>The GetTargetsResponse is sent in response to the GetTargets Command.</description>
     </command>
-    <event side="server" code="0x0000" name="EVConnected" priority="info" apiMaturity="provisional">
+    <event side="server" code="0x00" name="EVConnected" priority="info" apiMaturity="provisional">
       <description>EVConnected</description>
       <field id="0" name="SessionID" type="int32u" apiMaturity="provisional"/>
     </event>
-    <event side="server" code="0x0001" name="EVNotDetected" priority="info" apiMaturity="provisional">
+    <event side="server" code="0x01" name="EVNotDetected" priority="info" apiMaturity="provisional">
       <description>EVNotDetected</description>
       <field id="0" name="SessionID" type="int32u" apiMaturity="provisional"/>
       <field id="1" name="State" type="StateEnum" apiMaturity="provisional" min="0x00" max="0x06"/>
@@ -199,27 +199,27 @@ limitations under the License.
       <field id="3" name="SessionEnergyCharged" type="energy_mwh" min="0" apiMaturity="provisional"/>
       <field id="4" name="SessionEnergyDischarged" type="energy_mwh" min="0" optional="true" apiMaturity="provisional"/>
     </event>
-    <event side="server" code="0x0002" name="EnergyTransferStarted" priority="info" apiMaturity="provisional">
+    <event side="server" code="0x02" name="EnergyTransferStarted" priority="info" apiMaturity="provisional">
       <description>EnergyTransferStarted</description>
       <field id="0" name="SessionID" type="int32u" apiMaturity="provisional"/>
       <field id="1" name="State" type="StateEnum" apiMaturity="provisional" min="0x00" max="0x06"/>
       <field id="2" name="MaximumCurrent" type="amperage_ma" min="0" max="80000" apiMaturity="provisional"/>
     </event>
-    <event side="server" code="0x0003" name="EnergyTransferStopped" priority="info" apiMaturity="provisional">
+    <event side="server" code="0x03" name="EnergyTransferStopped" priority="info" apiMaturity="provisional">
       <description>EnergyTransferStopped</description>
       <field id="0" name="SessionID" type="int32u" apiMaturity="provisional"/>
       <field id="1" name="State" type="StateEnum" apiMaturity="provisional" min="0x00" max="0x06"/>
       <field id="2" name="Reason" type="EnergyTransferStoppedReasonEnum" apiMaturity="provisional" min="0x00" max="0x02"/>
       <field id="4" name="EnergyTransferred" type="energy_mwh" min="0" apiMaturity="provisional"/>
     </event>
-    <event side="server" code="0x0004" name="Fault" priority="critical" apiMaturity="provisional">
+    <event side="server" code="0x04" name="Fault" priority="critical" apiMaturity="provisional">
       <description>Fault</description>
       <field id="0" name="SessionID" type="int32u" isNullable="true" apiMaturity="provisional"/>
       <field id="1" name="State" type="StateEnum" apiMaturity="provisional" min="0x00" max="0x06"/>
       <field id="2" name="FaultStatePreviousState" type="FaultStateEnum" apiMaturity="provisional" min="0x00" max="0xFF"/>
       <field id="4" name="FaultStateCurrentState" type="FaultStateEnum" apiMaturity="provisional" min="0x00" max="0xFF"/>
     </event>
-    <event side="server" code="0x0005" name="RFID" priority="info" apiMaturity="provisional" optional="true">
+    <event side="server" code="0x05" name="RFID" priority="info" apiMaturity="provisional" optional="true">
       <description>RFID</description>
       <field id="0" name="UID" type="octet_string" length="10" apiMaturity="provisional"/>
     </event>