mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

updating code from Flying Laptop

Browse Source 
This is the framework of Flying Laptop OBSW version A.13.0.
This commit is contained in:
Ulrich Mohr
2018-07-12 16:29:32 +02:00
parent 1d22a6c97e
commit 575f70ba03
395 changed files with 12807 additions and 8404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
parameters/ParameterWrapper.cpp
View File

@ -114,7 +114,7 @@ ReturnValue_t ParameterWrapper::deSerializeData(uint8_t startingRow,
const uint8_t *fromAsStream = (const uint8_t *) from;
int32_t streamSize = fromRows * fromColumns * sizeof(T);
ReturnValue_t result;
ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
for (uint8_t fromRow = 0; fromRow < fromRows; fromRow++) {
@ -219,7 +219,7 @@ ReturnValue_t ParameterWrapper::copyFrom(const ParameterWrapper* from,
uint8_t typeSize = type.getSize();
ReturnValue_t result;
ReturnValue_t result = HasReturnvaluesIF::RETURN_FAILED;
//copy data
if (from->pointsToStream) {
switch (type) {
@ -271,5 +271,5 @@ ReturnValue_t ParameterWrapper::copyFrom(const ParameterWrapper* from,
}
}
return HasReturnvaluesIF::RETURN_OK;
return result;
}