diff --git a/src/opc_server.cpp b/src/opc_server.cpp index 3aab851655eeee491da7ee4a80f7aef9de3007cf..a1e68f123e9b4bcced6af0b7367633aea8f5dc91 100644 --- a/src/opc_server.cpp +++ b/src/opc_server.cpp @@ -7,13 +7,13 @@ using namespace OpcUa; UaServer server; - +Node renewable; std::vector<OpcUa::Variant> my_method(NodeId context, std::vector<OpcUa::Variant> arguments) { std::cout << "Method triggered" << std::endl; - Node vat = server.GetNode("renewable_power"); - std::cout << vat.ToString() << std::endl; + std::cout << renewable.GetValue().ToString() << std::endl; + std::vector<OpcUa::Variant> result; result.push_back(Variant(static_cast<uint8_t>(0))); return result; @@ -22,7 +22,7 @@ std::vector<OpcUa::Variant> my_method(NodeId context, std::vector<OpcUa::Variant void add_nodes_to(uint32_t idx, Node &objects) { Node smart_grid = objects.AddFolder(idx, "smart_grid"); - Node renewable = smart_grid.AddVariable(idx, "renewable_power", Variant(42.0)); + renewable = smart_grid.AddVariable(idx, "renewable_power", Variant(42.0)); Node prop = smart_grid.AddProperty(idx, "a_property_thin", Variant("something")); Node method = smart_grid.AddMethod(idx, "trigger_method_x", my_method); } diff --git a/src/smg_server.cpp b/src/smg_server.cpp index a85818fbd7665a1ab7cbadbf3b7c013f076c839f..69a96f53205eca13907275a232978cdc720ca662 100644 --- a/src/smg_server.cpp +++ b/src/smg_server.cpp @@ -51,38 +51,34 @@ void run_sim() bool active{true}; while (active) { - switch (main_state) - { - case MainState::Simulation: - switch (sim_state) - { - case SimState::Entry: - modell.put_modell_into_state(SmartGridModell::DefaultState::Off); - sim_state = SimState::Do; - break; - case SimState::Do: - auto exit_state = sim_state_do(modell, day); - if (exit_state == true) - { - sim_state = SimState::Exit; - } - break; - case SimState::Exit: - modell.put_modell_into_state(SmartGridModell::DefaultState::Off); - sim_state = SimState::Entry; - main_state = MainState::ManualControl; - break; - } - break; - - case MainState::ManualControl: - - break; - } - - - - + // switch (main_state) + // { + // case MainState::Simulation: + // switch (sim_state) + // { + // case SimState::Entry: + // modell.put_modell_into_state(SmartGridModell::DefaultState::Off); + // sim_state = SimState::Do; + // break; + // case SimState::Do: + // auto exit_state = sim_state_do(modell, day); + // if (exit_state == true) + // { + // sim_state = SimState::Exit; + // } + // break; + // case SimState::Exit: + // modell.put_modell_into_state(SmartGridModell::DefaultState::Off); + // sim_state = SimState::Entry; + // main_state = MainState::ManualControl; + // break; + // } + // break; + + // case MainState::ManualControl: + + // break; + // } } modell.put_modell_into_state(SmartGridModell::DefaultState::Off);