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

v1.15.0 #311

Merged
muellerr merged 107 commits from develop into main 2022-10-27 11:28:49 +02:00
Conversation 0 Commits 107 Files Changed 81 +4 -9
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b6a5c8c854 - Show all commits

8
bsp_q7s/core/ObjectFactory.cpp
View File

@ -108,14 +108,6 @@ void Factory::setStaticFrameworkObjectIds() {
DeviceHandlerBase::powerSwitcherId = objects::PCDU_HANDLER; DeviceHandlerBase::powerSwitcherId = objects::PCDU_HANDLER;
#endif /* OBSW_Q7S_EM == 1 */ #endif /* OBSW_Q7S_EM == 1 */
//#if OBSW_TM_TO_PTME == 1
// TmFunnel::downlinkDestination = objects::CCSDS_HANDLER;
//#else
// TmFunnel::downlinkDestination = objects::TMTC_BRIDGE;
//#endif /* OBSW_TM_TO_PTME == 1 */
// // No storage object for now.
// TmFunnel::storageDestination = objects::NO_OBJECT;
LocalDataPoolManager::defaultHkDestination = objects::PUS_SERVICE_3_HOUSEKEEPING; LocalDataPoolManager::defaultHkDestination = objects::PUS_SERVICE_3_HOUSEKEEPING;
VerificationReporter::DEFAULT_RECEIVER = objects::PUS_SERVICE_1_VERIFICATION; VerificationReporter::DEFAULT_RECEIVER = objects::PUS_SERVICE_1_VERIFICATION;

5
mission/tmtc/PusTmFunnel.h
View File

@ -12,10 +12,13 @@
/** /**
* @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
* 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 * Main telemetry receiver. All generated telemetry is funneled into
* this object. * this object.
* @ingroup utility * @ingroup utility
* @author J. Meier * @author J. Meier, R. Mueller
*/ */
class PusTmFunnel : public AcceptsTelemetryIF, public SystemObject { class PusTmFunnel : public AcceptsTelemetryIF, public SystemObject {
public: public: