refactor(EvseManager): Refactor Charger state machine to fix

pause/resume behaviour

- Remove occurences of ChargingResumed
- In Finishing: Stop session only if EV is unplugged
- Remove evse_replug command from evse_board_support interface and all respective occurences in modules or the stable API
- handle HLC charging without power and fix AC basic pause transitions
- Add HLC no‑energy timeout and reuse power_available()

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

Author: Pietfried

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

@@ -72,7 +72,6 @@ class evse_bsp_api : public everest::lib::io::event::fd_event_register_interface
     void receive_pwm_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&) {
 }
 

docs/source/reference/EVerest_API/evse_board_support_API.yaml

@@ -59,11 +59,6 @@ channels:
     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_overcurrent_limit:
     address: 'e2m/ac_overcurrent_limit'
     messages:
@@ -194,12 +189,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
@@ -369,23 +358,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'

docs/source/reference/EVerest_API/evse_manager_consumer_API.yaml

@@ -1314,7 +1314,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:
@@ -1343,7 +1343,6 @@ components:
         - 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.
@@ -1369,7 +1368,6 @@ components:
         - ChargingPausedEV
         - ChargingPausedEVSE
         - WaitingForEnergy
-        - ChargingResumed
         - StoppingCharging
         - ChargingFinished
         - TransactionFinished

interfaces/evse_board_support.yaml

@@ -43,18 +43,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_manager/API.hpp

