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

fixed conflicts

Browse Source
This commit is contained in:
Jakob Meier
2022-04-27 16:56:16 +02:00
parent 9301206485 7543a92dd9
commit 7682a1d214
28 changed files with 1286 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/config/OBSWVersion.h
View File

@ -4,7 +4,7 @@
const char* const SW_NAME = "eive";
#define SW_VERSION 1
#define SW_SUBVERSION 9
#define SW_SUBVERSION 10
#define SW_REVISION 1
#endif /* COMMON_CONFIG_OBSWVERSION_H_ */

1
common/config/commonConfig.cpp
View File

@ -2,4 +2,5 @@
#include "tmtc/apid.h"
#include "fsfw/tmtcpacket/SpacePacket.h"
const Version common::OBSW_VERSION { OBSW_VERSION_MAJOR, OBSW_VERSION_MINOR, OBSW_VERSION_REVISION, OBSW_VERSION_CST_GIT_SHA1 };
const uint16_t common::PUS_PACKET_ID = spacepacket::getTcSpacePacketIdFromApid(apid::EIVE_OBSW);

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

@ -2,6 +2,7 @@
#define COMMON_CONFIG_COMMONCONFIG_H_
#include <cstdint>
#include "fsfw/version.h"
#define OBSW_ADD_LWGPS_TEST 0
@ -15,6 +16,15 @@
#define OBSW_USE_TMTC_TCP_BRIDGE 1
namespace common {
static constexpr uint8_t OBSW_VERSION_MAJOR = @OBSW_VERSION_MAJOR@;
static constexpr uint8_t OBSW_VERSION_MINOR = @OBSW_VERSION_MINOR@;
static constexpr uint8_t OBSW_VERSION_REVISION = @OBSW_VERSION_REVISION@;
// CST: Commits since tag
static const char OBSW_VERSION_CST_GIT_SHA1[] = "@OBSW_VERSION_CST_GIT_SHA1@";
extern const Version OBSW_VERSION;
extern const uint16_t PUS_PACKET_ID;
static constexpr uint32_t CCSDS_HANDLER_QUEUE_SIZE = 50;