From 46dcc18ddbc67e1b2dfc84988066f16a500cd4ed Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 18 Oct 2021 18:23:26 +0200 Subject: [PATCH] updated constants --- common/config/commonConfig.cpp | 2 +- common/config/commonConfig.h.in | 2 +- fsfw | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/config/commonConfig.cpp b/common/config/commonConfig.cpp index 97690e09..31674512 100644 --- a/common/config/commonConfig.cpp +++ b/common/config/commonConfig.cpp @@ -2,4 +2,4 @@ #include "tmtc/apid.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); diff --git a/common/config/commonConfig.h.in b/common/config/commonConfig.h.in index 6dad37d5..c18d4bff 100644 --- a/common/config/commonConfig.h.in +++ b/common/config/commonConfig.h.in @@ -15,7 +15,7 @@ #define OBSW_USE_TCP_BRIDGE 1 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 uint8_t NUMBER_OF_VIRTUAL_CHANNELS = 4; diff --git a/fsfw b/fsfw index e29606a2..15687f6f 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit e29606a2d07ff2fcad77e99493ec3765816e646b +Subproject commit 15687f6f6e0ca284dbe502f082ef3ab2f0b27b71