eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

FSFW Update #22

Merged
meierj merged 6 commits from mueller/fsfw-update into eive/develop 2021-10-06 17:50:51 +02:00
Conversation 1 Commits 6 Files Changed 12 +141 -134
10 changed files with 141 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2124f36e36 - Show all commits

4
src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.cpp
View File

@ -5,13 +5,13 @@
#include <cstring>
TmPacketStoredPusA::TmPacketStoredPusA(store_address_t setAddress) :
TmPacketStoredPusA::TmPacketStoredPusA(store_address_t setAddress):
TmPacketStoredBase(setAddress), TmPacketPusA(nullptr){
}
TmPacketStoredPusA::TmPacketStoredPusA(uint16_t apid, uint8_t service,
uint8_t subservice, uint8_t packetSubcounter, const uint8_t *data,
uint32_t size, const uint8_t *headerData, uint32_t headerSize) :
uint32_t size, const uint8_t *headerData, uint32_t headerSize):
TmPacketPusA(nullptr) {
storeAddress.raw = StorageManagerIF::INVALID_ADDRESS;
if (not TmPacketStoredBase::checkAndSetStore()) {

2
src/fsfw/tmtcpacket/pus/tm/TmPacketStoredPusA.h
View File

@ -15,7 +15,7 @@
* packets in a store with the help of a storeAddress.
* @ingroup tmtcpackets
*/
class TmPacketStoredPusA :
class TmPacketStoredPusA:
public TmPacketStoredBase,
public TmPacketPusA {
public: