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

Merge branch 'meier/plocSupv' into meier/plocSupvUpdate

Browse Source
This commit is contained in:
Jakob Meier
2022-04-07 12:26:30 +02:00
parent c0fd9aee6f df2295b430
commit dbe4f70d8e
5 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
View File

@ -70,7 +70,8 @@ static const DeviceCommandId_t LATCHUP_REPORT = 54;
static const uint16_t SIZE_ACK_REPORT = 14;
static const uint16_t SIZE_EXE_REPORT = 14;
static const uint16_t SIZE_HK_REPORT = 52;
//static const uint16_t SIZE_HK_REPORT = 52;
static const uint16_t SIZE_HK_REPORT = 56;
static const uint16_t SIZE_BOOT_STATUS_REPORT = 24;
static const uint16_t SIZE_LATCHUP_STATUS_REPORT = 31;
@ -212,7 +213,7 @@ enum PoolIds : lp_id_t {
};
static const uint8_t HK_SET_ENTRIES = 13;
static const uint8_t BOOT_REPORT_SET_ENTRIES = 8;
static const uint8_t BOOT_REPORT_SET_ENTRIES = 10;
static const uint8_t LATCHUP_RPT_SET_ENTRIES = 16;
static const uint32_t HK_SET_ID = HK_REPORT;
@ -347,7 +348,7 @@ class SetTimeRef : public SpacePacket {
serializedSize = 0;
SerializeAdapter::serialize<uint8_t>(&month, &data_field_ptr, &serializedSize,
sizeof(time->month), SerializeIF::Endianness::BIG);
uint8_t year = static_cast<uint8_t>(time->year);
uint8_t year = static_cast<uint8_t>(time->year - 1900);
serializedSize = 0;
SerializeAdapter::serialize<uint8_t>(&year, &data_field_ptr, &serializedSize,
sizeof(time->year), SerializeIF::Endianness::BIG);