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

wip

Browse Source
This commit is contained in:
Jakob Meier 2021-04-16 18:59:48 +02:00
parent e2242ed526
commit cc075844fd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mission/devices/PlocHandler.cpp
View File

@ -89,7 +89,7 @@ ReturnValue_t PlocHandler::prepareTcMemReadCommand(const uint8_t * commandData,
void PlocHandler::fillCommandAndReplyMap() { void PlocHandler::fillCommandAndReplyMap() {
this->insertInCommandAndReplyMap(PLOC::TC_MEM_WRITE, 1, nullptr, PLOC::SIZE_ACK_REPORT); this->insertInCommandAndReplyMap(PLOC::TC_MEM_WRITE, 1, nullptr, PLOC::SIZE_ACK_REPORT);
this->insertInCommandAndReplyMap(PLOC::TC_MEM_READ, 1, nullptr, PLOC::SIZE_ACK_REPORT); this->insertInCommandAndReplyMap(PLOC::TC_MEM_READ, 1, nullptr, PLOC::SIZE_TC_MEM_READ_REPLY);
} }
ReturnValue_t PlocHandler::scanForReply(const uint8_t *start, ReturnValue_t PlocHandler::scanForReply(const uint8_t *start,
@ -198,7 +198,7 @@ ReturnValue_t PlocHandler::receiveExecutionReport() {
result = handleExecutionReport(receivedData, receivedDataLen); result = handleExecutionReport(receivedData, receivedDataLen);
} }
void PlocHandler::handleExecutionReport(const uint8_t* receivedData, size_t receivedDataLen) { ReturnValue_t PlocHandler::handleExecutionReport(const uint8_t* receivedData, size_t receivedDataLen) {
uint16_t apid = (*(receivedData) << 8 | *(receivedData + 1)) & APID_MASK; uint16_t apid = (*(receivedData) << 8 | *(receivedData + 1)) & APID_MASK;

5
mission/devices/devicedefinitions/PlocDefinitions.h
View File

@ -15,6 +15,9 @@ namespace PLOC {
static const uint16_t SIZE_EXE_REPORT = 14; static const uint16_t SIZE_EXE_REPORT = 14;
static const uint16_t SIZE_TM_MEM_READ_REPORT = 18; static const uint16_t SIZE_TM_MEM_READ_REPORT = 18;
/** Reply comprises one ack report, the telemetry packet and the execution report */
static const uint16_t SIZE_TC_MEM_READ_REPLY = 49;
/** /**
* SpacePacket apids of PLOC telecommands and telemetry. * SpacePacket apids of PLOC telecommands and telemetry.
*/ */
@ -33,7 +36,7 @@ namespace PLOC {
static const uint16_t LENGTH_TC_MEM_WRITE = 12; static const uint16_t LENGTH_TC_MEM_WRITE = 12;
static const uint16_t LENGTH_TC_MEM_READ = 8; static const uint16_t LENGTH_TC_MEM_READ = 8;
static const size_t MAX_REPLY_SIZE = SIZE_TM_MEM_READ_REPORT; static const size_t MAX_REPLY_SIZE = SIZE_TC_MEM_READ_REPLY;
static const size_t MAX_COMMAND_SIZE = 18; static const size_t MAX_COMMAND_SIZE = 18;
/** /**