modules: EVSE/EvseManager: correctly set phases for PP ampacity selection if a A_63_3ph_70_1ph cable is plugged (EVerest#1791)

Signed-off-by: Jannis Albert <albertjannis@gmail.com>

Author: jalbert514

modules/EVSE/EvseManager/EvseManager.cpp

@@ -281,7 +281,22 @@ void EvseManager::init() {
 
         signalNrOfPhasesAvailable(ac_nr_phases_active);
 
-        bsp->set_three_phases(c.max_phase_count_import);
+        const auto get_max_phases = [](int max_phase_count) -> AcPhases {
+            switch (max_phase_count) {
+            case 1:
+                return AcPhases::SinglePhase;
+            case 2:
+                return AcPhases::TwoPhases;
+            case 3:
+                return AcPhases::ThreePhases;
+
+            default:
+                EVLOG_warning << "Invalid max_phase_count of " << max_phase_count << ". Falling back to single phase";
+            }
+            return AcPhases::SinglePhase;
+        };
+
+        bsp->set_max_phases(get_max_phases(c.max_phase_count_import));
         charger->set_connector_type(c.connector_type);
         p_evse->publish_hw_capabilities(c);
         if (config.charge_mode == "AC" and hlc_enabled) {

modules/EVSE/EvseManager/IECStateMachine.cpp

@@ -441,10 +441,10 @@ void IECStateMachine::set_pp_ampacity(types::board_support_common::ProximityPilo
         pp_ampacity = 32.;
         break;
     case types::board_support_common::Ampacity::A_63_3ph_70_1ph:
-        if (three_phases) {
-            pp_ampacity = 63.;
-        } else {
+        if (max_phases == AcPhases::SinglePhase) {
             pp_ampacity = 70.;
+        } else {
+            pp_ampacity = 63.;
         }
         break;
     default:

modules/EVSE/EvseManager/IECStateMachine.hpp

@@ -66,6 +66,13 @@ enum class RawCPState {
     F
 };
 
+// Number of active phases for AC charging
+enum class AcPhases {
+    SinglePhase,
+    TwoPhases,
+    ThreePhases
+};
+
 class IECStateMachine {
 public:
     // We need the r_bsp reference to be able to talk to the bsp driver module
@@ -87,8 +94,8 @@ class IECStateMachine {
     void set_cp_state_X1();
     void set_cp_state_F();
 
-    void set_three_phases(bool t) {
-        three_phases = t;
+    void set_max_phases(AcPhases phases) {
+        max_phases = phases;
     }
 
     void enable(bool en);
@@ -123,7 +130,7 @@ class IECStateMachine {
     bool last_power_on_allowed{false};
     std::atomic<double> pp_ampacity{0.0};
     std::atomic<double> last_amps{-1};
-    std::atomic_bool three_phases{true};
+    std::atomic<AcPhases> max_phases{AcPhases::ThreePhases};
 
     bool car_plugged_in{false};