eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 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 +3 -5
4 changed files with 3 additions and 5 deletions
Show Stats 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

@ -1 +1 @@
Subproject commit 7e0a5d5a9e4f38c6d818bbdd5b44d34d8007eb1e Subproject commit 04122ffec58e0c0d5af8932f8cfd04781b3107df

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

@ -1 +1 @@
Subproject commit a7714747bc45dfa6a9ccb41cc6eb890b21ca0481 Subproject commit 6caf06248b73f9328c9069d627a5b387a3ac14b3