Update SLAC state handling.

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>

Author: ThatsLucas

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

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

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

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;

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);
     });

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 {

modules/EVSE/EvseSlac/main/slacImpl.cpp

@@ -65,7 +65,7 @@ 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) { publish_state(types::slac::string_to_state(value)); };
 
     callbacks.signal_error_routine_request = [this]() { publish_request_error_routine(nullptr); };
 

modules/Simulation/SlacSimulator/evse/slacImpl.cpp

@@ -12,7 +12,7 @@ void slacImpl::init() {
 }
 
 void slacImpl::ready() {
-    publish_state(state_to_string(state));
+    publish_state(types::slac::string_to_state(state_to_string(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(types::slac::string_to_state(state_to_string(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(types::slac::string_to_state(state_to_string(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(types::slac::string_to_state(state_to_string(state)));
     publish_dlink_ready(true);
 };
 } // namespace evse

types/slac.yaml

@@ -0,0 +1,9 @@
+description: SLAC shared types
+types:
+  State:
+    description: SLAC state enum
+    type: string
+    enum:
+      - UNMATCHED
+      - MATCHING
+      - MATCHED