This commit is contained in:
@ -588,7 +588,7 @@ ReturnValue_t PlocSupervisorHandler::scanForReply(const uint8_t* start, size_t r
|
||||
tmReader.setData(start, remainingSize);
|
||||
sif::debug << "PlocSupervisorHandler::scanForReply: Received Packet" << std::endl;
|
||||
arrayprinter::print(start, remainingSize);
|
||||
uint16_t apid = tmReader.getApid(); //(*(start) << 8 | *(start + 1)) & APID_MASK;
|
||||
uint16_t apid = tmReader.getModuleApid();
|
||||
|
||||
switch (apid) {
|
||||
case (Apid::TMTC_MAN): {
|
||||
|
@ -583,7 +583,7 @@ ReturnValue_t PlocSupvUartManager::handlePacketTransmissionNoReply(
|
||||
if (result != returnvalue::OK) {
|
||||
continue;
|
||||
}
|
||||
if (tmReader.getApid() == Apid::TMTC_MAN) {
|
||||
if (tmReader.getModuleApid() == Apid::TMTC_MAN) {
|
||||
uint8_t serviceId = tmReader.getServiceId();
|
||||
int retval = 0;
|
||||
if (not ackReceived) {
|
||||
@ -769,7 +769,7 @@ ReturnValue_t PlocSupvUartManager::handleCheckMemoryCommand() {
|
||||
continue;
|
||||
}
|
||||
packetWasHandled = false;
|
||||
if (tmReader.getApid() == Apid::TMTC_MAN) {
|
||||
if (tmReader.getModuleApid() == Apid::TMTC_MAN) {
|
||||
uint8_t serviceId = tmReader.getServiceId();
|
||||
int retval = 0;
|
||||
if (not ackReceived) {
|
||||
@ -790,7 +790,7 @@ ReturnValue_t PlocSupvUartManager::handleCheckMemoryCommand() {
|
||||
return returnvalue::FAILED;
|
||||
}
|
||||
}
|
||||
} else if (tmReader.getApid() == Apid::MEM_MAN) {
|
||||
} else if (tmReader.getModuleApid() == Apid::MEM_MAN) {
|
||||
if (ackReceived) {
|
||||
supv::UpdateStatusReport report(tmReader);
|
||||
result = report.parse();
|
||||
@ -1149,6 +1149,7 @@ int PlocSupvUartManager::removeHdlcFramingWithCrcCheck(const uint8_t* src, size_
|
||||
if (calcCrc != crc) {
|
||||
return 1;
|
||||
}
|
||||
// This does not work because the CRC is little endian
|
||||
// if(calc_crc16_buff_reflected(dst, tlen) != 0) {
|
||||
// return 1;
|
||||
// }
|
||||
|
Reference in New Issue
Block a user