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

v1.17.0 #327

Merged
muellerr merged 131 commits from develop into main 2022-11-28 18:29:31 +01:00
Conversation 0 Commits 131 Files Changed 69 +23 -8
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4bf22f689a - Show all commits

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

@ -226,7 +226,7 @@ static const size_t MAX_DATA_CAPACITY = 1016;
static const size_t MAX_PACKET_SIZE = 1024; static const size_t MAX_PACKET_SIZE = 1024;
static constexpr size_t MIN_PAYLOAD_LEN = SECONDARY_HEADER_LEN + CRC_LEN; static constexpr size_t MIN_PAYLOAD_LEN = SECONDARY_HEADER_LEN + CRC_LEN;
static constexpr size_t MIN_TC_LEN = ccsds::HEADER_LEN + MIN_PAYLOAD_LEN; static constexpr size_t MIN_TMTC_LEN = ccsds::HEADER_LEN + MIN_PAYLOAD_LEN;
static constexpr size_t PAYLOAD_OFFSET = ccsds::HEADER_LEN + SECONDARY_HEADER_LEN; static constexpr size_t PAYLOAD_OFFSET = ccsds::HEADER_LEN + SECONDARY_HEADER_LEN;
struct UpdateParams { struct UpdateParams {
@ -386,6 +386,25 @@ class TcBase : public ploc::SpTcBase {
} }
}; };
class TmBase: public ploc::SpTmReader {
public:
TmBase(const uint8_t* data, size_t maxSize): ploc::SpTmReader(data, maxSize) {
if(maxSize < MIN_TMTC_LEN) {
sif::error << "SupvTcBase::SupvTcBase: Passed buffer is too small" << std::endl;
}
}
uint8_t getServiceId() {
return getPacketData()[TIMESTAMP_LEN];
}
const uint8_t* getPayloadStart() {
return getPacketData() + SECONDARY_HEADER_LEN;
}
private:
};
class NoPayloadPacket : public TcBase { class NoPayloadPacket : public TcBase {
public: public:
NoPayloadPacket(TcParams params, uint16_t apid, uint8_t serviceId) NoPayloadPacket(TcParams params, uint16_t apid, uint8_t serviceId)

5
linux/devices/ploc/PlocSupvUartMan.cpp
View File

@ -859,8 +859,9 @@ ReturnValue_t PlocSupvHelper::handleEventBufferReception(ploc::SpTmReader& reade
file.close(); file.close();
return EVENT_BUFFER_REPLY_INVALID_APID; return EVENT_BUFFER_REPLY_INVALID_APID;
} }
file.write(reinterpret_cast<const char*>(reader.getPacketData()), // TODO: Fix
reader.getPayloadDataLength()); // file.write(reinterpret_cast<const char*>(reader.getPacketData()),
// reader.getPayloadDataLength());
} }
return result; return result;
} }

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

@ -102,11 +102,6 @@ class SpTmReader : public SpacePacketReader {
return setReadOnlyData(buf, maxSize); return setReadOnlyData(buf, maxSize);
} }
/**
* @brief Returns the payload data length (data field length without CRC)
*/
uint16_t getPayloadDataLength() { return getPacketDataLen() - 2; }
ReturnValue_t checkCrc() { ReturnValue_t checkCrc() {
if (CRC::crc16ccitt(getFullData(), getFullPacketLen()) != 0) { if (CRC::crc16ccitt(getFullData(), getFullPacketLen()) != 0) {
return returnvalue::FAILED; return returnvalue::FAILED;