From 962ea920bcc997dd4923644e68e40e1637f0c80c Mon Sep 17 00:00:00 2001 From: kianwasabi Date: Fri, 17 Nov 2023 20:59:10 +0000 Subject: [PATCH] #34 prep: for test on target device --- can_speedsensor/CMakeLists.txt | 59 +++++++++++++++++++ can_speedsensor/can_receiver/CMakeLists.txt | 41 ------------- .../fidl/Can_Receiver.fdepl | 0 .../{can_receiver => }/fidl/Can_Receiver.fidl | 0 can_speedsensor/scripts/Build.sh | 14 +++++ .../v1/Can_Receiver/Speed_Sensor.hpp | 0 .../v1/Can_Receiver/Speed_SensorProxy.hpp | 0 .../v1/Can_Receiver/Speed_SensorProxyBase.hpp | 0 .../Speed_SensorSomeIPDeployment.cpp | 0 .../Speed_SensorSomeIPDeployment.hpp | 0 .../Can_Receiver/Speed_SensorSomeIPProxy.cpp | 0 .../Can_Receiver/Speed_SensorSomeIPProxy.hpp | 0 .../Speed_SensorSomeIPStubAdapter.cpp | 0 .../Speed_SensorSomeIPStubAdapter.hpp | 0 .../v1/Can_Receiver/Speed_SensorStub.hpp | 0 .../Can_Receiver/Speed_SensorStubDefault.hpp | 0 .../src/Can_Data_Register.cpp | 0 .../src/Can_Data_Register.hpp | 0 .../src/Can_Moving_Average_Filter.cpp | 0 .../src/Can_Moving_Average_Filter.hpp | 0 .../{can_receiver => }/src/Can_Receiver.cpp | 0 .../{can_receiver => }/src/Can_Receiver.hpp | 0 .../{can_receiver => }/src/Can_main.cpp | 0 .../src/Speed_SensorStubImpl.cpp | 0 .../src/Speed_SensorStubImpl.hpp | 0 25 files changed, 73 insertions(+), 41 deletions(-) create mode 100644 can_speedsensor/CMakeLists.txt delete mode 100644 can_speedsensor/can_receiver/CMakeLists.txt rename can_speedsensor/{can_receiver => }/fidl/Can_Receiver.fdepl (100%) rename can_speedsensor/{can_receiver => }/fidl/Can_Receiver.fidl (100%) create mode 100755 can_speedsensor/scripts/Build.sh rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_Sensor.hpp (100%) rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_SensorProxy.hpp (100%) rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_SensorProxyBase.hpp (100%) rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.cpp (100%) rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.hpp (100%) rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPProxy.cpp (100%) rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPProxy.hpp (100%) rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.cpp (100%) rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.hpp (100%) rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_SensorStub.hpp (100%) rename can_speedsensor/{can_receiver => }/src-gen-can/v1/Can_Receiver/Speed_SensorStubDefault.hpp (100%) rename can_speedsensor/{can_receiver => }/src/Can_Data_Register.cpp (100%) rename can_speedsensor/{can_receiver => }/src/Can_Data_Register.hpp (100%) rename can_speedsensor/{can_receiver => }/src/Can_Moving_Average_Filter.cpp (100%) rename can_speedsensor/{can_receiver => }/src/Can_Moving_Average_Filter.hpp (100%) rename can_speedsensor/{can_receiver => }/src/Can_Receiver.cpp (100%) rename can_speedsensor/{can_receiver => }/src/Can_Receiver.hpp (100%) rename can_speedsensor/{can_receiver => }/src/Can_main.cpp (100%) rename can_speedsensor/{can_receiver => }/src/Speed_SensorStubImpl.cpp (100%) rename can_speedsensor/{can_receiver => }/src/Speed_SensorStubImpl.hpp (100%) diff --git a/can_speedsensor/CMakeLists.txt b/can_speedsensor/CMakeLists.txt new file mode 100644 index 0000000..3ba11b3 --- /dev/null +++ b/can_speedsensor/CMakeLists.txt @@ -0,0 +1,59 @@ +### SETUP ### +cmake_minimum_required(VERSION 3.15) +project(Can_Receiver_IC VERSION 0.1 LANGUAGES CXX) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-pthread -std=c++11 -fsanitize=thread -g ") +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +### PACKAGES ### +find_package(CommonAPI REQUIRED) +find_package(CommonAPI-SomeIP REQUIRED) + +#### VARIABLES #### +set(Can_Receiver_SOURCES + src/Can_main.cpp + src/Speed_SensorStubImpl.cpp + src/Can_Data_Register.cpp + src/Can_Moving_Average_Filter.cpp + src/Can_Receiver.cpp + src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.cpp + src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.cpp +) +set(PRJ_SRC_VAR src) +set(PRJ_SRC_GEN_VAR src-gen-can) +set(PRJ_SRC_GEN_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${PRJ_SRC_GEN_VAR}) +set(GEN_SRC_DIR ${PRJ_SRC_GEN_PATH}) +set(CORE_RUNTIME_DIR ~/capicxx-core-runtime) +set(SOMEIP_RUNTIME_DIR ~/capicxx-someip-runtime) +set(VSOMEIP_DIR ~/vsomeip) +set(COMMONAPI_INTERFACE_VER v1/commonapi) + +### DIRECTORIES ### +include_directories( + ./include + ${Python3_INCLUDE_DIRS} + ${GEN_SRC_DIR} + ${SOMEIP_RUNTIME_DIR}/include + ${CORE_RUNTIME_DIR}/include + ${VSOMEIP_DIR}/include +) + +link_directories( + ${SOMEIP_RUNTIME_DIR}/build + ${CORE_RUNTIME_DIR}/build + ${VSOMEIP_DIR}/build +) +#### BUILD #### +# Service +add_executable(Can_Receiver + ${Can_Receiver_SOURCES} +) +#add_library(Can_Receiver_Lib SHARED ${Can_Receiver_SOURCES}) +#target_link_libraries(Can_Receiver PRIVATE stdc++ CommonAPI CommonAPI-SomeIP vsomeip3) +target_link_libraries(Can_Receiver + CommonAPI + CommonAPI-SomeIP + vsomeip3 +) diff --git a/can_speedsensor/can_receiver/CMakeLists.txt b/can_speedsensor/can_receiver/CMakeLists.txt deleted file mode 100644 index 4ad08b6..0000000 --- a/can_speedsensor/can_receiver/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -cmake_minimum_required(VERSION 3.15) - -project(Can_Receiver_IC VERSION 0.1 LANGUAGES CXX) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++0x") -#Debuger - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-commonapi/capicxx-core-runtime/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-commonapi/capicxx-someip-runtime/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-commonapi/vsomeip/interface - ${CMAKE_CURRENT_SOURCE_DIR}/src-gen-can - -) - -link_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-commonapi/capicxx-core-runtime/build - ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-commonapi/capicxx-someip-runtime/build - ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-commonapi/vsomeip/build -) - -# For Can_Receiver -set(Can_Receiver_SOURCES - src/Can_main.cpp - src/Speed_SensorStubImpl.cpp - src/Can_Data_Register.cpp - src/Can_Moving_Average_Filter.cpp - src/Can_Receiver.cpp - - src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.cpp - src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.cpp - ) -add_executable(Can_Receiver ${Can_Receiver_SOURCES}) -add_library(Can_Receiver_Lib SHARED ${Can_Receiver_SOURCES}) -target_link_libraries(Can_Receiver PRIVATE stdc++ CommonAPI CommonAPI-SomeIP vsomeip3) diff --git a/can_speedsensor/can_receiver/fidl/Can_Receiver.fdepl b/can_speedsensor/fidl/Can_Receiver.fdepl similarity index 100% rename from can_speedsensor/can_receiver/fidl/Can_Receiver.fdepl rename to can_speedsensor/fidl/Can_Receiver.fdepl diff --git a/can_speedsensor/can_receiver/fidl/Can_Receiver.fidl b/can_speedsensor/fidl/Can_Receiver.fidl similarity index 100% rename from can_speedsensor/can_receiver/fidl/Can_Receiver.fidl rename to can_speedsensor/fidl/Can_Receiver.fidl diff --git a/can_speedsensor/scripts/Build.sh b/can_speedsensor/scripts/Build.sh new file mode 100755 index 0000000..b4f5fa4 --- /dev/null +++ b/can_speedsensor/scripts/Build.sh @@ -0,0 +1,14 @@ +################## build ################## +cd .. +#delete "build" folder if it exists +if [ -d "build" ]; then + rm -rf build +fi +mkdir build +cd build +# set CommonAPI configuration file +touch commonapi.ini +echo -e "[default]\nbinding=someip\n\n[logging]\nconsole=true\nfile=./mylog.log\ndlt=true\nlevel=verbose" > commonapi.ini +cmake -DUSE_INSTALLED_COMMONAPI=ON .. +make -j $(nproc) +#sudo make install \ No newline at end of file diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_Sensor.hpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_Sensor.hpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_Sensor.hpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_Sensor.hpp diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorProxy.hpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorProxy.hpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorProxy.hpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorProxy.hpp diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorProxyBase.hpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorProxyBase.hpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorProxyBase.hpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorProxyBase.hpp diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.cpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.cpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.cpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.cpp diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.hpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.hpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.hpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPDeployment.hpp diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPProxy.cpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPProxy.cpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPProxy.cpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPProxy.cpp diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPProxy.hpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPProxy.hpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPProxy.hpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPProxy.hpp diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.cpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.cpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.cpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.cpp diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.hpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.hpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.hpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorSomeIPStubAdapter.hpp diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorStub.hpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorStub.hpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorStub.hpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorStub.hpp diff --git a/can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorStubDefault.hpp b/can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorStubDefault.hpp similarity index 100% rename from can_speedsensor/can_receiver/src-gen-can/v1/Can_Receiver/Speed_SensorStubDefault.hpp rename to can_speedsensor/src-gen-can/v1/Can_Receiver/Speed_SensorStubDefault.hpp diff --git a/can_speedsensor/can_receiver/src/Can_Data_Register.cpp b/can_speedsensor/src/Can_Data_Register.cpp similarity index 100% rename from can_speedsensor/can_receiver/src/Can_Data_Register.cpp rename to can_speedsensor/src/Can_Data_Register.cpp diff --git a/can_speedsensor/can_receiver/src/Can_Data_Register.hpp b/can_speedsensor/src/Can_Data_Register.hpp similarity index 100% rename from can_speedsensor/can_receiver/src/Can_Data_Register.hpp rename to can_speedsensor/src/Can_Data_Register.hpp diff --git a/can_speedsensor/can_receiver/src/Can_Moving_Average_Filter.cpp b/can_speedsensor/src/Can_Moving_Average_Filter.cpp similarity index 100% rename from can_speedsensor/can_receiver/src/Can_Moving_Average_Filter.cpp rename to can_speedsensor/src/Can_Moving_Average_Filter.cpp diff --git a/can_speedsensor/can_receiver/src/Can_Moving_Average_Filter.hpp b/can_speedsensor/src/Can_Moving_Average_Filter.hpp similarity index 100% rename from can_speedsensor/can_receiver/src/Can_Moving_Average_Filter.hpp rename to can_speedsensor/src/Can_Moving_Average_Filter.hpp diff --git a/can_speedsensor/can_receiver/src/Can_Receiver.cpp b/can_speedsensor/src/Can_Receiver.cpp similarity index 100% rename from can_speedsensor/can_receiver/src/Can_Receiver.cpp rename to can_speedsensor/src/Can_Receiver.cpp diff --git a/can_speedsensor/can_receiver/src/Can_Receiver.hpp b/can_speedsensor/src/Can_Receiver.hpp similarity index 100% rename from can_speedsensor/can_receiver/src/Can_Receiver.hpp rename to can_speedsensor/src/Can_Receiver.hpp diff --git a/can_speedsensor/can_receiver/src/Can_main.cpp b/can_speedsensor/src/Can_main.cpp similarity index 100% rename from can_speedsensor/can_receiver/src/Can_main.cpp rename to can_speedsensor/src/Can_main.cpp diff --git a/can_speedsensor/can_receiver/src/Speed_SensorStubImpl.cpp b/can_speedsensor/src/Speed_SensorStubImpl.cpp similarity index 100% rename from can_speedsensor/can_receiver/src/Speed_SensorStubImpl.cpp rename to can_speedsensor/src/Speed_SensorStubImpl.cpp diff --git a/can_speedsensor/can_receiver/src/Speed_SensorStubImpl.hpp b/can_speedsensor/src/Speed_SensorStubImpl.hpp similarity index 100% rename from can_speedsensor/can_receiver/src/Speed_SensorStubImpl.hpp rename to can_speedsensor/src/Speed_SensorStubImpl.hpp