From c96ce6dd29e3ed1b10f38aa82e1cbf41b713f455 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:13 +0200
Subject: [PATCH] [GS] Hotfix Dependency Manager injection
Now the dependency manager need to inject also the ARP modules to avoid errors.
Still a temporary fix that can be refined.
---
.../Groundstation/lyra-gs-entry.cpp | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/entrypoints/Groundstation/lyra-gs-entry.cpp b/src/entrypoints/Groundstation/lyra-gs-entry.cpp
index 4ac45bb3d..5dfec3126 100644
--- a/src/entrypoints/Groundstation/lyra-gs-entry.cpp
+++ b/src/entrypoints/Groundstation/lyra-gs-entry.cpp
@@ -164,22 +164,22 @@ int main()
// Inserting Modules
// ARP modules insertion
+ LOG_DEBUG(logger, "[debug] Inserting ARP Ground Station modules\n");
+ actuators = new Antennas::Actuators();
+ sensors = new Antennas::Sensors();
+ sma = new Antennas::SMA(scheduler_high);
+ pinHandler = new Antennas::PinHandler();
+ leds = new Antennas::Leds(scheduler_low);
+ ok &= manager.insert(sma);
+ ok &= manager.insert(actuators);
+ ok &= manager.insert(sensors);
+ ok &= manager.insert(leds);
+ ok &= manager.insert(pinHandler);
+
if (dipRead.isARP)
{
- LOG_DEBUG(logger, "[debug] Starting as ARP Ground Station\n");
- leds = new Antennas::Leds(scheduler_low);
- hub = new Antennas::Hub();
- actuators = new Antennas::Actuators();
- sensors = new Antennas::Sensors();
- sma = new Antennas::SMA(scheduler_high);
- pinHandler = new Antennas::PinHandler();
-
- ok &= manager.insert(sma);
+ hub = new Antennas::Hub();
ok &= manager.insert<HubBase>(hub);
- ok &= manager.insert(actuators);
- ok &= manager.insert(sensors);
- ok &= manager.insert(leds);
- ok &= manager.insert(pinHandler);
}
// Ground station module insertion
else
--
GitLab