Update SLAC state handling.

ThatsLucas · ThatsLucas · commit 830958f6514f · 2026-03-02T11:17:07.000+01:00
Added types/slac.yaml to fix #1323 - The SLAC interface uses the unsupported inline enum declaration Updated everything to work with the new types. Signed-off-by: ThatsLucas <lucasmailpro9@gmail.com>
diff --git a/interfaces/ev_slac.yaml b/interfaces/ev_slac.yaml
@@ -13,10 +13,7 @@ vars:
   state:
     description: Provides the state enum.
     type: string
-    enum:
-      - UNMATCHED
-      - MATCHING
-      - MATCHED
+    $ref: /slac#/State
   dlink_ready:
     description: >-
       Inform higher layers about a change in data link status. Emits true
diff --git a/interfaces/slac.yaml b/interfaces/slac.yaml
@@ -20,10 +20,7 @@ vars:
   state:
     description: Provides the state enum.
     type: string
-    enum:
-      - UNMATCHED
-      - MATCHING
-      - MATCHED
+    $ref: /slac#/State
   dlink_ready:
     description: >-
       Inform higher layers about a change in data link status. Emits true
diff --git a/lib/everest/everest_api_types/tests/expected_interfaces_file_hashes.csv b/lib/everest/everest_api_types/tests/expected_interfaces_file_hashes.csv
@@ -15,6 +15,6 @@ interfaces/over_voltage_monitor.yaml,e900756a2058fca6c24434ac153c34afdf109ad582c
 interfaces/power_supply_DC.yaml,7cc64002367143c4898589610739acd80063962e97a1456f66897b0856f916b3
 interfaces/powermeter.yaml,e976a19789e0e9dee51a4682821399b8e5e546e0f8770571044e8757bd5f6eb9
 interfaces/session_cost.yaml,4afd6dd67938dbc50e3d92751b27313cdcc083fb016998236d32f329df0ac806
-interfaces/slac.yaml,ab465ca66e2f4a4be70128228126f8a17338e9f127afaad87c638ddd1df8db44
+interfaces/slac.yaml,973bb6d035e7ada95a0a589e0c1453000d37f637cecac53af5c12afe73be05e7
 interfaces/system.yaml,4a5eb3f88d7934c3b7d0945aed369e4a6d95028a2c97d4e3090a0f73c1e0dcaf
 interfaces/uk_random_delay.yaml,1c2f75ba15d4d5f9a2b1eb4d48ef98a0ba1747deaf9341c8ca610f6fda7c99c1
diff --git a/lib/everest/everest_api_types/tests/expected_types_file_hashes.csv b/lib/everest/everest_api_types/tests/expected_types_file_hashes.csv
@@ -16,6 +16,7 @@ types/money.yaml,4a7001c50216fcf96caac4fe16db17e23ce5149d000be1de4ac1f0135f5bdb0
 types/ocpp.yaml,2181f239b0366de85189dbe6cc210ad6b3ab7b6bdeb9ea8aad20fe4410b93bd7
 types/power_supply_DC.yaml,eaf73bbd55ca202d8a7723f3f80e3b194a9a698e02aa280e17c87ed4ab3fc772
 types/powermeter.yaml,37cae475b16778b7eca641fcee4ecc6c71391d0072ff5c16e11a8a7d7ea9e632
+types/slac.yaml,67cef1d0e02e189b64b3e4afb6e5d8e0a152143a19266aefbc313c3f723da330
 types/session_cost.yaml,3abb02f95f2e99488f51eefa82a82aaf77d16269bd3cf58d7234ab21d494c3b9
 types/system.yaml,75240df8ffe248055e7cab6b5df97dc8d9b8805e557f95b65a200e385218c665
 types/temperature.yaml,4c0af04b3cece98f1309779c69dd61f3895c5cc7e0274a1c4d681155141d2cc4
diff --git a/modules/API/slac_API/slac_API.cpp b/modules/API/slac_API/slac_API.cpp
@@ -15,6 +15,23 @@ namespace API_types_ext = ev_API_types::slac;
 namespace API_generic = ev_API_types::generic;
 using ev_API::deserialize;
 
