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 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 46dcc18ddb - Show all commits

2
common/config/commonConfig.cpp
View File

@ -2,4 +2,4 @@
#include "tmtc/apid.h" #include "tmtc/apid.h"
#include "fsfw/tmtcpacket/SpacePacket.h" #include "fsfw/tmtcpacket/SpacePacket.h"
constexpr uint16_t common::PUS_PACKET_ID = spacepacket::getTcSpacePacketIdFromApid(apid::EIVE_OBSW); const uint16_t common::PUS_PACKET_ID = spacepacket::getTcSpacePacketIdFromApid(apid::EIVE_OBSW);

2
common/config/commonConfig.h.in
View File

@ -15,7 +15,7 @@
#define OBSW_USE_TCP_BRIDGE 1 #define OBSW_USE_TCP_BRIDGE 1
namespace common { namespace common {
extern const uint16_t TC_PACKET_ID; extern const uint16_t PUS_PACKET_ID;
static constexpr uint32_t CCSDS_HANDLER_QUEUE_SIZE = 50; static constexpr uint32_t CCSDS_HANDLER_QUEUE_SIZE = 50;
static constexpr uint8_t NUMBER_OF_VIRTUAL_CHANNELS = 4; static constexpr uint8_t NUMBER_OF_VIRTUAL_CHANNELS = 4;

2
fsfw

@ -1 +1 @@
Subproject commit e29606a2d07ff2fcad77e99493ec3765816e646b Subproject commit 15687f6f6e0ca284dbe502f082ef3ab2f0b27b71