feat(evse_manager)!: restructure charging state machine to simplify pause/resume and remove replug

Remove WaitingForEnergy, Replug states and related session events
(ChargingResumed, ReplugStarted, ReplugFinished, WaitingForEnergy).
Consolidate pause handling into ChargingPausedEVSE with reason tracking
(Error, NoEnergy, UserPause) via new PauseChargingEVSEReasonEnum.

Key changes in Charger state machine:
- Replace WaitingForEnergy state with direct transitions through
  ChargingPausedEVSE, which now reports multiple concurrent reasons
- Remove evse_replug command from BSP interface and all implementations
- Remove EvseReplugStarted/Finished events from board_support_common
- Add configurable hlc_charge_loop_without_energy_timeout_s for ISO
  sessions to handle no-energy scenarios gracefully in charge loop
- Add dc_ramp_ampere_per_second config for DC current ramping
- Change zero_power_ignore_pause default to true for better EV compatibility
- Introduce StoppingCharging as proper transitional state that waits
  for contactor open before moving to paused or finished states
- Use atomic flags (flag_authorized, flag_transaction_active,
  flag_ev_plugged_in, flag_paused_by_evse) for thread-safe state

BREAKING CHANGE: Removes WaitingForEnergy, ChargingResumed,
ReplugStarted, ReplugFinished session events and evse_replug BSP
command. Consumers must handle ChargingPausedEVSE with reason
tracking instead.

Smoke tests:
- Add pause/resume session commands to test controller interface
- Add comprehensive smoke tests for pause/resume and no-energy scenarios
- Remove deprecated startup_tests.py in favor of new probe-based tests

Signed-off-by: Piet Gömpel <pietgoempel@gmail.com>
Signed-off-by: Cornelius Claussen <cc@pionix.de>
Signed-off-by: Sebastian Lukas <sebastian.lukas@pionix.de>

Author: Pietfried

applications/pionix_chargebridge/include/charge_bridge/everest_api/evse_bsp_api.hpp

@@ -73,7 +73,6 @@ class evse_bsp_api : public everest::lib::io::event::fd_event_register_interface
     void receive_cp_state_F(std::string const& payload);
     void receive_allow_power_on(std::string const& payload);
     void receive_ac_switch_three_phases_while_charging(std::string const& payload);
-    void receive_evse_replug(std::string const& payload);
     void receive_ac_overcurrent_limit(std::string const& payload);
     void receive_lock();
     void receive_unlock();

applications/pionix_chargebridge/src/everest_api/evse_bsp_api.cpp

@@ -119,8 +119,6 @@ void evse_bsp_api::dispatch(std::string const& operation, std::string const& pay
         receive_allow_power_on(payload);
     } else if (operation == "ac_switch_three_phases_while_charging") {
         receive_ac_switch_three_phases_while_charging(payload);
-    } else if (operation == "evse_replug") {
-        receive_evse_replug(payload);
     } else if (operation == "ac_overcurrent_limit") {
         receive_ac_overcurrent_limit(payload);
     } else if (operation == "lock") {
@@ -393,9 +391,6 @@ void evse_bsp_api::receive_allow_power_on(std::string const& payload) {
 void evse_bsp_api::receive_ac_switch_three_phases_while_charging(std::string const&) {
 }
 
-void evse_bsp_api::receive_evse_replug(std::string const&) {
-}
-
 void evse_bsp_api::receive_ac_overcurrent_limit(std::string const&) {
 }
 

applications/utils/everest-testing/src/everest/testing/core_utils/controller/everest_test_controller.py

@@ -53,12 +53,12 @@ def plug_in(self, connector_id=1):
     def plug_in_ac_iso(self, connector_id=1):
         self._mqtt_client.publish(
             f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/execute_charging_session",
-            "sleep 1;iso_wait_slac_matched;iso_start_v2g_session AC 86400 0;iso_wait_pwr_ready;iso_draw_power_regulated 16,3;sleep 20;iso_stop_charging;iso_wait_v2g_session_stopped;unplug")
+            "sleep 1;iso_wait_slac_matched;iso_start_v2g_session AC 86400 0;iso_wait_pwr_ready;iso_draw_power_regulated 16,3;sleep 60;iso_stop_charging;iso_wait_v2g_session_stopped;unplug")
 
     def plug_in_dc_iso(self, connector_id=1):
         self._mqtt_client.publish(
             f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/execute_charging_session",
-            "sleep 1;iso_wait_slac_matched;iso_start_v2g_session DC 86400 0;iso_wait_pwr_ready;iso_wait_for_stop 20;iso_wait_v2g_session_stopped;unplug"
+            "sleep 1;iso_wait_slac_matched;iso_start_v2g_session DC 86400 0;iso_wait_pwr_ready;iso_wait_for_stop 60;iso_wait_v2g_session_stopped;unplug"
         )
 
     def plug_out(self, connector_id=1):
@@ -70,6 +70,36 @@ def plug_out_iso(self, connector_id=1):
         self._mqtt_client.publish(
             f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/modify_charging_session",
             "iso_stop_charging;iso_wait_v2g_session_stopped;unplug")
+    
+    def pause_session(self, connector_id=1):
+        self._mqtt_client.publish(
+            f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/modify_charging_session",
+            "pause;sleep 36000"
+        )
+
+    def resume_session(self, connector_id=1):
+        self._mqtt_client.publish(
+            f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/modify_charging_session",
+            "draw_power_regulated 16,3"
+        )
+
+    def pause_iso_session(self, connector_id=1):
+        self._mqtt_client.publish(
+            f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/modify_charging_session",
+            "iso_pause_charging;iso_wait_for_resume"
+        )
+
+    def resume_iso_session_ac(self, connector_id=1):
+        self._mqtt_client.publish(
+            f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/modify_charging_session",
+            "iso_start_bcb_toggle 3;iso_wait_pwm_is_running;iso_start_v2g_session AC 86400 0;iso_wait_pwr_ready;iso_draw_power_regulated 16,3;iso_wait_for_stop 60"
+        )
+
+    def resume_iso_session_dc(self, connector_id=1):
+        self._mqtt_client.publish(
+            f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/modify_charging_session",
+            "iso_start_bcb_toggle 3;iso_wait_pwm_is_running;iso_start_v2g_session DC 86400 0;iso_wait_pwr_ready;iso_dc_power_on;iso_wait_for_stop 60"
+        )
 
     def swipe(self, token, connectors=None):
         connectors = connectors if connectors is not None else [1]

applications/utils/everest-testing/src/everest/testing/core_utils/controller/test_controller_interface.py

@@ -46,6 +46,36 @@ def plug_out_iso(self, connector_id):
         Plug out of an electric vehicle properly ending the ISO15118 session.
         """
         raise NotImplementedError()
+    
+    def pause_session(self, connector_id):
+        """
+        Pause an ongoing charging session.
+        """
+        raise NotImplementedError()
+    
+    def resume_session(self, connector_id):
+        """
+        Resume a paused charging session.
+        """
+        raise NotImplementedError()
+    
+    def pause_iso_session(self, connector_id):
+        """
+        Pause an ongoing ISO15118 session initiated by the EV.
+        """
+        raise NotImplementedError()
+    
+    def resume_iso_session_ac(self, connector_id):
+        """
+        Resume a paused ISO15118 session initiated by the EV.
+        """
+        raise NotImplementedError()
+
+    def resume_iso_session_dc(self, connector_id):
+        """
+        Resume a paused ISO15118 session initiated by the EV.
+        """
+        raise NotImplementedError()
 
     def plug_out(self):
         """

config/config-CB-EVAL-DC.yaml

@@ -49,6 +49,8 @@ active_modules:
       switch_3ph1ph_cp_state: X1
       cable_check_wait_below_60V_before_finish: false
       hack_allow_bpt_with_iso2: true
+      zero_power_ignore_pause: true
+      hlc_charge_loop_without_energy_timeout_s: 100
     connections:
       bsp:
         - implementation_id: main
@@ -161,7 +163,7 @@ active_modules:
     config_module:
       cfg_heartbeat_interval_ms: 500
     module: over_voltage_monitor_API
-  external_limits:
+  external_energy_limits_consumer_api:
     connections:
       energy_node:
         - implementation_id: external_limits
@@ -170,3 +172,12 @@ active_modules:
       cfg_heartbeat_interval_ms: 1000
       cfg_communication_check_to_s: 0
     module: external_energy_limits_consumer_API
+  evse_manager_consumer_api:
+    module: evse_manager_consumer_API
+    connections:
+      evse_manager:
+        - implementation_id: evse
+          module_id: connector_1
+      evse_bsp:
+        - implementation_id: main
+          module_id: cb_bsp

config/config-CB-SAT-AC.yaml

@@ -1,6 +1,15 @@
 settings:
   telemetry_enabled: false
 active_modules:
+  packet_sniffer:
+    module: PacketSniffer
+    config_module:
+      device: cb_plc
+      session_logging_path: ""
+    connections:
+      evse_manager:
+        - implementation_id: evse
+          module_id: connector_1
   auth:
     config_module:
       connection_timeout: 60
@@ -35,8 +44,8 @@ active_modules:
     module: EnergyManager
   connector_1:
     config_module:
-      ac_enforce_hlc: true
-      ac_hlc_enabled: true
+      ac_enforce_hlc: false
+      ac_hlc_enabled: false
       ac_hlc_use_5percent: true
       ac_nominal_voltage: 230
       charge_mode: AC
@@ -47,7 +56,7 @@ active_modules:
       payment_enable_contract: false
       payment_enable_eim: true
       session_logging: true
-      session_logging_path: /tmp/everest-logs
+      session_logging_path: /tmp/everest-logs/
       session_logging_xml: false
       switch_3ph1ph_delay_s: 5
       switch_3ph1ph_cp_state: X1
@@ -108,15 +117,7 @@ active_modules:
       main:
         device: cb_plc
   token_provider:
-    config_implementation:
-      main:
-        timeout: 10
-        token: DEADBEEF
-    connections:
-      evse:
-        - implementation_id: evse
-          module_id: connector_1
-    module: DummyTokenProvider
+    module: DummyTokenProviderManual
   token_validator:
     config_implementation:
       main:
@@ -128,3 +129,18 @@ active_modules:
   cb_bsp:
     connections: {}
     module: evse_board_support_API
+  evse_manager_consumer_api:
+    module: evse_manager_consumer_API
+    connections:
+      evse_manager:
+        - implementation_id: evse
+          module_id: connector_1
+      evse_bsp:
+        - implementation_id: main
+          module_id: cb_bsp
+  external_energy_limits_consumer_api:
+    module: external_energy_limits_consumer_API
+    connections:
+      energy_node:
+        - implementation_id: external_limits
+          module_id: grid_connection_point

docs/source/reference/EVerest_API/evse_board_support_API.yaml

@@ -62,13 +62,8 @@ channels:
   receive_ac_switch_three_phases_while_charging:
     address: 'e2m/ac_switch_three_phases_while_charging'
     messages:
-      receive_ac_switch_three_phases_while_charging:
-        $ref: '#/components/messages/receive_ac_switch_three_phases_while_charging'
-  receive_evse_replug:
-    address: 'e2m/evse_replug'
-    messages:
-      receive_evse_replug:
-        $ref: '#/components/messages/receive_evse_replug'
+       receive_ac_switch_three_phases_while_charging:
+         $ref: '#/components/messages/receive_ac_switch_three_phases_while_charging'
   receive_ac_overcurrent_limit:
     address: 'e2m/ac_overcurrent_limit'
     messages:
@@ -205,12 +200,6 @@ operations:
     channel:
       $ref: '#/channels/receive_ac_switch_three_phases_while_charging'
     description: 'Direction: EVerest to Module'
-  receive_evse_replug:
-    title: 'Receive request for virtual replug sequence'
-    action: receive
-    channel:
-      $ref: '#/channels/receive_evse_replug'
-    description: 'Direction: EVerest to Module'
   receive_ac_overcurrent_limit:
     title: 'Receive over current limit'
     action: receive
@@ -384,23 +373,6 @@ components:
         - summary: ""
           payload:
             "ThreePhases"
-    receive_evse_replug:
-      name: receive_evse_replug
-      title: 'Receive request for virtual replug sequence'
-      summary: >-
-        Optional, in case of doubt do not implement.
-        Special command initiate a virtual replug sequence of adjustable duration without restarting
-        session. Emits a EvseReplugStarted event if supported and started. BSP will
-        take care to not emit other events such as CarPluggedIn/Out during that time.
-        Once finished it will emit a EvseReplugFinished. This is mainly for testing purposes,
-        don't implement for production use.
-      contentType: application/json
-      payload:
-        $ref: '#/components/schemas/Duration'
-      examples:
-        - summary: ""
-          payload:
-            200
     receive_ac_overcurrent_limit:
       name: receive_ac_overcurrent_limit
       title: 'Receive over current limit'
@@ -624,8 +596,6 @@ components:
             - A-F: CP states as defined in IEC61851-1
             - PowerOn: Hardware confirms that contactors switched on correctly (typically mirror contacts indicated successful switch on)
             - PowerOff: Hardware confirms that contactors switched off correctly and are not welded (typically mirror contacts indicated successful switch off)
-            - EvseReplugStarted: Special testing sequence: virtual replugging started
-            - EvseReplugFinished: Special testing sequence: virtual replugging stopped
             - Disconnected: Only used on EV side: Not connected to a charging station. Do not use on EVSE side.
           enum:
             - 'A'
@@ -636,8 +606,6 @@ components:
             - 'F'
             - 'PowerOn'
             - 'PowerOff'
-            - 'EvseReplugStarted'
-            - 'EvseReplugFinished'
             - 'Disconnected'
     Current:
       description: Electrical current in milliampere (mA)

docs/source/reference/EVerest_API/evse_manager_consumer_API.yaml

@@ -871,7 +871,6 @@ components:
           - Disabled: EVSE is disabled on not available for energy transfer
           - Preparing: First user interaction occured, e.g. plug in of EV or authorization has been received
           - AuthRequired: EV is plugged in and EVSE is waiting for authorization
-          - WaitingForEnergy: EVSE is waiting for energy. Occurs at the start of the session or when no energy is available
           - ChargingPausedEV: Session is paused by EV
           - ChargingPausedEVSE: Session is paused by EVSE
           - Charging: EV is charging
@@ -887,7 +886,6 @@ components:
           - Preparing
           - Reserved
           - AuthRequired
-          - WaitingForEnergy
           - ChargingPausedEV
           - ChargingPausedEVSE
           - Charging
@@ -1320,7 +1318,7 @@ components:
         charging_state_changed_event:
           description: >-
             Data for ChargingStateChangedEvent. Shall be set for the following SessionEventEnums:
-              ChargingStarted, ChargingResumed, ChargingPausedEV, Charging
+              ChargingStarted, ChargingPausedEV, Charging
           type: object
           $ref: '#/components/schemas/ChargingStateChangedEvent'
         authorization_event:
@@ -1347,17 +1345,13 @@ components:
         - PrepareCharging: EVSE started to prepare for charging. DC: CableCheck, PreCharge, PowerDelivery. AC: wait for the car to proceed to state C/D
         - ChargingStarted: DC: CurrentDemand has started. AC: Auth is ok and car requested power (state C/D)
         - ChargingPausedEV: Signaled when charging is paused by the EV
-        - WaitingForEnergy: Waiting for ernergy manager
         - ChargingPausedEVSE: Signaled when charging is paused by the EVSE
-        - ChargingResumed: Charging has resumed from a pause
         - StoppingCharging: EVSE has started to stop the charging process. DC: CurrentDemand has finished, now doing WeldingCheck etc, AC: Wait for car to return to state B or A
         - ChargingFinished: Charging is finished. Essentially the same as TransactionFinished, but emitted for clarity
         - TransactionFinished: Signaled when the transaction finished. Transaction finishes at the point where one of the preconditions for charging irrevocably becomes false: When a user swipes to stop the transaction and the stop is authorized.
         - SessionFinished: Session finishes at the point that the EVSE is available again (no cable plugged)
         - ReservationStart: Signaled when a reservation starts
         - ReservationEnd: Signaled when a reservation ends
-        - ReplugStarted: Signaled when the EVSE Manager virtually replugs without interrupting the session or transaction
-        - ReplugFinished: Signaled when the virtual replug process has finished
         - PluginTimeout: Signaled when an EV has been Plugged in but no authorization is present within specified ConnectionTimeout
         - SwitchingPhases: Signals that 1ph/3ph switching was started on AC charging
         - SessionResumed: Signaled when a session is resumed at startup (e.g. because of previous powerloss)
@@ -1374,16 +1368,12 @@ components:
         - ChargingStarted
         - ChargingPausedEV
         - ChargingPausedEVSE
-        - WaitingForEnergy
-        - ChargingResumed
         - StoppingCharging
         - ChargingFinished
         - TransactionFinished
         - SessionFinished
         - ReservationStart
         - ReservationEnd
-        - ReplugStarted
-        - ReplugFinished
         - PluginTimeout
         - SwitchingPhases
         - SessionResumed

interfaces/evse_board_support.yaml

@@ -59,18 +59,6 @@ cmds:
       value:
         description: 'True: switch to 3ph, False: switch to 1ph'
         type: boolean
-  evse_replug:
-    description: >-
-      Optional, in case of doubt do not implement.
-      Special command initiate a virtual replug sequence without restarting
-      session. Emits a EvseReplugStarted event if supported and started. BSP will
-      take care to not emit other events such as CarPluggedIn/Out during that time.
-      Once finished it will emit a EvseReplugFinished. This is mainly for testing purposes,
-      don't implement for production use.
-    arguments:
-      value:
-        description: Time in ms for the duration of the replug sequence
-        type: integer
   ac_set_overcurrent_limit_A:
     description: >-
       Many chargers implement a fast over current shutdown directly in the hardware that triggers if the EV draws more current than

lib/everest/everest_api_types/include/everest_api_types/evse_board_support/API.hpp

@@ -18,8 +18,6 @@ enum class Event {
     F,
     PowerOn,
     PowerOff,
-    EvseReplugStarted,
-    EvseReplugFinished,
     Disconnected,
 };