From 4cd4c7bfaf17d53798b6fac63a0f6310837e1726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Caruso?= <niccolo.caruso@skywarder.eu>
Date: Wed, 2 Oct 2024 15:17:10 +0200
Subject: [PATCH] [rebase] Corrective commit to restore issues
Submodule: Updated skyward-lib
CMakeList: removed things
cmake: Removed from dependencies wrong duplicated things
---
CMakeLists.txt | 12 ----------
cmake/dependencies.cmake | 22 ++++---------------
.../Automated/Sensors/Sensors.cpp | 5 ++++-
src/boards/Groundstation/Base/Hub.h | 1 -
.../Groundstation/Common/Radio/RadioBase.cpp | 4 ++--
5 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6226993f..4ee33fffb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,11 +86,6 @@ add_executable(nokia-groundstation-entry
target_include_directories(nokia-groundstation-entry PRIVATE ${OBSW_INCLUDE_DIRS})
sbs_target(nokia-groundstation-entry stm32f429zi_nokia)
-
-add_executable(gs-entry src/entrypoints/Gs/gs-entry.cpp ${GS_COMPUTER})
-target_include_directories(gs-entry PRIVATE ${OBSW_INCLUDE_DIRS})
-sbs_target(gs-entry stm32f767zi_gemini_gs)
-
add_executable(base-groundstation-entry
src/entrypoints/Groundstation/base-groundstation-entry.cpp
${GROUNDSTATION_COMMON} ${GROUNDSTATION_BASE}
@@ -98,13 +93,6 @@ add_executable(base-groundstation-entry
target_include_directories(base-groundstation-entry PRIVATE ${OBSW_INCLUDE_DIRS})
sbs_target(base-groundstation-entry stm32f767zi_gemini_gs)
-add_executable(nokia-groundstation-entry
- src/entrypoints/Groundstation/nokia-groundstation-entry.cpp
- ${GROUNDSTATION_COMMON} ${GROUNDSTATION_NOKIA}
-)
-target_include_directories(nokia-groundstation-entry PRIVATE ${OBSW_INCLUDE_DIRS})
-sbs_target(nokia-groundstation-entry stm32f429zi_skyward_groundstation_v2)
-
add_executable(automated-antennas-entry
src/entrypoints/Groundstation/Automated/automated-antennas-entry.cpp
${ANTENNAS} ${GROUNDSTATION_COMMON} ${GROUNDSTATION_AUTOMATED}
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index f74071ea3..033cb7625 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -43,10 +43,10 @@ set(MAIN_COMPUTER
)
set(GROUNDSTATION_COMMON
- src/boards/Groundstation/Base/Radio/Radio.cpp
- src/boards/Groundstation/Base/Ports/Ethernet.cpp
- src/boards/Groundstation/Base/BoardStatus.cpp
- src/boards/Groundstation/Base/Hub.cpp
+ src/boards/Groundstation/Common/Radio/RadioBase.cpp
+ src/boards/Groundstation/Common/Ports/EthernetBase.cpp
+ src/boards/Groundstation/Common/Ports/Serial.cpp
+ src/boards/Groundstation/Common/HubBase.cpp
)
set(GS_COMPUTER
@@ -125,20 +125,6 @@ set(GROUNDSTATION_NOKIA
src/boards/Groundstation/Nokia/Hub.cpp
)
-set(GS_COMPUTER
- src/boards/Gs/Ports/Serial.cpp
- src/boards/Gs/Radio/Radio.cpp
- src/boards/Gs/Radio/RadioStatus.cpp
- src/boards/Gs/Hub.cpp
-)
-
-set(GROUNDSTATION_BASE
- src/boards/Groundstation/Common/Ports/Serial.cpp
- src/boards/Groundstation/Common/Ports/EthernetBase.cpp
- src/boards/Groundstation/Common/Radio/RadioBase.cpp
- src/boards/Groundstation/Common/HubBase.cpp
- )
-
set(GROUNDSTATION_AUTOMATED
src/boards/Groundstation/Automated/BoardStatus.cpp
src/boards/Groundstation/Automated/Radio/Radio.cpp
diff --git a/src/boards/Groundstation/Automated/Sensors/Sensors.cpp b/src/boards/Groundstation/Automated/Sensors/Sensors.cpp
index b6d2fc065..a049c3c3a 100644
--- a/src/boards/Groundstation/Automated/Sensors/Sensors.cpp
+++ b/src/boards/Groundstation/Automated/Sensors/Sensors.cpp
@@ -54,7 +54,10 @@ bool Sensors::start()
bool Sensors::vn300Init()
{
vn300 = new Boardcore::VN300(
- ModuleManager::getInstance().get<Buses>()->usart2, 115200);
+ ModuleManager::getInstance().get<Buses>()->usart2, 115200,
+ VN300Defs::SampleOptions::ARP,
+ VNCommonSerial::CRCOptions::CRC_ENABLE_16); ///< TODO: see that CRC
+ ///< behaves correctly
SensorInfo info("VN300", SAMPLE_PERIOD_VN300,
bind(&Sensors::vn300Callback, this));
diff --git a/src/boards/Groundstation/Base/Hub.h b/src/boards/Groundstation/Base/Hub.h
index c22a7339f..2d313542f 100644
--- a/src/boards/Groundstation/Base/Hub.h
+++ b/src/boards/Groundstation/Base/Hub.h
@@ -36,7 +36,6 @@ namespace GroundstationBase
class Hub : public Groundstation::HubBase
{
public:
- Hub() {}
/**
* @brief Dispatch to the correct interface and outgoing packet (gs ->
diff --git a/src/boards/Groundstation/Common/Radio/RadioBase.cpp b/src/boards/Groundstation/Common/Radio/RadioBase.cpp
index 22be5ff3b..e5cff3f0c 100644
--- a/src/boards/Groundstation/Common/Radio/RadioBase.cpp
+++ b/src/boards/Groundstation/Common/Radio/RadioBase.cpp
@@ -108,7 +108,7 @@ void RadioBase::run()
miosix::Thread::sleep(AUTOMATIC_FLUSH_PERIOD);
// If enough time has passed, automatically flush.
- if (miosix::getTick() > last_eot_packet_ts + AUTOMATIC_FLUSH_DELAY)
+ if (Boardcore::Kernel::getOldTick() > last_eot_packet_ts + AUTOMATIC_FLUSH_DELAY)
{
flush();
}
@@ -144,7 +144,7 @@ void RadioBase::handleMsg(const mavlink_message_t& msg)
if (isEndOfTransmissionPacket(msg))
{
- last_eot_packet_ts = miosix::getTick();
+ last_eot_packet_ts = Boardcore::Kernel::getOldTick();
flush();
}
}
--
GitLab