diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000000000000000000000000000000..06be6b348ac80213af1fa4ff98f7c300109bb7ff --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "3rdparty/china_camera"] + path = 3rdparty/china_camera + url = https://corp.riftek.com/gitlab/a.dmitruk/china_camera +[submodule "3rdparty/motors_ethercat"] + path = 3rdparty/motors_ethercat + url = https://corp.riftek.com/gitlab/a.dmitruk/motors_ethercat.git diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..f81945f7443ecc57fca6596d46c699ae16f0b41e --- /dev/null +++ b/3rdparty/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.8) + +project(third_party) + +#set(nanotecC5E ON CACHE BOOL "" FORCE) + +add_subdirectory(china_camera) +add_subdirectory(motors_ethercat) diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..b1d35a0a08001be78e70ed0c2a5900be538bf0d0 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,18 @@ +cmake_minimum_required(VERSION 3.13) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_CXX_STANDARD_REQUIRED ON) #console + +############################################################################### +## PROJECT +## name and version +############################################################################### +project(rflogger_bug LANGUAGES CXX) +set(CMAKE_CXX_STANDARD 17) + + +#3rdparty +add_subdirectory(3rdparty) +#src +add_subdirectory(src) + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..6673d35d7988266e9e53623e9e680b8842fbaa84 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,39 @@ +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + + + + + +set(PROJECT "rflogger_bug") + +project(${PROJECT}) + +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++11 -fstrict-aliasing -pedantic-errors -pedantic -Wno-deprecated-declarations -Wno-unused-variable") + +if(NOT DEFINED HEADERS) + file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) +endif() + +if(NOT DEFINED SOURCES) + file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) +endif() + +source_group("Header Files" FILES ${HEADERS}) +source_group("Source Files" FILES ${SOURCES}) + + +add_executable(${PROJECT} ${HEADERS} ${SOURCES} ${QT_RESOURCES}) + + + +target_link_libraries(${PROJECT} + motors_ethercat + china_camera + ) + diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000000000000000000000000000000000000..d37b8b0837abbea7d040f53b8e68ad0cde76e148 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,15 @@ +#include "RfConfigForSpd.h" +#include "china_camera.h" +#include "motors_ethercat.h" + +int main(int argc, char* argv[]) +{ + + RfConfigForSpd::Multythread::InConsole(); + //RfConfigForSpd::Multythread::InConsoleAndFile(); + + ChinaCamera cam; + MotorsEthercat motors; + + return app.exec(); +} \ No newline at end of file