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

added remaining missing stores
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-12-14 10:54:18 +01:00
parent 58d6b59b7c
commit ff9bcd6b14
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/config/eive/objects.h
View File

@ -146,9 +146,10 @@ enum commonObjects : uint32_t {
CFDP_TM_FUNNEL = 0x73000102, CFDP_TM_FUNNEL = 0x73000102,
CFDP_HANDLER = 0x73000205, CFDP_HANDLER = 0x73000205,
CFDP_DISTRIBUTOR = 0x73000206, CFDP_DISTRIBUTOR = 0x73000206,
MISC_STORE = 0x73020001, MISC_TM_STORE = 0x73020001,
OK_STORE = 0x73020002, OK_TM_STORE = 0x73020002,
NOT_OK_STORE = 0x73020003, NOT_OK_TM_STORE = 0x73020003,
HK_TM_STORE = 0x73020004
}; };
} }

18
mission/tmtc/PusTmFunnel.cpp
View File

@ -10,22 +10,34 @@ PusTmFunnel::PusTmFunnel(object_id_t objectId, TimeReaderIF &timeReader, Storage
SdCardMountedIF &sdcMan, uint32_t messageDepth) SdCardMountedIF &sdcMan, uint32_t messageDepth)
: TmFunnelBase(objectId, tmStore, messageDepth), : TmFunnelBase(objectId, tmStore, messageDepth),
timeReader(timeReader), timeReader(timeReader),
miscStore(objects::MISC_STORE, "tm", "misc", RolloverInterval::HOURLY, 8, currentTv, sdcMan), miscStore(objects::MISC_TM_STORE, "tm", "misc", RolloverInterval::HOURLY, 2, currentTv,
okStore(objects::OK_STORE, "tm", "ok", RolloverInterval::MINUTELY, 30, currentTv, sdcMan),
notOkStore(objects::NOT_OK_STORE, "tm", "nok", RolloverInterval::MINUTELY, 30, currentTv,
sdcMan), sdcMan),
okStore(objects::OK_TM_STORE, "tm", "ok", RolloverInterval::MINUTELY, 30, currentTv, sdcMan),
notOkStore(objects::NOT_OK_TM_STORE, "tm", "nok", RolloverInterval::MINUTELY, 30, currentTv,
sdcMan),
hkStore(objects::HK_TM_STORE, "tm", "hk", RolloverInterval::MINUTELY, 15, currentTv, sdcMan),
sdcMan(sdcMan) { sdcMan(sdcMan) {
Clock::getClock_timeval(&currentTv); Clock::getClock_timeval(&currentTv);
Clock::getUptime(&lastTvUpdate); Clock::getUptime(&lastTvUpdate);
miscStore.addApid(config::EIVE_PUS_APID); miscStore.addApid(config::EIVE_PUS_APID);
miscStore.addService(17); miscStore.addService(17);
miscStore.addService(200);
okStore.addApid(config::EIVE_PUS_APID); okStore.addApid(config::EIVE_PUS_APID);
okStore.addServiceSubservice(5, 1); okStore.addServiceSubservice(5, 1);
okStore.addApid(config::EIVE_PUS_APID); okStore.addApid(config::EIVE_PUS_APID);
okStore.addService(8);
okStore.addServiceSubservice(1, 1); okStore.addServiceSubservice(1, 1);
okStore.addServiceSubservice(1, 3); okStore.addServiceSubservice(1, 3);
okStore.addServiceSubservice(1, 5); okStore.addServiceSubservice(1, 5);
okStore.addServiceSubservice(1, 7); okStore.addServiceSubservice(1, 7);
notOkStore.addApid(config::EIVE_PUS_APID);
notOkStore.addServiceSubservice(5, 2);
notOkStore.addServiceSubservice(5, 3);
notOkStore.addServiceSubservice(5, 4);
notOkStore.addServiceSubservice(1, 2);
notOkStore.addServiceSubservice(1, 4);
notOkStore.addServiceSubservice(1, 6);
notOkStore.addServiceSubservice(1, 8);
} }
PusTmFunnel::~PusTmFunnel() = default; PusTmFunnel::~PusTmFunnel() = default;

7
mission/tmtc/PusTmFunnel.h
View File

@ -16,11 +16,7 @@
/** /**
* @brief TM Recipient. * @brief TM Recipient.
* @details * @details
* TODO: Add support for TM storage by using the (or a) LIVE flag provided by the CCSDS or Syrlinks * Main telemetry receiver. All generated telemetry is funneled into this object.
* handler. If we are in LIVE TM mode, forward TM to downlink destination directly. Otherwise,
* forward to TM storage backend which stores TMs into files.
* Main telemetry receiver. All generated telemetry is funneled into
* this object.
* @ingroup utility * @ingroup utility
* @author J. Meier, R. Mueller * @author J. Meier, R. Mueller
*/ */
@ -45,6 +41,7 @@ class PusTmFunnel : public TmFunnelBase {
TmStore miscStore; TmStore miscStore;
TmStore okStore; TmStore okStore;
TmStore notOkStore; TmStore notOkStore;
TmStore hkStore;
SdCardMountedIF &sdcMan; SdCardMountedIF &sdcMan;
ReturnValue_t handlePacket(TmTcMessage &message); ReturnValue_t handlePacket(TmTcMessage &message);