fix: merge error + missing blank line

Signed-off-by: James Chapman <[email protected]>
EVerest · May 17, 2024 · 317b3e4 · 317b3e4
1 parent 8023cb6
commit 317b3e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/modules/EvseManager/evse/evse_managerImpl.cpp b/modules/EvseManager/evse/evse_managerImpl.cpp
@@ -304,6 +304,9 @@ void evse_managerImpl::ready() {
             if (connector_status_changed) {
                 se.connector_id = 1;
             }
+
+            // Add source information (Who initiated this state change)
+            se.source = mod->charger->get_last_enable_disable_source();
         } else if (e == types::evse_manager::SessionEventEnum::ChargingPausedEV or
                    e == types::evse_manager::SessionEventEnum::ChargingPausedEVSE or
                    e == types::evse_manager::SessionEventEnum::ChargingStarted or
@@ -316,9 +319,6 @@ void evse_managerImpl::ready() {
             types::evse_manager::AuthorizationEvent authorization_event;
             authorization_event.meter_value = mod->get_latest_powermeter_data_billing();
             se.authorization_event = authorization_event;
-
-            // Add source information (Who initiated this state change)
-            se.source = mod->charger->get_last_enable_disable_source();
         }
 
         se.uuid = session_uuid;

diff --git a/types/evse_manager.yaml b/types/evse_manager.yaml
@@ -345,7 +345,7 @@ types:
         - MobileApp
         - FirmwareUpdate
         - CSMS
-      enable_state: 
+      enable_state:
         description: Specifies the state for this entry
         type: string
         enum:
@@ -377,7 +377,7 @@ types:
         format: date-time
       connector_id:
         description: >-
-          Id of the connector of this EVSE. 
+          Id of the connector of this EVSE.
           If the connector_id is not specified, its assumed to be 1
         type: integer
       event:
@@ -406,13 +406,13 @@ types:
         $ref: /evse_manager#/TransactionFinished
       charging_state_changed_event:
         description: >-
-          Data for ChargingStateChangedEvent. Shall be set for the following SessionEventEnums: 
+          Data for ChargingStateChangedEvent. Shall be set for the following SessionEventEnums:
           ChargingStarted, ChargingResumed, ChargingPausedEV, Charging
         type: object
         $ref: /evse_manager#/ChargingStateChangedEvent
       authorization_event:
         description: >-
-          Data for Authorization event. Shall be set for the following SessionEventEnums: 
+          Data for Authorization event. Shall be set for the following SessionEventEnums:
           Authorized, Deauthorized
         type: object
         $ref: /evse_manager#/AuthorizationEvent
@@ -591,4 +591,4 @@ types:
           type: object
           $ref: /evse_manager#/Connector
         minItems: 1
-        maxItems: 128
+        maxItems: 128