+namespace {
+
+types::slac::State to_internal_state(API_types_ext::State state) {
+    switch (state) {
+    case API_types_ext::State::UNMATCHED:
+        return types::slac::State::UNMATCHED;
+    case API_types_ext::State::MATCHING:
+        return types::slac::State::MATCHING;
+    case API_types_ext::State::MATCHED:
+        return types::slac::State::MATCHED;
+    }
+
+    throw std::out_of_range("Unknown API slac::State value");
+}
+
+} // namespace
+
 void slac_API::init() {
     invoke_init(*p_main);
 
@@ -60,7 +77,7 @@ void slac_API::generate_api_var_state() {
     subscribe_api_topic("state", [=](const std::string& data) {
         API_types_ext::State val;
         if (deserialize(data, val)) {
-            p_main->publish_state(serialize(val));
+            p_main->publish_state(to_internal_state(val));
             return true;
         }
         return false;
diff --git a/modules/BringUp/BUSlac/BUSlac.cpp b/modules/BringUp/BUSlac/BUSlac.cpp
@@ -17,10 +17,10 @@ void BUSlac::init() {
 void BUSlac::ready() {
     auto screen = ScreenInteractive::Fullscreen();
 
-    r_slac->subscribe_state([this, &screen](const std::string& new_state) {
+    r_slac->subscribe_state([this, &screen](const types::slac::State new_state) {
         {
             std::scoped_lock lock(data_mutex);
-            state = new_state;
+            state = types::slac::state_to_string(new_state);
         }
         screen.PostEvent(Event::Custom);
     });
diff --git a/modules/EV/EvManager/main/car_simulation.cpp b/modules/EV/EvManager/main/car_simulation.cpp
@@ -22,7 +22,7 @@ void CarSimulation::state_machine() {
             r_ev_board_support->call_allow_power_on(false);
             // Wait for physical plugin (ev BSP sees state A on CP and not Disconnected)
 
-            sim_data.slac_state = "UNMATCHED";
+            sim_data.slac_state = types::slac::State::UNMATCHED;
             if (!r_ev.empty()) {
                 r_ev[0]->call_stop_charging();
             }
@@ -245,16 +245,16 @@ bool CarSimulation::rcd_current(const CmdArguments& arguments) {
 bool CarSimulation::iso_wait_slac_matched(const CmdArguments& arguments) {
     sim_data.state = SimState::PLUGGED_IN;
 
-    if (sim_data.slac_state == "UNMATCHED") {
+    if (sim_data.slac_state == types::slac::State::UNMATCHED) {
         EVLOG_debug << "Slac UNMATCHED";
         if (!r_slac.empty()) {
             EVLOG_debug << "Slac trigger matching";
             r_slac[0]->call_reset();
             r_slac[0]->call_trigger_matching();
-            sim_data.slac_state = "TRIGGERED";
+            sim_data.slac_state = types::slac::State::MATCHING;
         }
     }
-    if (sim_data.slac_state == "MATCHED") {
+    if (sim_data.slac_state == types::slac::State::MATCHED) {
         EVLOG_debug << "Slac Matched";
         return true;
     }
diff --git a/modules/EV/EvManager/main/car_simulation.hpp b/modules/EV/EvManager/main/car_simulation.hpp
@@ -74,8 +74,16 @@ class CarSimulation {
         sim_data.pwm_duty_cycle = pwm_duty_cycle;
     }
 
-    void set_slac_state(std::string slac_state) {
-        sim_data.slac_state = std::move(slac_state);
+    void set_slac_state(const std::string& slac_state) {
+        try {
+            sim_data.slac_state = types::slac::string_to_state(slac_state);
+        } catch (const std::exception& e) {
+            EVLOG_error << fmt::format("Tried to set unknown SLAC state '{}'. Error: {}", slac_state, e.what());
+        }
+    }
+
+    void set_slac_state(types::slac::State slac_state) {
+        sim_data.slac_state = slac_state;
     }
 
     void set_iso_pwr_ready(bool iso_pwr_ready) {
diff --git a/modules/EV/EvManager/main/car_simulatorImpl.cpp b/modules/EV/EvManager/main/car_simulatorImpl.cpp
@@ -344,7 +344,8 @@ void car_simulatorImpl::subscribe_to_variables_on_init() {
     // subscribe slac_state
     if (!mod->r_slac.empty()) {
         const auto& slac = mod->r_slac.at(0);
-        slac->subscribe_state([this](const auto& state) { car_simulation->set_slac_state(state); });
+        slac->subscribe_state(
+            [this](const auto& state) { car_simulation->set_slac_state(types::slac::state_to_string(state)); });
     }
 
     // subscribe ev events
diff --git a/modules/EV/EvManager/main/simulation_data.hpp b/modules/EV/EvManager/main/simulation_data.hpp
@@ -6,6 +6,7 @@
 #include "command_registry.hpp"
 #include "simulation_command.hpp"
 #include <generated/types/board_support_common.hpp>
+#include <generated/types/slac.hpp>
 #include <optional>
 #include <queue>
 #include <string>
@@ -36,7 +37,7 @@ struct SimulationData {
 
     SimState state{SimState::UNPLUGGED};
     SimState last_state{SimState::UNDEFINED};
-    std::string slac_state{"UNMATCHED"};
+    types::slac::State slac_state{types::slac::State::UNMATCHED};
     std::optional<size_t> sleep_ticks_left{};
 
     bool v2g_finished{false};
diff --git a/modules/EV/EvSlac/main/ev_slacImpl.cpp b/modules/EV/EvSlac/main/ev_slacImpl.cpp
@@ -50,7 +50,12 @@ void ev_slacImpl::run() {
         } else if (value == "UNMATCHED") {
             publish_dlink_ready(false);
         }
-        publish_state(value);
+        try {
+            publish_state(types::slac::string_to_state(value));
+        } catch (const std::exception& e) {
+            EVLOG_error << fmt::format("Tried to publish unknown SLAC state '{}'. Error: {}", value, e.what());
+            publish_dlink_ready(false);
+        }
     };
 
     callbacks.log_debug = [](const std::string& text) { EVLOG_debug << "EvSlac: " << text; };
diff --git a/modules/EVSE/EvseManager/EvseManager.cpp b/modules/EVSE/EvseManager/EvseManager.cpp
@@ -1266,10 +1266,10 @@ void EvseManager::ready() {
     }
 
     if (slac_enabled) {
-        r_slac[0]->subscribe_state([this](const std::string& s) {
-            session_log.evse(true, fmt::format("SLAC {}", s));
+        r_slac[0]->subscribe_state([this](const types::slac::State s) {
+            session_log.evse(true, fmt::format("SLAC {}", types::slac::state_to_string(s)));
             // Notify charger whether matching was started (or is done) or not
-            if (s == "UNMATCHED") {
+            if (s == types::slac::State::UNMATCHED) {
                 charger->set_matching_started(false);
                 slac_unmatched = true;
             } else {
diff --git a/modules/EVSE/EvseSlac/main/slacImpl.cpp b/modules/EVSE/EvseSlac/main/slacImpl.cpp
@@ -65,7 +65,13 @@ void slacImpl::run() {
 
     callbacks.signal_dlink_ready = [this](bool value) { publish_dlink_ready(value); };
 
-    callbacks.signal_state = [this](const std::string& value) { publish_state(value); };
+    callbacks.signal_state = [this](const std::string& value) {
+        try {
+            publish_state(types::slac::string_to_state(value));
+        } catch (const std::exception& e) {
+            EVLOG_error << fmt::format("Tried to publish unknown SLAC state '{}'. Error: {}", value, e.what());
+        }
+    };
 
     callbacks.signal_error_routine_request = [this]() { publish_request_error_routine(nullptr); };
 
diff --git a/modules/Simulation/SlacSimulator/CMakeLists.txt b/modules/Simulation/SlacSimulator/CMakeLists.txt
@@ -24,8 +24,5 @@ target_sources(${MODULE_NAME}
 
 # ev@c55432ab-152c-45a9-9d2e-7281d50c69c3:v1
 # insert other things like install cmds etc here
-target_sources(${MODULE_NAME}
-        PRIVATE
-        "util/state.cpp"
-)
+
 # ev@c55432ab-152c-45a9-9d2e-7281d50c69c3:v1
diff --git a/modules/Simulation/SlacSimulator/SlacSimulator.cpp b/modules/Simulation/SlacSimulator/SlacSimulator.cpp
@@ -6,7 +6,7 @@
 
 namespace module {
 
-using util::State;
+using State = types::slac::State;
 
 void SlacSimulator::init() {
     invoke_init(*p_evse);
diff --git a/modules/Simulation/SlacSimulator/SlacSimulator.hpp b/modules/Simulation/SlacSimulator/SlacSimulator.hpp
@@ -16,7 +16,7 @@
 
 // ev@4bf81b14-a215-475c-a1d3-0a484ae48918:v1
 // insert your custom include headers here
-#include "util/state.hpp"
+
 // ev@4bf81b14-a215-475c-a1d3-0a484ae48918:v1
 
 namespace module {
diff --git a/modules/Simulation/SlacSimulator/ev/ev_slacImpl.cpp b/modules/Simulation/SlacSimulator/ev/ev_slacImpl.cpp
@@ -6,27 +6,27 @@
 namespace module {
 namespace ev {
 
-using util::State;
+using types::slac::State;
 
 void ev_slacImpl::init() {
 }
 
 void ev_slacImpl::ready() {
-    publish_state(state_to_string(state));
+    publish_state(state);
 }
 
 void ev_slacImpl::handle_reset() {
     if (state != State::UNMATCHED) {
         state = State::UNMATCHED;
-        publish_state(state_to_string(state));
+        publish_state(state);
         publish_dlink_ready(false);
     }
 }
 
 bool ev_slacImpl::handle_trigger_matching() {
     state = State::MATCHING;
     mod->cntmatching = 0;
-    publish_state(state_to_string(state));
+    publish_state(state);
     return true;
 }
 
@@ -36,7 +36,7 @@ State ev_slacImpl::get_state() const {
 
 void ev_slacImpl::set_state_matched() {
     state = State::MATCHED;
-    publish_state(state_to_string(state));
+    publish_state(state);
     publish_dlink_ready(true);
 }
 
diff --git a/modules/Simulation/SlacSimulator/ev/ev_slacImpl.hpp b/modules/Simulation/SlacSimulator/ev/ev_slacImpl.hpp
@@ -14,7 +14,7 @@
 
 // ev@75ac1216-19eb-4182-a85c-820f1fc2c091:v1
 // insert your custom include headers here
-#include "../util/state.hpp"
+
 // ev@75ac1216-19eb-4182-a85c-820f1fc2c091:v1
 
 namespace module {
@@ -30,7 +30,7 @@ class ev_slacImpl : public ev_slacImplBase {
 
     // ev@8ea32d28-373f-4c90-ae5e-b4fcc74e2a61:v1
     // insert your public definitions here
-    util::State get_state() const;
+    types::slac::State get_state() const;
     void set_state_matched();
     // ev@8ea32d28-373f-4c90-ae5e-b4fcc74e2a61:v1
 
@@ -52,7 +52,7 @@ class ev_slacImpl : public ev_slacImplBase {
 
     // ev@3370e4dd-95f4-47a9-aaec-ea76f34a66c9:v1
     // insert your private definitions here
-    util::State state{util::State::UNMATCHED};
+    types::slac::State state{types::slac::State::UNMATCHED};
     // ev@3370e4dd-95f4-47a9-aaec-ea76f34a66c9:v1
 };
 
diff --git a/modules/Simulation/SlacSimulator/evse/slacImpl.cpp b/modules/Simulation/SlacSimulator/evse/slacImpl.cpp
@@ -6,13 +6,13 @@
 namespace module {
 namespace evse {
 
-using util::State;
+using types::slac::State;
 
 void slacImpl::init() {
 }
 
 void slacImpl::ready() {
-    publish_state(state_to_string(state));
+    publish_state(state);
 }
 
 void slacImpl::handle_reset(bool& enable) {
@@ -42,15 +42,15 @@ void slacImpl::handle_dlink_pause() {
 void slacImpl::set_state_to_unmatched() {
     if (state != State::UNMATCHED) {
         state = State::UNMATCHED;
-        publish_state(state_to_string(state));
+        publish_state(state);
         publish_dlink_ready(false);
     }
 }
 
 void slacImpl::set_state_to_matching() {
     state = State::MATCHING;
     mod->cntmatching = 0;
-    publish_state(state_to_string(state));
+    publish_state(state);
 }
 
 State slacImpl::get_state() const {
@@ -59,7 +59,7 @@ State slacImpl::get_state() const {
 
 void slacImpl::set_state_matched() {
     state = State::MATCHED;
-    publish_state(state_to_string(state));
+    publish_state(state);
     publish_dlink_ready(true);
 };
 } // namespace evse
diff --git a/modules/Simulation/SlacSimulator/evse/slacImpl.hpp b/modules/Simulation/SlacSimulator/evse/slacImpl.hpp
@@ -14,7 +14,7 @@
 
 // ev@75ac1216-19eb-4182-a85c-820f1fc2c091:v1
 // insert your custom include headers here
-#include "../util/state.hpp"
+
 // ev@75ac1216-19eb-4182-a85c-820f1fc2c091:v1
 
 namespace module {
@@ -30,7 +30,7 @@ class slacImpl : public slacImplBase {
 
     // ev@8ea32d28-373f-4c90-ae5e-b4fcc74e2a61:v1
     // insert your public definitions here
-    util::State get_state() const;
+    types::slac::State get_state() const;
     void set_state_matched();
     // ev@8ea32d28-373f-4c90-ae5e-b4fcc74e2a61:v1
 
@@ -59,7 +59,7 @@ class slacImpl : public slacImplBase {
     void set_state_to_unmatched();
     void set_state_to_matching();
 
-    util::State state{util::State::UNMATCHED};
+    types::slac::State state{types::slac::State::UNMATCHED};
     // ev@3370e4dd-95f4-47a9-aaec-ea76f34a66c9:v1
 };
 
diff --git a/modules/Simulation/SlacSimulator/util/state.cpp b/modules/Simulation/SlacSimulator/util/state.cpp
diff --git a/modules/Simulation/SlacSimulator/util/state.hpp b/modules/Simulation/SlacSimulator/util/state.hpp
diff --git a/types/slac.yaml b/types/slac.yaml

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ void BUSlac::init() {`
`17`	`17`	`void BUSlac::ready() {`
`18`	`18`	`auto screen = ScreenInteractive::Fullscreen();`
`19`	`19`
`20`		`- r_slac->subscribe_state([this, &screen](const std::string& new_state) {`
	`20`	`+ r_slac->subscribe_state([this, &screen](const types::slac::State new_state) {`
`21`	`21`	`{`
`22`	`22`	`std::scoped_lock lock(data_mutex);`
`23`		`- state = new_state;`
	`23`	`+ state = types::slac::state_to_string(new_state);`
`24`	`24`	`}`
`25`	`25`	`screen.PostEvent(Event::Custom);`
`26`	`26`	`});`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,8 @@ void car_simulatorImpl::subscribe_to_variables_on_init() {`
`344`	`344`	`// subscribe slac_state`
`345`	`345`	`if (!mod->r_slac.empty()) {`
`346`	`346`	`const auto& slac = mod->r_slac.at(0);`
`347`		`- slac->subscribe_state([this](const auto& state) { car_simulation->set_slac_state(state); });`
	`347`	`+ slac->subscribe_state(`
	`348`	`+ [this](const auto& state) { car_simulation->set_slac_state(types::slac::state_to_string(state)); });`
`348`	`349`	`}`
`349`	`350`
`350`	`351`	`// subscribe ev events`