KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 3 Releases Wiki Activity

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 +8 -7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0d47606229 - Show all commits

10
tmtcpacket/pus/TcPacketStored.cpp
View File

@ -20,9 +20,9 @@ TcPacketStored::TcPacketStored(uint8_t service, uint8_t subservice,
uint8_t* p_data = nullptr;
ReturnValue_t returnValue = this->store->getFreeElement(&this->storeAddress,
(TC_PACKET_MIN_SIZE + size), &p_data);
if (returnValue != this->store->RETURN_OK) {
sif::warning << "TcPacketStored: Could not get free element from store!"
<< std::endl;
if (returnValue != HasReturnvaluesIF::RETURN_OK) {
sif::warning << "TcPacketStored::TcPacketStored: Could not get "
"free element from store!" << std::endl;
return;
}
this->setData(p_data);
@ -57,9 +57,9 @@ ReturnValue_t TcPacketStored::deletePacket() {
}
bool TcPacketStored::checkAndSetStore() {
if (this->store == NULL) {
if (this->store == nullptr) {
this->store = objectManager->get<StorageManagerIF>(objects::TC_STORE);
if (this->store == NULL) {
if (this->store == nullptr) {
sif::error << "TcPacketStored::TcPacketStored: TC Store not found!"
<< std::endl;
return false;

5
tmtcpacket/pus/TmPacketStored.cpp
View File

@ -21,8 +21,9 @@ TmPacketStored::TmPacketStored(uint16_t apid, uint8_t service,
ReturnValue_t returnValue = store->getFreeElement(&storeAddress,
(TmPacketBase::TM_PACKET_MIN_SIZE + size + headerSize), &pData);
if (returnValue != store->RETURN_OK) {
sif::debug << "TM Packet Stored: Issue getting free storage" << std::endl;
if (returnValue != HasReturnvaluesIF::RETURN_OK) {
sif::debug << "TmPacketStored::TmPacketStored: "
"Issue getting free storage" << std::endl;
checkAndReportLostTm();
return;
}