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

Update FSFW from upstream #71

Closed
muellerr wants to merge 1112 commits from development into eive/develop
pull from: development
merge into: eive:eive/develop
Conversation 0 Commits 1112 Files Changed 1041 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ece5ae59e4 - Show all commits

3
src/fsfw/serialize/SerialBufferAdapter.cpp
View File

@ -119,7 +119,8 @@ const uint8_t* SerialBufferAdapter<count_t>::getConstBuffer() const {
} }
template <typename count_t> template <typename count_t>
void SerialBufferAdapter<count_t>::setBuffer(const uint8_t* data, count_t len) { void SerialBufferAdapter<count_t>::setBuffer(uint8_t* data, count_t len) {
this->buffer = data;
this->constBuffer = data; this->constBuffer = data;
this->bufferLength = len; this->bufferLength = len;
} }

2
src/fsfw/tmtcservices/PusServiceBase.h
View File

@ -68,7 +68,7 @@ struct PsbParams {
* a suitable global distributor with the static ID @PusServiceBase::pusDistributor and * a suitable global distributor with the static ID @PusServiceBase::pusDistributor and
* register itself at that object. * register itself at that object.
*/ */
PUSDistributorIF* pusDistributor = nullptr; PusDistributorIF* pusDistributor = nullptr;
TimeWriterIF* timeStamper = nullptr; TimeWriterIF* timeStamper = nullptr;
}; };