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

v1.9.0 #175

Merged
muellerr merged 623 commits from develop into main 2022-03-08 10:32:41 +01:00
Conversation 0 Commits 623 Files Changed 417 +4 -2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3ca18a42ad - Show all commits

2
linux/fsfwconfig/OBSWConfig.h.in
View File

@ -131,6 +131,8 @@ static constexpr uint8_t VC1_QUEUE_SIZE = 50;
static constexpr uint8_t VC2_QUEUE_SIZE = 50; static constexpr uint8_t VC2_QUEUE_SIZE = 50;
static constexpr uint8_t VC3_QUEUE_SIZE = 50; static constexpr uint8_t VC3_QUEUE_SIZE = 50;
static constexpr uint8_t LIVE_TM = 0;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
linux/obc/Ptme.h
View File

@ -50,7 +50,7 @@ private:
#if BOARD_TE0720 == 1 #if BOARD_TE0720 == 1
/** Size of mapped address space */ /** Size of mapped address space */
static const int MAP_SIZE = 0x1000; static const int MAP_SIZE = 0x40000;
#else #else
/** Size of mapped address space */ /** Size of mapped address space */
static const int MAP_SIZE = 0x40000; static const int MAP_SIZE = 0x40000;

2
mission/utility/TmFunnel.cpp
View File

@ -101,7 +101,7 @@ ReturnValue_t TmFunnel::initialize() {
#if OBSW_TM_TO_PTME == 1 #if OBSW_TM_TO_PTME == 1
// Live TM will be sent via the virtual channel 0 // Live TM will be sent via the virtual channel 0
tmQueue->setDefaultDestination(tmTarget->getReportReceptionQueue(0)); tmQueue->setDefaultDestination(tmTarget->getReportReceptionQueue(config::LIVE_TM));
#else #else
tmQueue->setDefaultDestination(tmTarget->getReportReceptionQueue()); tmQueue->setDefaultDestination(tmTarget->getReportReceptionQueue());
#endif /* OBSW_TM_TO_PTME == 1 */ #endif /* OBSW_TM_TO_PTME == 1 */