From bddf15acef9963ecd1ee41a58965d4b519708c03 Mon Sep 17 00:00:00 2001
From: Angelo Prete <angelo.prete@skywarder.eu>
Date: Thu, 9 May 2024 09:42:53 +0200
Subject: [PATCH] [Parafoil] Changed namespace to MockupMain
---
CMakeLists.txt | 2 +-
cmake/dependencies.cmake | 16 +++++++-------
.../{Main => MockupMain}/BoardScheduler.cpp | 4 ++--
.../{Main => MockupMain}/BoardScheduler.h | 4 ++--
src/boards/{Main => MockupMain}/Buses.h | 4 ++--
.../Configs/FlightModeManagerConfig.h | 4 ++--
.../{Main => MockupMain}/Configs/NASConfig.h | 4 ++--
.../Configs/PinHandlerConfig.h | 4 ++--
.../Configs/RadioConfig.h | 4 ++--
.../Configs/SensorsConfig.h | 4 ++--
.../PinHandler/PinHandler.cpp | 6 ++---
.../PinHandler/PinHandler.h | 4 ++--
.../{Main => MockupMain}/Radio/Radio.cpp | 22 +++++++++----------
src/boards/{Main => MockupMain}/Radio/Radio.h | 6 ++---
.../Sensors/AnalogLoadCellSensor.h | 0
.../{Main => MockupMain}/Sensors/Sensors.cpp | 14 ++++++------
.../{Main => MockupMain}/Sensors/Sensors.h | 6 ++---
.../FlightModeManager/FlightModeManager.cpp | 8 +++----
.../FlightModeManager/FlightModeManager.h | 4 ++--
.../FlightModeManager/FlightModeManagerData.h | 4 ++--
.../NASController/NASController.cpp | 10 ++++-----
.../NASController/NASController.h | 4 ++--
.../NASController/NASControllerData.h | 4 ++--
.../TMRepository/TMRepository.cpp | 20 ++++++++---------
.../TMRepository/TMRepository.h | 4 ++--
.../{Main => MockupMain}/main-entry.cpp | 18 +++++++--------
.../test-stackv2-shield.cpp | 0
27 files changed, 92 insertions(+), 92 deletions(-)
rename src/boards/{Main => MockupMain}/BoardScheduler.cpp (97%)
rename src/boards/{Main => MockupMain}/BoardScheduler.h (97%)
rename src/boards/{Main => MockupMain}/Buses.h (97%)
rename src/boards/{Main => MockupMain}/Configs/FlightModeManagerConfig.h (96%)
rename src/boards/{Main => MockupMain}/Configs/NASConfig.h (98%)
rename src/boards/{Main => MockupMain}/Configs/PinHandlerConfig.h (96%)
rename src/boards/{Main => MockupMain}/Configs/RadioConfig.h (97%)
rename src/boards/{Main => MockupMain}/Configs/SensorsConfig.h (99%)
rename src/boards/{Main => MockupMain}/PinHandler/PinHandler.cpp (95%)
rename src/boards/{Main => MockupMain}/PinHandler/PinHandler.h (97%)
rename src/boards/{Main => MockupMain}/Radio/Radio.cpp (96%)
rename src/boards/{Main => MockupMain}/Radio/Radio.h (97%)
rename src/boards/{Main => MockupMain}/Sensors/AnalogLoadCellSensor.h (100%)
rename src/boards/{Main => MockupMain}/Sensors/Sensors.cpp (98%)
rename src/boards/{Main => MockupMain}/Sensors/Sensors.h (98%)
rename src/boards/{Main => MockupMain}/StateMachines/FlightModeManager/FlightModeManager.cpp (98%)
rename src/boards/{Main => MockupMain}/StateMachines/FlightModeManager/FlightModeManager.h (98%)
rename src/boards/{Main => MockupMain}/StateMachines/FlightModeManager/FlightModeManagerData.h (97%)
rename src/boards/{Main => MockupMain}/StateMachines/NASController/NASController.cpp (98%)
rename src/boards/{Main => MockupMain}/StateMachines/NASController/NASController.h (98%)
rename src/boards/{Main => MockupMain}/StateMachines/NASController/NASControllerData.h (97%)
rename src/boards/{Main => MockupMain}/TMRepository/TMRepository.cpp (97%)
rename src/boards/{Main => MockupMain}/TMRepository/TMRepository.h (97%)
rename src/entrypoints/{Main => MockupMain}/main-entry.cpp (93%)
rename src/entrypoints/{Main => MockupMain}/test-stackv2-shield.cpp (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0f756925..d37944861 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ project(OnBoardSoftware)
# Flight entrypoints #
#-----------------------------------------------------------------------------#
-add_executable(main-entry src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER})
+add_executable(main-entry src/entrypoints/MockupMain/main-entry.cpp ${MOCKUP_MAIN_COMPUTER})
target_include_directories(main-entry PRIVATE ${OBSW_INCLUDE_DIRS})
target_compile_definitions(main-entry PRIVATE)
sbs_target(main-entry stm32f429zi_skyward_death_stack_x)
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 996709e93..0c7f012fc 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -23,12 +23,12 @@ set(OBSW_INCLUDE_DIRS
src/boards
)
-set(MAIN_COMPUTER
- src/boards/Main/Sensors/Sensors.cpp
- src/boards/Main/BoardScheduler.cpp
- src/boards/Main/PinHandler/PinHandler.cpp
- src/boards/Main/Radio/Radio.cpp
- src/boards/Main/TMRepository/TMRepository.cpp
- src/boards/Main/StateMachines/NASController/NASController.cpp
- src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
+set(MOCKUP_MAIN_COMPUTER
+ src/boards/MockupMain/Sensors/Sensors.cpp
+ src/boards/MockupMain/BoardScheduler.cpp
+ src/boards/MockupMain/PinHandler/PinHandler.cpp
+ src/boards/MockupMain/Radio/Radio.cpp
+ src/boards/MockupMain/TMRepository/TMRepository.cpp
+ src/boards/MockupMain/StateMachines/NASController/NASController.cpp
+ src/boards/MockupMain/StateMachines/FlightModeManager/FlightModeManager.cpp
)
diff --git a/src/boards/Main/BoardScheduler.cpp b/src/boards/MockupMain/BoardScheduler.cpp
similarity index 97%
rename from src/boards/Main/BoardScheduler.cpp
rename to src/boards/MockupMain/BoardScheduler.cpp
index 489f65770..80a425dbf 100644
--- a/src/boards/Main/BoardScheduler.cpp
+++ b/src/boards/MockupMain/BoardScheduler.cpp
@@ -24,7 +24,7 @@
using namespace Boardcore;
-namespace Main
+namespace MockupMain
{
BoardScheduler::BoardScheduler()
@@ -63,4 +63,4 @@ bool BoardScheduler::isStarted()
return scheduler1->isRunning() && scheduler2->isRunning() &&
scheduler3->isRunning() && scheduler4->isRunning();
}
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/BoardScheduler.h b/src/boards/MockupMain/BoardScheduler.h
similarity index 97%
rename from src/boards/Main/BoardScheduler.h
rename to src/boards/MockupMain/BoardScheduler.h
index 6eeaa1304..1c706d2ec 100644
--- a/src/boards/Main/BoardScheduler.h
+++ b/src/boards/MockupMain/BoardScheduler.h
@@ -25,7 +25,7 @@
#include <utils/ModuleManager/ModuleManager.hpp>
-namespace Main
+namespace MockupMain
{
/**
* @brief Class that wraps the 4 main task schedulers of the entire OBSW.
@@ -59,4 +59,4 @@ private:
Boardcore::TaskScheduler* scheduler3;
Boardcore::TaskScheduler* scheduler4;
};
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/Buses.h b/src/boards/MockupMain/Buses.h
similarity index 97%
rename from src/boards/Main/Buses.h
rename to src/boards/MockupMain/Buses.h
index ad63eb10e..c62b80099 100644
--- a/src/boards/Main/Buses.h
+++ b/src/boards/MockupMain/Buses.h
@@ -26,7 +26,7 @@
#include <drivers/usart/USART.h>
#include <utils/ModuleManager/ModuleManager.hpp>
-namespace Main
+namespace MockupMain
{
class Buses : public Boardcore::Module
{
@@ -45,4 +45,4 @@ public:
{
}
};
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/Configs/FlightModeManagerConfig.h b/src/boards/MockupMain/Configs/FlightModeManagerConfig.h
similarity index 96%
rename from src/boards/Main/Configs/FlightModeManagerConfig.h
rename to src/boards/MockupMain/Configs/FlightModeManagerConfig.h
index 53adf1ee3..17e23b20f 100644
--- a/src/boards/Main/Configs/FlightModeManagerConfig.h
+++ b/src/boards/MockupMain/Configs/FlightModeManagerConfig.h
@@ -22,9 +22,9 @@
#pragma once
-namespace Main
+namespace MockupMain
{
constexpr unsigned int LOGGING_DELAY = 5 * 1000; // [ms]
constexpr unsigned int CONTROL_DELAY = 5 * 1000; // [ms]
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/Configs/NASConfig.h b/src/boards/MockupMain/Configs/NASConfig.h
similarity index 98%
rename from src/boards/Main/Configs/NASConfig.h
rename to src/boards/MockupMain/Configs/NASConfig.h
index c4a5d318e..0ef34c9e0 100644
--- a/src/boards/Main/Configs/NASConfig.h
+++ b/src/boards/MockupMain/Configs/NASConfig.h
@@ -26,7 +26,7 @@
#include <algorithms/ReferenceValues.h>
#include <common/ReferenceConfig.h>
-namespace Main
+namespace MockupMain
{
namespace NASConfig
@@ -64,4 +64,4 @@ static const Boardcore::NASConfig config = {
} // namespace NASConfig
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/Configs/PinHandlerConfig.h b/src/boards/MockupMain/Configs/PinHandlerConfig.h
similarity index 96%
rename from src/boards/Main/Configs/PinHandlerConfig.h
rename to src/boards/MockupMain/Configs/PinHandlerConfig.h
index 00bc24073..455ee8de2 100644
--- a/src/boards/Main/Configs/PinHandlerConfig.h
+++ b/src/boards/MockupMain/Configs/PinHandlerConfig.h
@@ -24,11 +24,11 @@
#include <utils/PinObserver/PinObserver.h>
-namespace Main
+namespace MockupMain
{
constexpr unsigned int NC_DETACH_PIN_THRESHOLD = 20;
constexpr Boardcore::PinTransition NC_DETACH_PIN_TRIGGER =
Boardcore::PinTransition::FALLING_EDGE;
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/Configs/RadioConfig.h b/src/boards/MockupMain/Configs/RadioConfig.h
similarity index 97%
rename from src/boards/Main/Configs/RadioConfig.h
rename to src/boards/MockupMain/Configs/RadioConfig.h
index 43abbd366..18a41ccaf 100644
--- a/src/boards/Main/Configs/RadioConfig.h
+++ b/src/boards/MockupMain/Configs/RadioConfig.h
@@ -23,7 +23,7 @@
#include <common/Mavlink.h>
-namespace Main
+namespace MockupMain
{
namespace RadioConfig
{
@@ -48,4 +48,4 @@ constexpr bool XBEE_80KBPS_DATA_RATE = true;
constexpr int XBEE_TIMEOUT = 5000; // [ms]
} // namespace RadioConfig
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/Configs/SensorsConfig.h b/src/boards/MockupMain/Configs/SensorsConfig.h
similarity index 99%
rename from src/boards/Main/Configs/SensorsConfig.h
rename to src/boards/MockupMain/Configs/SensorsConfig.h
index 1f23c6178..d6dafcf9d 100644
--- a/src/boards/Main/Configs/SensorsConfig.h
+++ b/src/boards/MockupMain/Configs/SensorsConfig.h
@@ -30,7 +30,7 @@
#include <sensors/LPS22DF/LPS22DF.h>
#include <sensors/calibration/AxisOrientation.h>
-namespace Main
+namespace MockupMain
{
namespace SensorsConfig
{
@@ -134,4 +134,4 @@ static constexpr float LOAD_CELL_P1_VOLTAGE = 1;
static constexpr float LOAD_CELL_P1_MASS = 1;
} // namespace SensorsConfig
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/PinHandler/PinHandler.cpp b/src/boards/MockupMain/PinHandler/PinHandler.cpp
similarity index 95%
rename from src/boards/Main/PinHandler/PinHandler.cpp
rename to src/boards/MockupMain/PinHandler/PinHandler.cpp
index 37570dd06..67b4ed246 100644
--- a/src/boards/Main/PinHandler/PinHandler.cpp
+++ b/src/boards/MockupMain/PinHandler/PinHandler.cpp
@@ -22,7 +22,7 @@
#include "PinHandler.h"
-#include <Main/Configs/PinHandlerConfig.h>
+#include <MockupMain/Configs/PinHandlerConfig.h>
#include <common/Events.h>
#include <events/EventBroker.h>
#include <interfaces-impl/hwmapping.h>
@@ -35,7 +35,7 @@ using namespace miosix;
using namespace Boardcore;
using namespace Common;
-namespace Main
+namespace MockupMain
{
void PinHandler::onExpulsionPinTransition(PinTransition transition)
@@ -69,4 +69,4 @@ PinHandler::PinHandler() : running(false)
std::bind(&PinHandler::onExpulsionPinTransition, this, _1),
NC_DETACH_PIN_THRESHOLD);
}
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/PinHandler/PinHandler.h b/src/boards/MockupMain/PinHandler/PinHandler.h
similarity index 97%
rename from src/boards/Main/PinHandler/PinHandler.h
rename to src/boards/MockupMain/PinHandler/PinHandler.h
index b54aa55f3..d40539e60 100644
--- a/src/boards/Main/PinHandler/PinHandler.h
+++ b/src/boards/MockupMain/PinHandler/PinHandler.h
@@ -28,7 +28,7 @@
#include <utils/ModuleManager/ModuleManager.hpp>
-namespace Main
+namespace MockupMain
{
/**
@@ -63,4 +63,4 @@ private:
std::atomic<bool> running;
};
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/Radio/Radio.cpp b/src/boards/MockupMain/Radio/Radio.cpp
similarity index 96%
rename from src/boards/Main/Radio/Radio.cpp
rename to src/boards/MockupMain/Radio/Radio.cpp
index 47d593a41..e86c725b5 100644
--- a/src/boards/Main/Radio/Radio.cpp
+++ b/src/boards/MockupMain/Radio/Radio.cpp
@@ -19,13 +19,13 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include <Main/Buses.h>
-#include <Main/PinHandler/PinHandler.h>
-#include <Main/Radio/Radio.h>
-#include <Main/Sensors/Sensors.h>
-#include <Main/StateMachines/FlightModeManager/FlightModeManager.h>
-#include <Main/StateMachines/NASController/NASController.h>
-#include <Main/TMRepository/TMRepository.h>
+#include <MockupMain/Buses.h>
+#include <MockupMain/PinHandler/PinHandler.h>
+#include <MockupMain/Radio/Radio.h>
+#include <MockupMain/Sensors/Sensors.h>
+#include <MockupMain/StateMachines/FlightModeManager/FlightModeManager.h>
+#include <MockupMain/StateMachines/NASController/NASController.h>
+#include <MockupMain/TMRepository/TMRepository.h>
#include <common/Events.h>
#include <common/Topics.h>
#include <drivers/interrupt/external_interrupts.h>
@@ -42,11 +42,11 @@ void __attribute__((used)) EXTI10_IRQHandlerImpl()
{
ModuleManager& modules = ModuleManager::getInstance();
- if (modules.get<Main::Radio>()->transceiver != nullptr)
- modules.get<Main::Radio>()->transceiver->handleATTNInterrupt();
+ if (modules.get<MockupMain::Radio>()->transceiver != nullptr)
+ modules.get<MockupMain::Radio>()->transceiver->handleATTNInterrupt();
}
-namespace Main
+namespace MockupMain
{
Radio::Radio(TaskScheduler* sched) : scheduler(sched) {}
@@ -457,4 +457,4 @@ void Radio::enqueueMsg(const mavlink_message_t& msg)
}
}
}
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/Radio/Radio.h b/src/boards/MockupMain/Radio/Radio.h
similarity index 97%
rename from src/boards/Main/Radio/Radio.h
rename to src/boards/MockupMain/Radio/Radio.h
index 073369ee2..5bdcacc49 100644
--- a/src/boards/Main/Radio/Radio.h
+++ b/src/boards/MockupMain/Radio/Radio.h
@@ -21,7 +21,7 @@
*/
#pragma once
-#include <Main/Configs/RadioConfig.h>
+#include <MockupMain/Configs/RadioConfig.h>
#include <common/Mavlink.h>
#include <radio/MavlinkDriver/MavlinkDriver.h>
#include <radio/Xbee/Xbee.h>
@@ -29,7 +29,7 @@
#include <utils/ModuleManager/ModuleManager.hpp>
-namespace Main
+namespace MockupMain
{
using MavDriver = Boardcore::MavlinkDriver<RadioConfig::RADIO_PKT_LENGTH,
RadioConfig::RADIO_OUT_QUEUE_SIZE,
@@ -101,4 +101,4 @@ private:
Boardcore::PrintLogger logger = Boardcore::Logging::getLogger("Radio");
Boardcore::TaskScheduler* scheduler = nullptr;
};
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/Sensors/AnalogLoadCellSensor.h b/src/boards/MockupMain/Sensors/AnalogLoadCellSensor.h
similarity index 100%
rename from src/boards/Main/Sensors/AnalogLoadCellSensor.h
rename to src/boards/MockupMain/Sensors/AnalogLoadCellSensor.h
diff --git a/src/boards/Main/Sensors/Sensors.cpp b/src/boards/MockupMain/Sensors/Sensors.cpp
similarity index 98%
rename from src/boards/Main/Sensors/Sensors.cpp
rename to src/boards/MockupMain/Sensors/Sensors.cpp
index 18a5110c2..c00ea87c1 100644
--- a/src/boards/Main/Sensors/Sensors.cpp
+++ b/src/boards/MockupMain/Sensors/Sensors.cpp
@@ -22,27 +22,27 @@
#include "Sensors.h"
-#include <Main/Buses.h>
-#include <Main/Configs/SensorsConfig.h>
+#include <MockupMain/Buses.h>
+#include <MockupMain/Configs/SensorsConfig.h>
#include <common/ReferenceConfig.h>
#include <drivers/interrupt/external_interrupts.h>
#include <interfaces-impl/hwmapping.h>
using namespace Boardcore;
using namespace std;
-using namespace Main::SensorsConfig;
+using namespace MockupMain::SensorsConfig;
// BMX160 Watermark interrupt
void __attribute__((used)) EXTI5_IRQHandlerImpl()
{
- Main::Sensors* sensors_module =
- ModuleManager::getInstance().get<Main::Sensors>();
+ MockupMain::Sensors* sensors_module =
+ ModuleManager::getInstance().get<MockupMain::Sensors>();
if (sensors_module->bmx160 != nullptr)
sensors_module->bmx160->IRQupdateTimestamp(
TimestampTimer::getTimestamp());
}
-namespace Main
+namespace MockupMain
{
// Getters
BMX160Data Sensors::getBMX160LastSample()
@@ -528,4 +528,4 @@ void Sensors::loadCellCallback()
Logger::getInstance().log(lastSample);
}
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/Sensors/Sensors.h b/src/boards/MockupMain/Sensors/Sensors.h
similarity index 98%
rename from src/boards/Main/Sensors/Sensors.h
rename to src/boards/MockupMain/Sensors/Sensors.h
index 919fd92b6..2dceaed1a 100644
--- a/src/boards/Main/Sensors/Sensors.h
+++ b/src/boards/MockupMain/Sensors/Sensors.h
@@ -21,7 +21,7 @@
*/
#pragma once
-#include <Main/Configs/SensorsConfig.h>
+#include <MockupMain/Configs/SensorsConfig.h>
#include <drivers/adc/InternalADC.h>
#include <sensors/ADS131M08/ADS131M08.h>
#include <sensors/BMX160/BMX160.h>
@@ -38,7 +38,7 @@
#include "AnalogLoadCellSensor.h"
-namespace Main
+namespace MockupMain
{
class Sensors : public Boardcore::Module
@@ -163,4 +163,4 @@ private:
SensorsConfig::NUMBER_OF_SENSORS>
sensorsInit;
};
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp b/src/boards/MockupMain/StateMachines/FlightModeManager/FlightModeManager.cpp
similarity index 98%
rename from src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
rename to src/boards/MockupMain/StateMachines/FlightModeManager/FlightModeManager.cpp
index 2ff71c9b6..cda7a9864 100644
--- a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
+++ b/src/boards/MockupMain/StateMachines/FlightModeManager/FlightModeManager.cpp
@@ -22,8 +22,8 @@
#include "FlightModeManager.h"
-#include <Main/Configs/FlightModeManagerConfig.h>
-#include <Main/Sensors/Sensors.h>
+#include <MockupMain/Configs/FlightModeManagerConfig.h>
+#include <MockupMain/Sensors/Sensors.h>
#include <common/Events.h>
#include <drivers/timer/TimestampTimer.h>
#include <events/EventBroker.h>
@@ -32,7 +32,7 @@ using namespace miosix;
using namespace Boardcore;
using namespace Common;
-namespace Main
+namespace MockupMain
{
FlightModeManager::FlightModeManager()
: HSM(&FlightModeManager::state_on_ground)
@@ -431,4 +431,4 @@ void FlightModeManager::logStatus(FlightModeManagerState state)
Logger::getInstance().log(status);
}
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.h b/src/boards/MockupMain/StateMachines/FlightModeManager/FlightModeManager.h
similarity index 98%
rename from src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.h
rename to src/boards/MockupMain/StateMachines/FlightModeManager/FlightModeManager.h
index 2d708a910..1dd669561 100644
--- a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.h
+++ b/src/boards/MockupMain/StateMachines/FlightModeManager/FlightModeManager.h
@@ -29,7 +29,7 @@
#include "FlightModeManagerData.h"
-namespace Main
+namespace MockupMain
{
class FlightModeManager : public Boardcore::HSM<FlightModeManager>,
public Boardcore::Module
@@ -101,4 +101,4 @@ private:
Boardcore::PrintLogger logger = Boardcore::Logging::getLogger("fmm");
};
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManagerData.h b/src/boards/MockupMain/StateMachines/FlightModeManager/FlightModeManagerData.h
similarity index 97%
rename from src/boards/Main/StateMachines/FlightModeManager/FlightModeManagerData.h
rename to src/boards/MockupMain/StateMachines/FlightModeManager/FlightModeManagerData.h
index 439f9c687..4daf97b12 100644
--- a/src/boards/Main/StateMachines/FlightModeManager/FlightModeManagerData.h
+++ b/src/boards/MockupMain/StateMachines/FlightModeManager/FlightModeManagerData.h
@@ -27,7 +27,7 @@
#include <iostream>
#include <string>
-namespace Main
+namespace MockupMain
{
enum class FlightModeManagerState : uint8_t
@@ -57,4 +57,4 @@ struct FlightModeManagerStatus
}
};
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/StateMachines/NASController/NASController.cpp b/src/boards/MockupMain/StateMachines/NASController/NASController.cpp
similarity index 98%
rename from src/boards/Main/StateMachines/NASController/NASController.cpp
rename to src/boards/MockupMain/StateMachines/NASController/NASController.cpp
index ebfe60217..568f8f0f6 100644
--- a/src/boards/Main/StateMachines/NASController/NASController.cpp
+++ b/src/boards/MockupMain/StateMachines/NASController/NASController.cpp
@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
-#include <Main/Configs/NASConfig.h>
-#include <Main/Sensors/Sensors.h>
-#include <Main/StateMachines/NASController/NASController.h>
+#include <MockupMain/Configs/NASConfig.h>
+#include <MockupMain/Sensors/Sensors.h>
+#include <MockupMain/StateMachines/NASController/NASController.h>
#include <algorithms/NAS/StateInitializer.h>
#include <common/Events.h>
#include <common/ReferenceConfig.h>
@@ -33,7 +33,7 @@ using namespace Boardcore;
using namespace Eigen;
using namespace std;
using namespace Common;
-namespace Main
+namespace MockupMain
{
NASController::NASController(TaskScheduler* sched)
: FSM(&NASController::state_idle), nas(NASConfig::config), scheduler(sched)
@@ -357,4 +357,4 @@ void NASController::logStatus(NASControllerState state)
// Log the status
Logger::getInstance().log(status);
}
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/StateMachines/NASController/NASController.h b/src/boards/MockupMain/StateMachines/NASController/NASController.h
similarity index 98%
rename from src/boards/Main/StateMachines/NASController/NASController.h
rename to src/boards/MockupMain/StateMachines/NASController/NASController.h
index 74b7a5f86..a96545cb6 100644
--- a/src/boards/Main/StateMachines/NASController/NASController.h
+++ b/src/boards/MockupMain/StateMachines/NASController/NASController.h
@@ -31,7 +31,7 @@
#include "NASControllerData.h"
-namespace Main
+namespace MockupMain
{
class NASController : public Boardcore::FSM<NASController>,
public Boardcore::Module
@@ -96,4 +96,4 @@ private:
Boardcore::PrintLogger logger = Boardcore::Logging::getLogger("NAS");
};
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/StateMachines/NASController/NASControllerData.h b/src/boards/MockupMain/StateMachines/NASController/NASControllerData.h
similarity index 97%
rename from src/boards/Main/StateMachines/NASController/NASControllerData.h
rename to src/boards/MockupMain/StateMachines/NASController/NASControllerData.h
index 559722a55..8ff514347 100644
--- a/src/boards/Main/StateMachines/NASController/NASControllerData.h
+++ b/src/boards/MockupMain/StateMachines/NASController/NASControllerData.h
@@ -27,7 +27,7 @@
#include <iostream>
#include <string>
-namespace Main
+namespace MockupMain
{
enum class NASControllerState : uint8_t
@@ -53,4 +53,4 @@ struct NASControllerStatus
}
};
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/TMRepository/TMRepository.cpp b/src/boards/MockupMain/TMRepository/TMRepository.cpp
similarity index 97%
rename from src/boards/Main/TMRepository/TMRepository.cpp
rename to src/boards/MockupMain/TMRepository/TMRepository.cpp
index bb4d928d1..f48aa45dd 100644
--- a/src/boards/Main/TMRepository/TMRepository.cpp
+++ b/src/boards/MockupMain/TMRepository/TMRepository.cpp
@@ -20,14 +20,14 @@
* THE SOFTWARE.
*/
-#include <Main/BoardScheduler.h>
-#include <Main/Configs/RadioConfig.h>
-#include <Main/PinHandler/PinHandler.h>
-#include <Main/Radio/Radio.h>
-#include <Main/Sensors/Sensors.h>
-#include <Main/StateMachines/FlightModeManager/FlightModeManager.h>
-#include <Main/StateMachines/NASController/NASController.h>
-#include <Main/TMRepository/TMRepository.h>
+#include <MockupMain/BoardScheduler.h>
+#include <MockupMain/Configs/RadioConfig.h>
+#include <MockupMain/PinHandler/PinHandler.h>
+#include <MockupMain/Radio/Radio.h>
+#include <MockupMain/Sensors/Sensors.h>
+#include <MockupMain/StateMachines/FlightModeManager/FlightModeManager.h>
+#include <MockupMain/StateMachines/NASController/NASController.h>
+#include <MockupMain/TMRepository/TMRepository.h>
#include <diagnostic/CpuMeter/CpuMeter.h>
#include <drivers/timer/TimestampTimer.h>
#include <events/EventBroker.h>
@@ -38,7 +38,7 @@
using namespace miosix;
using namespace Boardcore;
-namespace Main
+namespace MockupMain
{
mavlink_message_t TMRepository::packSystemTm(SystemTMList tmId, uint8_t msgId,
uint8_t seq)
@@ -446,4 +446,4 @@ mavlink_message_t TMRepository::packSensorsTm(SensorsTMList sensorId,
return msg;
}
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/boards/Main/TMRepository/TMRepository.h b/src/boards/MockupMain/TMRepository/TMRepository.h
similarity index 97%
rename from src/boards/Main/TMRepository/TMRepository.h
rename to src/boards/MockupMain/TMRepository/TMRepository.h
index fa3a62535..e36ba6a18 100644
--- a/src/boards/Main/TMRepository/TMRepository.h
+++ b/src/boards/MockupMain/TMRepository/TMRepository.h
@@ -26,7 +26,7 @@
#include <utils/ModuleManager/ModuleManager.hpp>
-namespace Main
+namespace MockupMain
{
class TMRepository : public Boardcore::Module
{
@@ -45,4 +45,4 @@ private:
Boardcore::PrintLogger logger =
Boardcore::Logging::getLogger("TMRepository");
};
-} // namespace Main
+} // namespace MockupMain
diff --git a/src/entrypoints/Main/main-entry.cpp b/src/entrypoints/MockupMain/main-entry.cpp
similarity index 93%
rename from src/entrypoints/Main/main-entry.cpp
rename to src/entrypoints/MockupMain/main-entry.cpp
index 2c63122df..0667b4e39 100644
--- a/src/entrypoints/Main/main-entry.cpp
+++ b/src/entrypoints/MockupMain/main-entry.cpp
@@ -20,14 +20,14 @@
* THE SOFTWARE.
*/
-#include <Main/BoardScheduler.h>
-#include <Main/Buses.h>
-#include <Main/PinHandler/PinHandler.h>
-#include <Main/Radio/Radio.h>
-#include <Main/Sensors/Sensors.h>
-#include <Main/StateMachines/FlightModeManager/FlightModeManager.h>
-#include <Main/StateMachines/NASController/NASController.h>
-#include <Main/TMRepository/TMRepository.h>
+#include <MockupMain/BoardScheduler.h>
+#include <MockupMain/Buses.h>
+#include <MockupMain/PinHandler/PinHandler.h>
+#include <MockupMain/Radio/Radio.h>
+#include <MockupMain/Sensors/Sensors.h>
+#include <MockupMain/StateMachines/FlightModeManager/FlightModeManager.h>
+#include <MockupMain/StateMachines/NASController/NASController.h>
+#include <MockupMain/TMRepository/TMRepository.h>
#include <common/Events.h>
#include <common/Topics.h>
#include <diagnostic/CpuMeter/CpuMeter.h>
@@ -41,7 +41,7 @@
#include <utils/ModuleManager/ModuleManager.hpp>
using namespace Boardcore;
-using namespace Main;
+using namespace MockupMain;
using namespace Common;
int main()
diff --git a/src/entrypoints/Main/test-stackv2-shield.cpp b/src/entrypoints/MockupMain/test-stackv2-shield.cpp
similarity index 100%
rename from src/entrypoints/Main/test-stackv2-shield.cpp
rename to src/entrypoints/MockupMain/test-stackv2-shield.cpp
--
GitLab