From 297e681b754a33e71bfcdbfd0051f61fc5e3a94c Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Mon, 14 Jul 2025 11:37:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D1=82,=20=D0=B7?= =?UTF-8?q?=D0=BE=D0=BE=D0=BF=D0=B0=D1=80=D0=BA=20=D0=B2=D0=B5=D1=82=D0=BE?= =?UTF-8?q?=D0=BA=20control=5Fsystem=5Fclient!=20=D0=B7=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=D0=B5=D0=B1?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B4=D0=BE=D0=BB=D0=B6=D0=BD=D0=B0=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B1=D0=B8=D1=80=D0=B0=D1=82=D1=8C=D1=81=D1=8F=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=B2=D1=81=D0=B5=D1=85=20=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D0=B5=D0=BC=D0=BE=D0=B2=20=D0=B8=D0=B7=20=D0=BE=D0=B4=D0=BD?= =?UTF-8?q?=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=82=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 6 ++++++ CMakeLists.txt | 4 +++- dependencies/control_system_client | 2 +- dependencies/control_system_client_shps | 1 + dependencies/control_system_client_tdma | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) create mode 160000 dependencies/control_system_client_shps create mode 160000 dependencies/control_system_client_tdma diff --git a/.gitmodules b/.gitmodules index a686833..c91772d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "dependencies/control_system_client"] path = dependencies/control_system_client url = http://gitlab.devrss.vg/mf-tdma/protocol_processing/control_system_client.git +[submodule "dependencies/control_system_client_tdma"] + path = dependencies/control_system_client_tdma + url = http://gitlab.devrss.vg/mf-tdma/protocol_processing/control_system_client.git +[submodule "dependencies/control_system_client_shps"] + path = dependencies/control_system_client_shps + url = http://gitlab.devrss.vg/mf-tdma/protocol_processing/control_system_client.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 0552205..a7c928b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,12 +18,15 @@ endif() if("${MODEM_TYPE}" STREQUAL "SCPC") add_definitions(-DMODEM_IS_SCPC) message(STATUS "Selected SCPC modem") + add_subdirectory(dependencies/control_system_client) # подключение правильного control system client SCPC, ветка main elseif ("${MODEM_TYPE}" STREQUAL "TDMA") add_definitions(-DMODEM_IS_TDMA) message(STATUS "Selected TDMA modem") + add_subdirectory(dependencies/control_system_client_tdma) # подключение правильного control system client TDMA, ветка terminal-tdma elseif ("${MODEM_TYPE}" STREQUAL "SHPS") add_definitions(-DMODEM_IS_SHPS) message(STATUS "Selected SHPS modem") + add_subdirectory(dependencies/control_system_client_shps) # подключение правильного control system client SHPS, ветка shps else() message(FATAL_ERROR "You must set `MODEM_TYPE` \"SCPC\" or \"TDMA\" or \"SHPS\"!") endif() @@ -52,7 +55,6 @@ add_compile_options(-Wall -Wextra -Wsign-conversion -DPROJECT_GIT_REVISION="${PR # максимальный размер тела запроса 200mb add_definitions(-DHTTP_MAX_PAYLOAD=200000000) -add_subdirectory(dependencies/control_system_client) include_directories(src/) diff --git a/dependencies/control_system_client b/dependencies/control_system_client index cb0f743..76d6dcd 160000 --- a/dependencies/control_system_client +++ b/dependencies/control_system_client @@ -1 +1 @@ -Subproject commit cb0f743535b95b87311318a0b8daf82da9bb7df5 +Subproject commit 76d6dcdb08d3602ad33f2236a60cc78841b5bdc5 diff --git a/dependencies/control_system_client_shps b/dependencies/control_system_client_shps new file mode 160000 index 0000000..92fcb8a --- /dev/null +++ b/dependencies/control_system_client_shps @@ -0,0 +1 @@ +Subproject commit 92fcb8ab674eb592b6237a7b82af2dfb1a0ae00c diff --git a/dependencies/control_system_client_tdma b/dependencies/control_system_client_tdma new file mode 160000 index 0000000..cb0f743 --- /dev/null +++ b/dependencies/control_system_client_tdma @@ -0,0 +1 @@ +Subproject commit cb0f743535b95b87311318a0b8daf82da9bb7df5