hosted build compiling again

linux/fsfwconfig/OBSWConfig.h.in

@@ -33,6 +33,12 @@ debugging. */
 //! All of this should be enabled for mission code!
 #if defined XIPHOS_Q7S
 
+#define OBSW_USE_CCSDS_IP_CORE                      1
+// Set to 1 if all telemetry should be sent to the PTME IP Core
+#define OBSW_TM_TO_PTME                             1
+// Set to 1 if telecommands are received via the PDEC IP Core
+#define OBSW_TC_FROM_PDEC                           0
+
 #define OBSW_ENABLE_TIMERS                          1
 #define OBSW_ADD_STAR_TRACKER                       0
 #define OBSW_ADD_PLOC_SUPERVISOR                    0
@@ -124,12 +130,6 @@ namespace config {
 /* Add mission configuration flags here */
 static constexpr uint32_t OBSW_FILESYSTEM_HANDLER_QUEUE_SIZE = 50;
 static constexpr uint32_t PLOC_UPDATER_QUEUE_SIZE = 50;
-static constexpr uint32_t CCSDS_HANDLER_QUEUE_SIZE = 50;
-static constexpr uint8_t NUMBER_OF_VIRTUAL_CHANNELS = 4;
-static constexpr uint8_t VC0_QUEUE_SIZE = 50;
-static constexpr uint8_t VC1_QUEUE_SIZE = 50;
-static constexpr uint8_t VC2_QUEUE_SIZE = 50;
-static constexpr uint8_t VC3_QUEUE_SIZE = 50;
 
 static constexpr uint8_t LIVE_TM = 0;
 

linux/obc/Ptme.cpp

@@ -5,8 +5,7 @@
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "PtmeConfig.h"
 
-Ptme::Ptme(object_id_t objectId) :
-        SystemObject(objectId) {
+Ptme::Ptme(object_id_t objectId): SystemObject(objectId) {
 }
 
 Ptme::~Ptme() {
@@ -54,7 +53,7 @@ ReturnValue_t Ptme::writeToVc(uint8_t vcId, const uint8_t * data, size_t size) {
 
 void Ptme::addVcInterface(VcId_t vcId, VcInterfaceIF* vc) {
 
-    if (vcId > config::NUMBER_OF_VIRTUAL_CHANNELS) {
+    if (vcId > common::NUMBER_OF_VIRTUAL_CHANNELS) {
         sif::warning << "Ptme::addVcInterface: Invalid virtual channel ID" << std::endl;
         return;
     }

linux/obc/Ptme.h

@@ -78,7 +78,7 @@ private:
     static const int PTME_DATA_REG_OFFSET = 256;
 
     /** The file descriptor of the UIO driver */
-    int fd;
+    int fd = 0;
 
     uint32_t* ptmeBaseAddress = nullptr;