eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2022-05-25 15:47:21 +02:00
parent 5d2a70b6c6 335d3ba3b0
commit 95121b5120
24 changed files with 255 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bsp_q7s/core/ObjectFactory.cpp
View File

@ -95,8 +95,7 @@
#include "mission/tmtc/VirtualChannel.h"
#include "mission/utility/TmFunnel.h"
ResetArgs RESET_ARGS_GNSS_0;
ResetArgs RESET_ARGS_GNSS_1;
ResetArgs RESET_ARGS_GNSS;
void Factory::setStaticFrameworkObjectIds() {
PusServiceBase::packetSource = objects::PUS_PACKET_DISTRIBUTOR;
@ -464,15 +463,11 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
#if OBSW_DEBUG_GPS == 1
debugGps = true;
#endif
RESET_ARGS_GNSS_1.gnss1 = true;
RESET_ARGS_GNSS_1.gpioComIF = gpioComIF;
RESET_ARGS_GNSS_1.waitPeriodMs = 100;
RESET_ARGS_GNSS_0.gnss1 = false;
RESET_ARGS_GNSS_0.gpioComIF = gpioComIF;
RESET_ARGS_GNSS_0.waitPeriodMs = 100;
auto gpsHandler0 =
RESET_ARGS_GNSS.gpioComIF = gpioComIF;
RESET_ARGS_GNSS.waitPeriodMs = 100;
auto gpsCtrl =
new GPSHyperionLinuxController(objects::GPS_CONTROLLER, objects::NO_OBJECT, debugGps);
gpsHandler0->setResetPinTriggerFunction(gps::triggerGpioResetPin, &RESET_ARGS_GNSS_0);
gpsCtrl->setResetPinTriggerFunction(gps::triggerGpioResetPin, &RESET_ARGS_GNSS);
AcsBoardHelper acsBoardHelper = AcsBoardHelper(
objects::MGM_0_LIS3_HANDLER, objects::MGM_1_RM3100_HANDLER, objects::MGM_2_LIS3_HANDLER,