@@ -57,16 +57,12 @@ enum class SessionEventEnum {
     ChargingStarted,
     ChargingPausedEV,
     ChargingPausedEVSE,
-    WaitingForEnergy,
-    ChargingResumed,
     StoppingCharging,
     ChargingFinished,
     TransactionFinished,
     SessionFinished,
     ReservationStart,
     ReservationEnd,
-    ReplugStarted,
-    ReplugFinished,
     PluginTimeout,
     SwitchingPhases,
     SessionResumed,

lib/everest/everest_api_types/src/everest_api_types/evse_manager/json_codec.cpp

@@ -260,12 +260,6 @@ void to_json(json& j, SessionEventEnum const& k) noexcept {
     case SessionEventEnum::ChargingPausedEVSE:
         j = "ChargingPausedEVSE";
         return;
-    case SessionEventEnum::WaitingForEnergy:
-        j = "WaitingForEnergy";
-        return;
-    case SessionEventEnum::ChargingResumed:
-        j = "ChargingResumed";
-        return;
     case SessionEventEnum::StoppingCharging:
         j = "StoppingCharging";
         return;
@@ -284,12 +278,6 @@ void to_json(json& j, SessionEventEnum const& k) noexcept {
     case SessionEventEnum::ReservationEnd:
         j = "ReservationEnd";
         return;
-    case SessionEventEnum::ReplugStarted:
-        j = "ReplugStarted";
-        return;
-    case SessionEventEnum::ReplugFinished:
-        j = "ReplugFinished";
-        return;
     case SessionEventEnum::PluginTimeout:
         j = "PluginTimeout";
         return;
@@ -350,14 +338,6 @@ void from_json(json const& j, SessionEventEnum& k) {
         k = SessionEventEnum::ChargingPausedEVSE;
         return;
     }
-    if (s == "WaitingForEnergy") {
-        k = SessionEventEnum::WaitingForEnergy;
-        return;
-    }
-    if (s == "ChargingResumed") {
-        k = SessionEventEnum::ChargingResumed;
-        return;
-    }
     if (s == "StoppingCharging") {
         k = SessionEventEnum::StoppingCharging;
         return;
@@ -382,14 +362,6 @@ void from_json(json const& j, SessionEventEnum& k) {
         k = SessionEventEnum::ReservationEnd;
         return;
     }
-    if (s == "ReplugStarted") {
-        k = SessionEventEnum::ReplugStarted;
-        return;
-    }
-    if (s == "ReplugFinished") {
-        k = SessionEventEnum::ReplugFinished;
-        return;
-    }
     if (s == "PluginTimeout") {
         k = SessionEventEnum::PluginTimeout;
         return;

lib/everest/everest_api_types/src/everest_api_types/evse_manager/wrapper.cpp

@@ -209,10 +209,6 @@ SessionEventEnum_Internal to_internal_api(SessionEventEnum_External const& val)
         return TarT::ChargingPausedEV;
     case SrcT::ChargingPausedEVSE:
         return TarT::ChargingPausedEVSE;
-    case SrcT::WaitingForEnergy:
-        return TarT::WaitingForEnergy;
-    case SrcT::ChargingResumed:
-        return TarT::ChargingResumed;
     case SrcT::StoppingCharging:
         return TarT::StoppingCharging;
     case SrcT::ChargingFinished:
@@ -225,10 +221,6 @@ SessionEventEnum_Internal to_internal_api(SessionEventEnum_External const& val)
         return TarT::ReservationStart;
     case SrcT::ReservationEnd:
         return TarT::ReservationEnd;
-    case SrcT::ReplugStarted:
-        return TarT::ReplugStarted;
-    case SrcT::ReplugFinished:
-        return TarT::ReplugFinished;
     case SrcT::PluginTimeout:
         return TarT::PluginTimeout;
     case SrcT::SwitchingPhases:
@@ -267,10 +259,6 @@ SessionEventEnum_External to_external_api(SessionEventEnum_Internal const& val)
         return TarT::ChargingPausedEV;
     case SrcT::ChargingPausedEVSE:
         return TarT::ChargingPausedEVSE;
-    case SrcT::WaitingForEnergy:
-        return TarT::WaitingForEnergy;
-    case SrcT::ChargingResumed:
-        return TarT::ChargingResumed;
     case SrcT::StoppingCharging:
         return TarT::StoppingCharging;
     case SrcT::ChargingFinished:
@@ -283,10 +271,6 @@ SessionEventEnum_External to_external_api(SessionEventEnum_Internal const& val)
         return TarT::ReservationStart;
     case SrcT::ReservationEnd:
         return TarT::ReservationEnd;
-    case SrcT::ReplugStarted:
-        return TarT::ReplugStarted;
-    case SrcT::ReplugFinished:
-        return TarT::ReplugFinished;
     case SrcT::PluginTimeout:
         return TarT::PluginTimeout;
     case SrcT::SwitchingPhases:

lib/everest/everest_api_types/tests/expected_interfaces_file_hashes.csv

@@ -5,7 +5,7 @@ interfaces/auth_token_validator.yaml,d4632713b49c9c4e20cf7e8d4d56de256ecff4a1a24
 interfaces/connector_lock.yaml,5c2a746ba04eaf96657f98673927aa88038c209d8b845ad7b248d14e1d930234
 interfaces/display_message.yaml,c840e9ac1983952d905d1ae7ce4fa179ccc6b7e90d9aeb4c685af1ea95a5b83f
 interfaces/error_history.yaml,2b275797a7990976f5d4ee16c498190a03bc3e754adda04e58f0d34de18549a8
-interfaces/evse_board_support.yaml,0ca360933de007758cc20a278b9661abf8438c690213927942d1776edb619277
+interfaces/evse_board_support.yaml,f1b2bdaf9f425ac0399d1bdae0bd402d7b616c70d2e7cb0daa1c7ca836e51e33
 interfaces/evse_manager.yaml,2627fd4b254dd4ad0ffa3753e43782160ed54718fcaf428d119cbe1f8d518313
 interfaces/external_energy_limits.yaml,e54e8b2c323073e62e072841a31f615501b22b26d461a421e9f83876b40c9d5b
 interfaces/isolation_monitor.yaml,ade92191ca86270b61f1b8719067dc862f011c8a6f21c22201ec9dc4aeebcd62

lib/everest/everest_api_types/tests/expected_types_file_hashes.csv

@@ -8,7 +8,7 @@ types/energy.yaml,82b8d902618eb3927a7e34e8a641cb2a69db93e404c2b61320c62eab3c290d
 types/energy_price_information.yaml,b2284d75a2fc695150cb72e7262b4efa11a05b11b1cca382451643a9bb2be624
 types/error_history.yaml,6c49548f8020e807ca17f710d6cb69e53399b9da4ed2aaa5247dd695f42c3b50
 types/evse_board_support.yaml,cbbe41414102d45b4d24db661b4da2bbaef544c4f050db0981ba6e44946a3f79
-types/evse_manager.yaml,1239ef6fdc57cbec1f6788003c9c72bd80b899ca3a544cef03a3cf1a674b01d3
+types/evse_manager.yaml,50da7101c8f6aff7d39b8b2d8f6208d9ba2d0b1e0ad8f4baf0405f8babf641bd
 types/evse_security.yaml,a80c92d4663bda33412bd32788ba446bc0eafeebcddad706db38e1f988bd133b
 types/iso15118.yaml,74258b4fbf09357159fe4a5afc8364bbb9bbf9a9ed9a36e2f28c6cf7ce011fe3
 types/isolation_monitor.yaml,45d98b5072fa5d02a476860fe7d45a7b02f8a05eb6be94327f32dbe159d4ec40