From 8e238ee7e2277269eb2d2eb6aaa5006c3ae80277 Mon Sep 17 00:00:00 2001 From: Davide Mor <davide.mor@skywarder.eu> Date: Tue, 21 May 2024 11:30:52 +0200 Subject: [PATCH] [RIGv2] Renamed con_RIG in ConRIG --- CMakeLists.txt | 2 +- cmake/dependencies.cmake | 6 +++--- src/boards/{con_RIG => ConRIG}/BoardScheduler.h | 0 src/boards/{con_RIG => ConRIG}/Buses.h | 0 src/boards/{con_RIG => ConRIG}/Buttons/Buttons.cpp | 6 +++--- src/boards/{con_RIG => ConRIG}/Buttons/Buttons.h | 0 .../{con_RIG => ConRIG}/Configs/ButtonsConfig.h | 0 src/boards/{con_RIG => ConRIG}/Configs/RadioConfig.h | 0 src/boards/{con_RIG => ConRIG}/Radio/Radio.cpp | 8 ++++---- src/boards/{con_RIG => ConRIG}/Radio/Radio.h | 2 +- src/boards/{con_RIG => ConRIG}/Serial/Serial.cpp | 2 +- src/boards/{con_RIG => ConRIG}/Serial/Serial.h | 0 .../{con_RIG => ConRIG}/con_rig-entry.cpp | 12 ++++++------ 13 files changed, 19 insertions(+), 19 deletions(-) rename src/boards/{con_RIG => ConRIG}/BoardScheduler.h (100%) rename src/boards/{con_RIG => ConRIG}/Buses.h (100%) rename src/boards/{con_RIG => ConRIG}/Buttons/Buttons.cpp (97%) rename src/boards/{con_RIG => ConRIG}/Buttons/Buttons.h (100%) rename src/boards/{con_RIG => ConRIG}/Configs/ButtonsConfig.h (100%) rename src/boards/{con_RIG => ConRIG}/Configs/RadioConfig.h (100%) rename src/boards/{con_RIG => ConRIG}/Radio/Radio.cpp (98%) rename src/boards/{con_RIG => ConRIG}/Radio/Radio.h (98%) rename src/boards/{con_RIG => ConRIG}/Serial/Serial.cpp (98%) rename src/boards/{con_RIG => ConRIG}/Serial/Serial.h (100%) rename src/entrypoints/{con_RIG => ConRIG}/con_rig-entry.cpp (93%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fa2ec6a0..af7fb520a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ add_executable(rig-v2-entry src/entrypoints/RIGv2/rig-v2-entry.cpp ${RIG_V2_COMP target_include_directories(rig-v2-entry PRIVATE ${OBSW_INCLUDE_DIRS}) sbs_target(rig-v2-entry stm32f767zi_rig_v2) -add_executable(con_rig-entry src/entrypoints/con_RIG/con_rig-entry.cpp ${CON_RIG_COMPUTER}) +add_executable(con_rig-entry src/entrypoints/ConRIG/con_rig-entry.cpp ${CON_RIG_COMPUTER}) target_include_directories(con_rig-entry PRIVATE ${OBSW_INCLUDE_DIRS}) sbs_target(con_rig-entry stm32f429zi_con_rig) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index de2f55aba..be7afc273 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -72,9 +72,9 @@ set(RIG_V2_COMPUTER ) set(CON_RIG_COMPUTER - src/boards/con_RIG/Buttons/Buttons.cpp - src/boards/con_RIG/Radio/Radio.cpp - src/boards/con_RIG/Serial/Serial.cpp + src/boards/ConRIG/Buttons/Buttons.cpp + src/boards/ConRIG/Radio/Radio.cpp + src/boards/ConRIG/Serial/Serial.cpp ) set(PAYLOAD_COMPUTER diff --git a/src/boards/con_RIG/BoardScheduler.h b/src/boards/ConRIG/BoardScheduler.h similarity index 100% rename from src/boards/con_RIG/BoardScheduler.h rename to src/boards/ConRIG/BoardScheduler.h diff --git a/src/boards/con_RIG/Buses.h b/src/boards/ConRIG/Buses.h similarity index 100% rename from src/boards/con_RIG/Buses.h rename to src/boards/ConRIG/Buses.h diff --git a/src/boards/con_RIG/Buttons/Buttons.cpp b/src/boards/ConRIG/Buttons/Buttons.cpp similarity index 97% rename from src/boards/con_RIG/Buttons/Buttons.cpp rename to src/boards/ConRIG/Buttons/Buttons.cpp index c53d5127a..ea961dbb9 100644 --- a/src/boards/con_RIG/Buttons/Buttons.cpp +++ b/src/boards/ConRIG/Buttons/Buttons.cpp @@ -22,9 +22,9 @@ #include "Buttons.h" -#include <con_RIG/BoardScheduler.h> -#include <con_RIG/Configs/ButtonsConfig.h> -#include <con_RIG/Radio/Radio.h> +#include <ConRIG/BoardScheduler.h> +#include <ConRIG/Configs/ButtonsConfig.h> +#include <ConRIG/Radio/Radio.h> #include <interfaces-impl/hwmapping.h> using namespace std; diff --git a/src/boards/con_RIG/Buttons/Buttons.h b/src/boards/ConRIG/Buttons/Buttons.h similarity index 100% rename from src/boards/con_RIG/Buttons/Buttons.h rename to src/boards/ConRIG/Buttons/Buttons.h diff --git a/src/boards/con_RIG/Configs/ButtonsConfig.h b/src/boards/ConRIG/Configs/ButtonsConfig.h similarity index 100% rename from src/boards/con_RIG/Configs/ButtonsConfig.h rename to src/boards/ConRIG/Configs/ButtonsConfig.h diff --git a/src/boards/con_RIG/Configs/RadioConfig.h b/src/boards/ConRIG/Configs/RadioConfig.h similarity index 100% rename from src/boards/con_RIG/Configs/RadioConfig.h rename to src/boards/ConRIG/Configs/RadioConfig.h diff --git a/src/boards/con_RIG/Radio/Radio.cpp b/src/boards/ConRIG/Radio/Radio.cpp similarity index 98% rename from src/boards/con_RIG/Radio/Radio.cpp rename to src/boards/ConRIG/Radio/Radio.cpp index 1348ce081..c30ad37c0 100644 --- a/src/boards/con_RIG/Radio/Radio.cpp +++ b/src/boards/ConRIG/Radio/Radio.cpp @@ -24,10 +24,10 @@ #include <common/Mavlink.h> #include <common/Radio.h> -#include <con_RIG/BoardScheduler.h> -#include <con_RIG/Buses.h> -#include <con_RIG/Buttons/Buttons.h> -#include <con_RIG/Serial/Serial.h> +#include <ConRIG/BoardScheduler.h> +#include <ConRIG/Buses.h> +#include <ConRIG/Buttons/Buttons.h> +#include <ConRIG/Serial/Serial.h> #include <diagnostic/SkywardStack.h> #include <drivers/interrupt/external_interrupts.h> #include <events/EventBroker.h> diff --git a/src/boards/con_RIG/Radio/Radio.h b/src/boards/ConRIG/Radio/Radio.h similarity index 98% rename from src/boards/con_RIG/Radio/Radio.h rename to src/boards/ConRIG/Radio/Radio.h index c9e3ae5f4..2d7c40c14 100644 --- a/src/boards/con_RIG/Radio/Radio.h +++ b/src/boards/ConRIG/Radio/Radio.h @@ -23,7 +23,7 @@ #pragma once #include <common/Mavlink.h> -#include <con_RIG/Configs/RadioConfig.h> +#include <ConRIG/Configs/RadioConfig.h> #include <diagnostic/PrintLogger.h> #include <radio/MavlinkDriver/MavlinkDriver.h> #include <radio/SX1278/SX1278Lora.h> diff --git a/src/boards/con_RIG/Serial/Serial.cpp b/src/boards/ConRIG/Serial/Serial.cpp similarity index 98% rename from src/boards/con_RIG/Serial/Serial.cpp rename to src/boards/ConRIG/Serial/Serial.cpp index 4701e8534..3d0bb0c19 100644 --- a/src/boards/con_RIG/Serial/Serial.cpp +++ b/src/boards/ConRIG/Serial/Serial.cpp @@ -22,7 +22,7 @@ #include "Serial.h" -#include <con_RIG/Radio/Radio.h> +#include <ConRIG/Radio/Radio.h> #include <filesystem/console/console_device.h> using namespace miosix; diff --git a/src/boards/con_RIG/Serial/Serial.h b/src/boards/ConRIG/Serial/Serial.h similarity index 100% rename from src/boards/con_RIG/Serial/Serial.h rename to src/boards/ConRIG/Serial/Serial.h diff --git a/src/entrypoints/con_RIG/con_rig-entry.cpp b/src/entrypoints/ConRIG/con_rig-entry.cpp similarity index 93% rename from src/entrypoints/con_RIG/con_rig-entry.cpp rename to src/entrypoints/ConRIG/con_rig-entry.cpp index 7c9171e2d..8d7b0a9d9 100644 --- a/src/entrypoints/con_RIG/con_rig-entry.cpp +++ b/src/entrypoints/ConRIG/con_rig-entry.cpp @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -#include <con_RIG/BoardScheduler.h> -#include <con_RIG/Buses.h> -#include <con_RIG/Buttons/Buttons.h> -#include <con_RIG/Configs/ButtonsConfig.h> -#include <con_RIG/Radio/Radio.h> -#include <con_RIG/Serial/Serial.h> +#include <ConRIG/BoardScheduler.h> +#include <ConRIG/Buses.h> +#include <ConRIG/Buttons/Buttons.h> +#include <ConRIG/Configs/ButtonsConfig.h> +#include <ConRIG/Radio/Radio.h> +#include <ConRIG/Serial/Serial.h> #include <diagnostic/CpuMeter/CpuMeter.h> #include <diagnostic/PrintLogger.h> #include <events/EventBroker.h> -- GitLab