all retval replacements
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
This commit is contained in:
@ -300,7 +300,7 @@ class ApidOnlyPacket : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket() {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
return calcCrc();
|
||||
@ -336,7 +336,7 @@ class MPSoCBootSelect : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint8_t mem = 0, uint8_t bp0 = 0, uint8_t bp1 = 0, uint8_t bp2 = 0) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(mem, bp0, bp1, bp2);
|
||||
@ -382,7 +382,7 @@ class EnableNvms : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint8_t nvm01, uint8_t nvm3) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(nvm01, nvm3);
|
||||
@ -412,11 +412,11 @@ class SetTimeRef : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(Clock::TimeOfDay_t* time) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
res = initPacket(time);
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
return calcCrc();
|
||||
@ -434,37 +434,37 @@ class SetTimeRef : public ploc::SpTcBase {
|
||||
ReturnValue_t result =
|
||||
SerializeAdapter::serialize(&milliseconds, &dataFieldPtr, &serializedSize, spParams.maxSize,
|
||||
SerializeIF::Endianness::BIG);
|
||||
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||
if (result != returnvalue::OK) {
|
||||
return result;
|
||||
}
|
||||
uint8_t second = static_cast<uint8_t>(time->second);
|
||||
result = SerializeAdapter::serialize(&second, &dataFieldPtr, &serializedSize, spParams.maxSize,
|
||||
SerializeIF::Endianness::BIG);
|
||||
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||
if (result != returnvalue::OK) {
|
||||
return result;
|
||||
}
|
||||
uint8_t minute = static_cast<uint8_t>(time->minute);
|
||||
result = SerializeAdapter::serialize(&minute, &dataFieldPtr, &serializedSize, spParams.maxSize,
|
||||
SerializeIF::Endianness::BIG);
|
||||
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||
if (result != returnvalue::OK) {
|
||||
return result;
|
||||
}
|
||||
uint8_t hour = static_cast<uint8_t>(time->hour);
|
||||
result = SerializeAdapter::serialize(&hour, &dataFieldPtr, &serializedSize, spParams.maxSize,
|
||||
SerializeIF::Endianness::BIG);
|
||||
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||
if (result != returnvalue::OK) {
|
||||
return result;
|
||||
}
|
||||
uint8_t day = static_cast<uint8_t>(time->day);
|
||||
result = SerializeAdapter::serialize(&day, &dataFieldPtr, &serializedSize, spParams.maxSize,
|
||||
SerializeIF::Endianness::BIG);
|
||||
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||
if (result != returnvalue::OK) {
|
||||
return result;
|
||||
}
|
||||
uint8_t month = static_cast<uint8_t>(time->month);
|
||||
result = SerializeAdapter::serialize(&month, &dataFieldPtr, &serializedSize, spParams.maxSize,
|
||||
SerializeIF::Endianness::BIG);
|
||||
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||
if (result != returnvalue::OK) {
|
||||
return result;
|
||||
}
|
||||
uint8_t year = static_cast<uint8_t>(time->year - 1900);
|
||||
@ -491,7 +491,7 @@ class SetBootTimeout : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint32_t timeout) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(timeout);
|
||||
@ -528,7 +528,7 @@ class SetRestartTries : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint8_t restartTries) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(restartTries);
|
||||
@ -562,7 +562,7 @@ class DisablePeriodicHkTransmission : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket() {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket();
|
||||
@ -602,7 +602,7 @@ class LatchupAlert : public ploc::SpTcBase {
|
||||
spParams.creator.setApid(APID_DISABLE_LATCHUP_ALERT);
|
||||
}
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(latchupId);
|
||||
@ -636,11 +636,11 @@ class SetAlertlimit : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint8_t latchupId, uint32_t dutycycle) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
res = initPacket(latchupId, dutycycle);
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
return calcCrc();
|
||||
@ -679,7 +679,7 @@ class SetAdcEnabledChannels : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint16_t ch) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(ch);
|
||||
@ -718,7 +718,7 @@ class SetAdcWindowAndStride : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint16_t windowSize, uint16_t stridingStepSize) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(windowSize, stridingStepSize);
|
||||
@ -758,7 +758,7 @@ class SetAdcThreshold : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint32_t threshold) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(threshold);
|
||||
@ -796,7 +796,7 @@ class RunAutoEmTests : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint8_t test) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(test);
|
||||
@ -844,7 +844,7 @@ class MramCmd : public ploc::SpTcBase {
|
||||
sif::debug << "WipeMram: Invalid action specified";
|
||||
}
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(start, stop);
|
||||
@ -892,7 +892,7 @@ class SetGpio : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint8_t port, uint8_t pin, uint8_t val) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(port, pin, val);
|
||||
@ -936,7 +936,7 @@ class ReadGpio : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint8_t port, uint8_t pin) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(port, pin);
|
||||
@ -982,7 +982,7 @@ class FactoryReset : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(Op op) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(op);
|
||||
@ -1020,7 +1020,7 @@ class SetShutdownTimeout : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint32_t timeout) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(timeout);
|
||||
@ -1059,7 +1059,7 @@ class CheckMemory : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint8_t memoryId, uint32_t startAddress, uint32_t length) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(memoryId, startAddress, length);
|
||||
@ -1114,7 +1114,7 @@ class WriteMemory : public ploc::SpTcBase {
|
||||
spParams.creator.setSeqCount(sequenceCount);
|
||||
initPacket(memoryId, startAddress, length, updateData);
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
return calcCrc();
|
||||
@ -1137,7 +1137,7 @@ class WriteMemory : public ploc::SpTcBase {
|
||||
}
|
||||
// To avoid crashes in this unexpected case
|
||||
ReturnValue_t result = checkPayloadLen();
|
||||
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||
if (result != returnvalue::OK) {
|
||||
return result;
|
||||
}
|
||||
size_t serializedSize = 6;
|
||||
@ -1155,7 +1155,7 @@ class WriteMemory : public ploc::SpTcBase {
|
||||
// a value of zero is added here
|
||||
data[updateDataLen + 1] = 0;
|
||||
}
|
||||
return HasReturnvaluesIF::RETURN_OK;
|
||||
return returnvalue::OK;
|
||||
}
|
||||
};
|
||||
|
||||
@ -1172,7 +1172,7 @@ class EraseMemory : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket(uint8_t memoryId, uint32_t startAddress, uint32_t length) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
initPacket(memoryId, startAddress, length);
|
||||
@ -1214,7 +1214,7 @@ class EnableAutoTm : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket() {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
payloadStart[0] = ENABLE;
|
||||
@ -1239,7 +1239,7 @@ class DisableAutoTm : public ploc::SpTcBase {
|
||||
|
||||
ReturnValue_t buildPacket() {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
payloadStart[0] = DISABLE;
|
||||
@ -1279,7 +1279,7 @@ class RequestLoggingData : public ploc::SpTcBase {
|
||||
*/
|
||||
ReturnValue_t buildPacket(Sa sa, uint8_t tpc = 0) {
|
||||
auto res = checkSizeAndSerializeHeader();
|
||||
if (res != result::OK) {
|
||||
if (res != returnvalue::OK) {
|
||||
return res;
|
||||
}
|
||||
payloadStart[0] = static_cast<uint8_t>(sa);
|
||||
@ -1305,7 +1305,7 @@ class VerificationReport : public ploc::SpTmReader {
|
||||
const uint8_t* refApidPtr = this->getPacketData();
|
||||
ReturnValue_t result =
|
||||
SerializeAdapter::deSerialize(&refApid, refApidPtr, &size, SerializeIF::Endianness::BIG);
|
||||
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||
if (result != returnvalue::OK) {
|
||||
sif::debug << "ExecutionReport: Failed to deserialize reference APID field" << std::endl;
|
||||
return result;
|
||||
}
|
||||
@ -1318,14 +1318,14 @@ class VerificationReport : public ploc::SpTmReader {
|
||||
const uint8_t* statusCodePtr = this->getPacketData() + OFFSET_STATUS_CODE;
|
||||
ReturnValue_t result = SerializeAdapter::deSerialize(&statusCode, statusCodePtr, &size,
|
||||
SerializeIF::Endianness::BIG);
|
||||
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||
if (result != returnvalue::OK) {
|
||||
sif::debug << "ExecutionReport: Failed to deserialize status code field" << std::endl;
|
||||
return result;
|
||||
}
|
||||
return statusCode;
|
||||
}
|
||||
|
||||
virtual ReturnValue_t checkApid() { return HasReturnvaluesIF::RETURN_FAILED; }
|
||||
virtual ReturnValue_t checkApid() { return returnvalue::FAILED; }
|
||||
|
||||
private:
|
||||
static const uint8_t OFFSET_STATUS_CODE = 4;
|
||||
@ -1338,7 +1338,7 @@ class AcknowledgmentReport : public VerificationReport {
|
||||
ReturnValue_t checkApid() {
|
||||
uint16_t apid = this->getApid();
|
||||
if (apid == APID_ACK_SUCCESS) {
|
||||
return HasReturnvaluesIF::RETURN_OK;
|
||||
return returnvalue::OK;
|
||||
} else if (apid == APID_ACK_FAILURE) {
|
||||
printStatusInformation();
|
||||
return SupvReturnValuesIF::RECEIVED_ACK_FAILURE;
|
||||
@ -1412,7 +1412,7 @@ class ExecutionReport : public VerificationReport {
|
||||
ReturnValue_t checkApid() {
|
||||
uint16_t apid = this->getApid();
|
||||
if (apid == APID_EXE_SUCCESS) {
|
||||
return HasReturnvaluesIF::RETURN_OK;
|
||||
return returnvalue::OK;
|
||||
} else if (apid == APID_EXE_FAILURE) {
|
||||
printStatusInformation();
|
||||
return SupvReturnValuesIF::RECEIVED_EXE_FAILURE;
|
||||
@ -1844,7 +1844,7 @@ class UpdateStatusReport : public ploc::SpTmReader {
|
||||
|
||||
ReturnValue_t parseDataField() {
|
||||
ReturnValue_t result = lengthCheck();
|
||||
if (result != HasReturnvaluesIF::RETURN_OK) {
|
||||
if (result != returnvalue::OK) {
|
||||
return result;
|
||||
}
|
||||
const uint8_t* dataFieldPtr = getFullData() + ccsds::HEADER_LEN;
|
||||
@ -1855,14 +1855,14 @@ class UpdateStatusReport : public ploc::SpTmReader {
|
||||
SerializeIF::Endianness::BIG);
|
||||
SerializeAdapter::deSerialize(&length, &dataFieldPtr, &size, SerializeIF::Endianness::BIG);
|
||||
SerializeAdapter::deSerialize(&crc, &dataFieldPtr, &size, SerializeIF::Endianness::BIG);
|
||||
return HasReturnvaluesIF::RETURN_OK;
|
||||
return returnvalue::OK;
|
||||
}
|
||||
|
||||
ReturnValue_t verifycrc(uint16_t goodCrc) const {
|
||||
if (crc != goodCrc) {
|
||||
return SupvReturnValuesIF::UPDATE_CRC_FAILURE;
|
||||
}
|
||||
return HasReturnvaluesIF::RETURN_OK;
|
||||
return returnvalue::OK;
|
||||
}
|
||||
|
||||
uint16_t getCrc() const { return crc; }
|
||||
@ -1883,7 +1883,7 @@ class UpdateStatusReport : public ploc::SpTmReader {
|
||||
if (getFullPacketLen() != FULL_SIZE) {
|
||||
return SupvReturnValuesIF::UPDATE_STATUS_REPORT_INVALID_LENGTH;
|
||||
}
|
||||
return HasReturnvaluesIF::RETURN_OK;
|
||||
return returnvalue::OK;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user