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

re-run afmt
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2022-10-10 17:40:30 +02:00
parent 63d660119e
commit 0f57810a9a
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bsp_hosted/ObjectFactory.cpp
View File

@ -43,6 +43,7 @@
#include <dummies/SusDummy.h> #include <dummies/SusDummy.h>
#include <dummies/SyrlinksDummy.h> #include <dummies/SyrlinksDummy.h>
#include <dummies/TemperatureSensorsDummy.h> #include <dummies/TemperatureSensorsDummy.h>
#include "dummies/helpers.h" #include "dummies/helpers.h"
#include "mission/utility/GlobalConfigHandler.h" #include "mission/utility/GlobalConfigHandler.h"

5
bsp_q7s/core/ObjectFactory.cpp
View File

@ -1,8 +1,5 @@
#include "ObjectFactory.h" #include "ObjectFactory.h"
#include "mission/system/objects/AcsSubsystem.h"
#include "linux/devices/ScexUartReader.h"
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "bsp_q7s/boardtest/Q7STestTask.h" #include "bsp_q7s/boardtest/Q7STestTask.h"
#include "bsp_q7s/callbacks/gnssCallback.h" #include "bsp_q7s/callbacks/gnssCallback.h"
@ -24,6 +21,7 @@
#include "linux/callbacks/gpioCallbacks.h" #include "linux/callbacks/gpioCallbacks.h"
#include "linux/csp/CspComIF.h" #include "linux/csp/CspComIF.h"
#include "linux/devices/GPSHyperionLinuxController.h" #include "linux/devices/GPSHyperionLinuxController.h"
#include "linux/devices/ScexUartReader.h"
#include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h" #include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h" #include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
#include "linux/devices/ploc/PlocMPSoCHandler.h" #include "linux/devices/ploc/PlocMPSoCHandler.h"
@ -43,6 +41,7 @@
#include "mission/system/fdir/RtdFdir.h" #include "mission/system/fdir/RtdFdir.h"
#include "mission/system/fdir/SusFdir.h" #include "mission/system/fdir/SusFdir.h"
#include "mission/system/fdir/SyrlinksFdir.h" #include "mission/system/fdir/SyrlinksFdir.h"
#include "mission/system/objects/AcsSubsystem.h"
#include "mission/system/objects/RwAssembly.h" #include "mission/system/objects/RwAssembly.h"
#include "mission/system/objects/TcsBoardAssembly.h" #include "mission/system/objects/TcsBoardAssembly.h"
#include "mission/system/tree/acsModeTree.h" #include "mission/system/tree/acsModeTree.h"

2
linux/ObjectFactory.cpp
View File

@ -326,7 +326,7 @@ void ObjectFactory::createScexComponents(std::string uartDev, PowerSwitchIF* pwr
std::optional<power::Switch_t> switchId) { std::optional<power::Switch_t> switchId) {
auto* cookie = new UartCookie(objects::SCEX, uartDev, uart::SCEX_BAUD, 4096); auto* cookie = new UartCookie(objects::SCEX, uartDev, uart::SCEX_BAUD, 4096);
cookie->setTwoStopBits(); cookie->setTwoStopBits();
//cookie->setParityEven(); // cookie->setParityEven();
auto scexUartReader = new ScexUartReader(objects::SCEX_UART_READER); auto scexUartReader = new ScexUartReader(objects::SCEX_UART_READER);
auto scexHandler = new ScexDeviceHandler(objects::SCEX, *scexUartReader, cookie, mountedIF); auto scexHandler = new ScexDeviceHandler(objects::SCEX, *scexUartReader, cookie, mountedIF);
if (onImmediately) { if (onImmediately) {

6
mission/system/tree/acsModeTree.cpp
View File

@ -1,6 +1,6 @@
#include <fsfw/container/FixedMap.h>
#include "acsModeTree.h" #include "acsModeTree.h"
#include <fsfw/container/FixedMap.h>
#include <fsfw/devicehandlers/DeviceHandlerIF.h> #include <fsfw/devicehandlers/DeviceHandlerIF.h>
#include <fsfw/modes/HasModesIF.h> #include <fsfw/modes/HasModesIF.h>
#include <fsfw/subsystem/Subsystem.h> #include <fsfw/subsystem/Subsystem.h>
@ -386,9 +386,9 @@ void buildTargetPtSequence(Subsystem* ss, ModeListEntry& eh) {
void checkInsert(ReturnValue_t result, const char* ctx) { void checkInsert(ReturnValue_t result, const char* ctx) {
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
sif::warning << "satsystem::checkInsert: Insertion failed at " << ctx; sif::warning << "satsystem::checkInsert: Insertion failed at " << ctx;
if(result == mapdefs::KEY_ALREADY_EXISTS) { if (result == mapdefs::KEY_ALREADY_EXISTS) {
sif::warning << ": Key already exists" << std::endl; sif::warning << ": Key already exists" << std::endl;
} else if(result == mapdefs::MAP_FULL) { } else if (result == mapdefs::MAP_FULL) {
sif::warning << ": Map full" << std::endl; sif::warning << ": Map full" << std::endl;
} else { } else {
sif::warning << std::endl; sif::warning << std::endl;