From a72cbb8dc6b83b71eb1fa9b17817b186ac18880f Mon Sep 17 00:00:00 2001
From: Emilio Corigliano <emilio.corigliano@skywarder.eu>
Date: Tue, 21 May 2024 10:23:53 +0200
Subject: [PATCH] [ASPIS] Created obsw-aspis target
It will perform all the necessary passes of aspis
---
CMakeLists.txt | 28 ++++++++++++++++++++++++++++
cmake/dependencies.cmake | 1 -
skyward-boardcore | 2 +-
src/boards/common/dummy.cpp | 0
4 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 src/boards/common/dummy.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12939a6d4..4e24e3aa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,34 @@ project(OnBoardSoftware)
# Flight entrypoints #
#-----------------------------------------------------------------------------#
+# ASPIS
+set(MAIN_TO_DUPLICATE
+ src/boards/common/dummy.cpp
+)
+set(MAIN_EXTERNAL
+ src/boards/common/dummy.cpp
+ src/boards/Main/BoardScheduler.cpp
+ src/boards/Main/Sensors/Sensors.cpp
+ src/boards/Main/Sensors/HILSensors.cpp
+ src/boards/Main/StateMachines/NASController/NASController.cpp
+ src/boards/Main/Radio/Radio.cpp
+ src/boards/Main/TMRepository/TMRepository.cpp
+ src/boards/Main/CanHandler/CanHandler.cpp
+ src/boards/Main/StateMachines/FlightModeManager/FlightModeManager.cpp
+ src/boards/Main/Actuators/Actuators.cpp
+ src/boards/Main/Sensors/RotatedIMU/RotatedIMU.cpp
+ src/boards/Main/PinHandler/PinHandler.cpp
+ src/boards/Main/StateMachines/ABKController/ABKController.cpp
+ src/boards/Main/StateMachines/MEAController/MEAController.cpp
+ src/boards/Main/FlightStatsRecorder/FlightStatsRecorder.cpp
+ src/boards/Main/AltitudeTrigger/AltitudeTrigger.cpp
+ src/boards/Main/StateMachines/ADAController/ADAController.cpp
+ src/boards/Main/StateMachines/Deployment/Deployment.cpp
+)
+add_executable(obsw-aspis src/entrypoints/Main/main-entry.cpp)
+target_include_directories(obsw-aspis PRIVATE ${OBSW_INCLUDE_DIRS})
+obsw_target(obsw-aspis stm32f767zi_death_stack_v4 MAIN_TO_DUPLICATE MAIN_EXTERNAL OBSW_INCLUDE_DIRS)
+
add_executable(main-entry src/entrypoints/Main/main-entry.cpp ${MAIN_COMPUTER})
target_include_directories(main-entry PRIVATE ${OBSW_INCLUDE_DIRS})
sbs_target(main-entry stm32f767zi_death_stack_v4)
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 90f09ba85..cced79056 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -22,7 +22,6 @@
set(OBSW_INCLUDE_DIRS
src
src/boards
- src/hardware_in_the_loop
)
set(MAIN_COMPUTER
diff --git a/skyward-boardcore b/skyward-boardcore
index a742d4afc..66aa54445 160000
--- a/skyward-boardcore
+++ b/skyward-boardcore
@@ -1 +1 @@
-Subproject commit a742d4afc5fe155d85c492dec7790925d78f9993
+Subproject commit 66aa5444549a693c7d728c95ff4b1bb6872f8ccb
diff --git a/src/boards/common/dummy.cpp b/src/boards/common/dummy.cpp
new file mode 100644
index 000000000..e69de29bb
--
GitLab