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

PLOC SUPV Update to newer firmware #316

Merged
muellerr merged 99 commits from mueller/tas_ploc_supv_update into develop 2022-11-18 14:27:13 +01:00
Conversation 0 Commits 99 Files Changed 58 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cdadb02420 - Show all commits

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

@ -310,8 +310,8 @@ enum class TmtcManStatusCode : uint32_t {
BAD_SP_HEADER = 0x608 BAD_SP_HEADER = 0x608
}; };
static constexpr uint16_t APID_MASK_TC = 0x200; static constexpr uint16_t APID_MASK_TC = 0x80;
static constexpr uint16_t APID_MASK_TM = 0x400; static constexpr uint16_t APID_MASK_TM = 0x200;
static constexpr uint16_t APID_MODULE_MASK = 0x7F; static constexpr uint16_t APID_MODULE_MASK = 0x7F;
static const uint16_t SEQUENCE_COUNT_MASK = 0xFFF; static const uint16_t SEQUENCE_COUNT_MASK = 0xFFF;
@ -520,7 +520,8 @@ class TcBase : public ploc::SpTcBase {
} }
std::memset(spParams.buf + ccsds::HEADER_LEN, 0, TIMESTAMP_LEN); std::memset(spParams.buf + ccsds::HEADER_LEN, 0, TIMESTAMP_LEN);
payloadStart = spParams.buf + ccsds::HEADER_LEN + SECONDARY_HEADER_LEN; payloadStart = spParams.buf + ccsds::HEADER_LEN + SECONDARY_HEADER_LEN;
payloadStart[supv::PAYLOAD_OFFSET] = serviceId; spParams.buf[ccsds::HEADER_LEN + SECONDARY_HEADER_LEN - 1] = serviceId;
spParams.creator.setSecHeaderFlag();
return returnvalue::OK; return returnvalue::OK;
} }
}; };