update done, compiles again
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...

This commit is contained in:
Robin Müller 2023-04-13 18:09:02 +02:00
parent 3ff8c6a481
commit 29dc684455
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
6 changed files with 11 additions and 9 deletions

View File

@ -1,7 +1,7 @@
#include "ArcsecDatalinkLayer.h" #include "ArcsecDatalinkLayer.h"
extern "C" { extern "C" {
#include <common/misc.h> #include <wire/common/misc.h>
} }
ArcsecDatalinkLayer::ArcsecDatalinkLayer() : decodeRingBuf(BUFFER_LENGTHS, true) { slipInit(); } ArcsecDatalinkLayer::ArcsecDatalinkLayer() : decodeRingBuf(BUFFER_LENGTHS, true) { slipInit(); }

View File

@ -9,7 +9,7 @@
#include "fsfw/returnvalues/returnvalue.h" #include "fsfw/returnvalues/returnvalue.h"
extern "C" { extern "C" {
#include <common/SLIP.h> #include <wire/common/SLIP.h>
} }
/** /**

View File

@ -4,7 +4,7 @@
#include <mission/acs/str/arcsecJsonKeys.h> #include <mission/acs/str/arcsecJsonKeys.h>
extern "C" { extern "C" {
#include <common/genericstructs.h> #include <wire/common/genericstructs.h>
} }
ArcsecJsonParamBase::ArcsecJsonParamBase(std::string setName) : setName(setName) {} ArcsecJsonParamBase::ArcsecJsonParamBase(std::string setName) : setName(setName) {}

View File

@ -4,16 +4,15 @@
#include <mission/acs/str/strHelpers.h> #include <mission/acs/str/strHelpers.h>
#include <mission/acs/str/strJsonCommands.h> #include <mission/acs/str/strJsonCommands.h>
#include <sagitta/client/actionreq.h> extern "C" {
#include <sagitta/client/parameter.h> #include <sagitta/client/arc_client.h>
#include <sagitta/client/telemetry.h> }
#include <atomic> #include <atomic>
#include <fstream> #include <fstream>
#include <thread> #include <thread>
#include "OBSWConfig.h" #include "OBSWConfig.h"
//#include "/common/misc.h"
std::atomic_bool JCFG_DONE(false); std::atomic_bool JCFG_DONE(false);

View File

@ -10,12 +10,15 @@
#include <thread> #include <thread>
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "common/SLIP.h"
#include "devices/powerSwitcherList.h" #include "devices/powerSwitcherList.h"
#include "fsfw/devicehandlers/DeviceHandlerBase.h" #include "fsfw/devicehandlers/DeviceHandlerBase.h"
#include "fsfw/src/fsfw/serialize/SerializeAdapter.h" #include "fsfw/src/fsfw/serialize/SerializeAdapter.h"
#include "fsfw/timemanager/Countdown.h" #include "fsfw/timemanager/Countdown.h"
extern "C" {
#include <wire/common/SLIP.h>
}
/** /**
* @brief This is the device handler for the star tracker from arcsec. * @brief This is the device handler for the star tracker from arcsec.
* *

@ -1 +1 @@
Subproject commit 3ab9b2cf56dea1cf19c7d46eb88a967939968acd Subproject commit 64332216c193fa6483258060b53fc2842c08dcf4