eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

resolve some more merge conflicts

Browse Source
This commit is contained in:
Robin Müller 2023-03-15 11:48:50 +01:00
parent d0607824ad
commit 43fd0b2f59
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fsfw/pus/CServiceHealthCommanding.h
View File

@ -6,11 +6,7 @@
#include "fsfw/tmtcservices/CommandingServiceBase.h" #include "fsfw/tmtcservices/CommandingServiceBase.h"
struct HealthServiceCfg { struct HealthServiceCfg {
<<<<<<< HEAD
HealthServiceCfg(object_id_t objectId, uint16_t apid, HealthTable &healthTable,
=======
HealthServiceCfg(object_id_t objectId, uint16_t apid, object_id_t healthTable, HealthServiceCfg(object_id_t objectId, uint16_t apid, object_id_t healthTable,
>>>>>>> upstream/development
uint16_t maxNumHealthInfoPerCycle) uint16_t maxNumHealthInfoPerCycle)
: objectId(objectId), : objectId(objectId),
apid(apid), apid(apid),
@ -18,11 +14,7 @@ struct HealthServiceCfg {
maxNumHealthInfoPerCycle(maxNumHealthInfoPerCycle) {} maxNumHealthInfoPerCycle(maxNumHealthInfoPerCycle) {}
object_id_t objectId; object_id_t objectId;
uint16_t apid; uint16_t apid;
<<<<<<< HEAD
HealthTable &table;
=======
object_id_t table; object_id_t table;
>>>>>>> upstream/development
uint16_t maxNumHealthInfoPerCycle; uint16_t maxNumHealthInfoPerCycle;
uint8_t service = 201; uint8_t service = 201;
uint8_t numParallelCommands = 4; uint8_t numParallelCommands = 4;
@ -47,11 +39,8 @@ class CServiceHealthCommanding : public CommandingServiceBase {
public: public:
CServiceHealthCommanding(HealthServiceCfg args); CServiceHealthCommanding(HealthServiceCfg args);
~CServiceHealthCommanding() override = default; ~CServiceHealthCommanding() override = default;
<<<<<<< HEAD
=======
ReturnValue_t initialize() override; ReturnValue_t initialize() override;
>>>>>>> upstream/development
protected: protected:
/* CSB abstract function implementations */ /* CSB abstract function implementations */
@ -70,12 +59,8 @@ class CServiceHealthCommanding : public CommandingServiceBase {
void doPeriodicOperation() override; void doPeriodicOperation() override;
private: private:
<<<<<<< HEAD
HealthTable &healthTable;
=======
const object_id_t healthTableId; const object_id_t healthTableId;
HealthTable *healthTable; HealthTable *healthTable;
>>>>>>> upstream/development
uint16_t maxNumHealthInfoPerCycle = 0; uint16_t maxNumHealthInfoPerCycle = 0;
bool reportAllHealth = false; bool reportAllHealth = false;
ReturnValue_t iterateHealthTable(bool reset); ReturnValue_t iterateHealthTable(bool reset);