diff --git a/CMakeLists.txt b/CMakeLists.txt index fcbfd11f48b1b221adc337603350ec6b8faf307a..83ae0cfedc8472e6ba0d011ff4dbb5f3ab61d78c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,30 +10,17 @@ include_directories(src) include_directories(libs/spdlog/include) include_directories(src/observ) -include_directories(src/com) -add_library(soc_com - src/com/Protocol.cpp - src/com/ProtocolSgm.cpp - src/com/Socket.cpp) - # Test application to manually send commands to the Arduino add_executable(manual_control src/manual_control/ComTest.cpp) target_link_libraries(manual_control spdlog) -add_executable(sample_client - src/manual_control/sample_client.cpp - src/com/Socket.cpp - src/com/Protocol.cpp -) -target_link_libraries(sample_client spdlog) - # Smart Grid Simulation include_directories(src/i2c) include_directories(src/smart_grid) # Add OPC UA -option(BUILD_OPC_UA "Build OPC UA library" OFF) +option(BUILD_OPC_UA "Build OPC UA library" ON) if(BUILD_OPC_UA) macro(SET_OPTION option value) set(${option} ${value} CACHE "" INTERNAL FORCE) @@ -49,23 +36,14 @@ if(BUILD_OPC_UA) add_subdirectory(libs/freeopcua) endif(BUILD_OPC_UA) -# add_executable(opc_server.exe src/apps/SmgOPC_server/opc_server.cpp) -# target_include_directories(opc_server.exe PUBLIC libs/freeopcua/include) -# target_link_libraries(opc_server.exe opcuacore opcuaserver) - - add_executable(smart_grid.exe src/apps/smart_grid/smg_server.cpp src/apps/smart_grid/SmgStateMachine.cpp src/apps/smart_grid/SmartOpcServer.cpp src/smart_grid/SmartGridModel.cpp src/i2c/Node.cpp - src/com/Socket.cpp - src/com/Protocol.cpp src/smart_grid/HardwareControl.cpp ) -# target_link_libraries(smart_grid.exe PRIVATE spdlog) -target_compile_options(smart_grid.exe PRIVATE -Wall -Wextra -pedantic) target_include_directories(smart_grid.exe PUBLIC libs/freeopcua/include) target_link_libraries(smart_grid.exe PUBLIC opcuacore opcuaserver) diff --git a/all_off.sh b/all_off.sh new file mode 100755 index 0000000000000000000000000000000000000000..cdf9b3b952ce306c426b3d5c87e822a04686ab70 --- /dev/null +++ b/all_off.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +echo "Turning everything off.." + +for i in {0..60} +do + ./manual_control $i 0 > /dev/null +done +echo "done!" diff --git a/install.sh b/install.sh new file mode 100755 index 0000000000000000000000000000000000000000..6de045456fd65bc97085a0e19200767dee7f21df --- /dev/null +++ b/install.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +echo "Installing Smart Grid OPC UA Server" +start_dir=$(pwd) + +if cd build +then + # Build dir already exists.. + cd .. +else + # Create build directory. + mkdir build +fi + +cd build +cmake .. +make -j2 + +# copy executable into build dir +cp libs/freeopcua/bin/smart_grid.exe ./ + +cd $start_dir \ No newline at end of file diff --git a/src/apps/smart_grid/smg_server.cpp b/src/apps/smart_grid/smg_server.cpp index b1fcb861dee564f1c9197ec4fcd62fd3160a286e..60749c5090d77089c7f2118f41e6af813f36b36a 100644 --- a/src/apps/smart_grid/smg_server.cpp +++ b/src/apps/smart_grid/smg_server.cpp @@ -6,9 +6,6 @@ #include "i2c/Node.hpp" #include "HardwareControl.hpp" -#include "Socket.hpp" -#include "Protocol.hpp" - #include "SmartGridModel.hpp" #include "SmgStateMachine.hpp" #include "SmartOpcServer.hpp" @@ -17,26 +14,18 @@ /// void log_args(int argc, char **argv) { - // spdlog::debug("User arguments:"); - // for (int i = 0; i < argc; ++i) - // { - // spdlog::debug("[{}] {}", i, argv[i]); - // } + } int main(int argc, char **argv) { - // spdlog::set_level(spdlog::level::info); - // spdlog::info("Starting - Smart Grid Modell"); - // log_args(argc, argv); - uint8_t slave_address{0x14}; i2c::Node i2c_channel{slave_address}; if (false == i2c_channel.open_device("/dev/i2c-1")) { exit(1); } - std::cout << "At least hardware works!" << std::endl; + std::cout << "Starting OPC server.." << std::endl; HardwareControl hardware{i2c_channel}; SmartGridModel model{hardware}; diff --git a/windmill_off.sh b/windmill_off.sh new file mode 100755 index 0000000000000000000000000000000000000000..063ea1d492a1d625c5fe4c0984037e715d83bbe4 --- /dev/null +++ b/windmill_off.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +echo "Turning Windmill off!" +./build/manual_control 2 0