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

v1.14.0 #304

Merged
muellerr merged 366 commits from develop into main 2022-10-10 17:46:38 +02:00
Conversation 0 Commits 366 Files Changed 420 +6887 -19865
364 changed files with 6887 additions and 19865 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97f02401fe - Show all commits

2
bsp_q7s/fmObjectFactory.cpp
View File

@ -60,7 +60,7 @@ void ObjectFactory::produce(void* args) {
#endif /* OBSW_USE_CCSDS_IP_CORE == 1 */ #endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
#if OBSW_ADD_SCEX_DEVICE == 1 #if OBSW_ADD_SCEX_DEVICE == 1
createScexComponents(q7s::UART_GNSS_DEV, pwrSwitcher, *SdCardManager::instance(), false, createScexComponents(q7s::UART_SCEX_DEV, pwrSwitcher, *SdCardManager::instance(), false,
pcdu::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V); pcdu::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V);
#endif #endif
/* Test Task */ /* Test Task */

2
fsfw

Submodule fsfw updated: 7e0a5d5a9e...04122ffec5

2
linux/devices/ScexUartReader.cpp
View File

@ -171,8 +171,6 @@ void ScexUartReader::foundDlePacketHandler(const ScexDleParser::Context &ctx) {
} }
void ScexUartReader::handleFoundDlePacket(uint8_t *packet, size_t len) { void ScexUartReader::handleFoundDlePacket(uint8_t *packet, size_t len) {
// TODO: insert data into IPC ring buffer here
// sif::info << "Detected DLE encoded packet with decoded size " << len << std::endl;
MutexGuard mg(lock); MutexGuard mg(lock);
ReturnValue_t result = ipcQueue.insert(len); ReturnValue_t result = ipcQueue.insert(len);
if (result != OK) { if (result != OK) {

2
tmtc

Submodule tmtc updated: a7714747bc...6caf06248b