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

forgot some git merge conflicts
All checks were successful
EIVE/eive-obsw/pipeline/pr-v2.1.0-dev This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-05-15 10:16:34 +02:00
parent af77d083fa
commit 770697d5d0
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
linux/payload/plocMpscoDefs.h
View File

@ -127,10 +127,7 @@ static const uint16_t ACK_FAILURE = 0x401;
static const uint16_t EXE_SUCCESS = 0x402; static const uint16_t EXE_SUCCESS = 0x402;
static const uint16_t EXE_FAILURE = 0x403; static const uint16_t EXE_FAILURE = 0x403;
static const uint16_t TM_MEMORY_READ_REPORT = 0x404; static const uint16_t TM_MEMORY_READ_REPORT = 0x404;
<<<<<<< HEAD
static const uint16_t TM_FLASH_READ_REPORT = 0x405; static const uint16_t TM_FLASH_READ_REPORT = 0x405;
=======
>>>>>>> origin/v2.1.0-dev
static constexpr uint16_t TM_FLASH_DIRECTORY_CONTENT = 0x406; static constexpr uint16_t TM_FLASH_DIRECTORY_CONTENT = 0x406;
static const uint16_t TM_CAM_CMD_RPT = 0x407; static const uint16_t TM_CAM_CMD_RPT = 0x407;
static constexpr uint16_t TM_HK_GET_REPORT = 0x408; static constexpr uint16_t TM_HK_GET_REPORT = 0x408;
@ -675,21 +672,13 @@ class TcGetDirContent : public TcBase {
ReturnValue_t initPacket(const uint8_t* commandData, size_t commandDataLen) { ReturnValue_t initPacket(const uint8_t* commandData, size_t commandDataLen) {
ReturnValue_t result = returnvalue::OK; ReturnValue_t result = returnvalue::OK;
<<<<<<< HEAD
spParams.setFullPayloadLen(commandDataLen + sizeof(NULL_TERMINATOR) + CRC_SIZE);
=======
// Yeah it needs to be 256.. even if the path is shorter. // Yeah it needs to be 256.. even if the path is shorter.
spParams.setFullPayloadLen(256 + CRC_SIZE); spParams.setFullPayloadLen(256 + CRC_SIZE);
>>>>>>> origin/v2.1.0-dev
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;
} }
std::memcpy(payloadStart, commandData, commandDataLen); std::memcpy(payloadStart, commandData, commandDataLen);
<<<<<<< HEAD
*(payloadStart + commandDataLen) = NULL_TERMINATOR;
=======
payloadStart[255] = '\0'; payloadStart[255] = '\0';
>>>>>>> origin/v2.1.0-dev
return result; return result;
} }
}; };