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

srv 20 fixes

Browse Source
This commit is contained in:
Robin Müller 2021-06-13 17:58:44 +02:00
parent 8dc66784a8
commit 40a8c9a495
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pus/Service20ParameterManagement.cpp
View File

@ -133,6 +133,9 @@ ReturnValue_t Service20ParameterManagement::prepareLoadCommand(
store_address_t storeAddress; store_address_t storeAddress;
size_t parameterDataLen = tcDataLen - sizeof(object_id_t) - sizeof(ParameterId_t) - size_t parameterDataLen = tcDataLen - sizeof(object_id_t) - sizeof(ParameterId_t) -
sizeof(uint32_t); sizeof(uint32_t);
if(parameterDataLen == 0) {
return CommandingServiceBase::INVALID_TC;
}
ReturnValue_t result = IPCStore->getFreeElement(&storeAddress, ReturnValue_t result = IPCStore->getFreeElement(&storeAddress,
parameterDataLen, &storePointer); parameterDataLen, &storePointer);
if(result != HasReturnvaluesIF::RETURN_OK) { if(result != HasReturnvaluesIF::RETURN_OK) {

7
pus/servicepackets/Service20Packets.h
View File

@ -27,12 +27,11 @@ public:
ParameterCommand(uint8_t* storePointer, size_t parameterDataLen): ParameterCommand(uint8_t* storePointer, size_t parameterDataLen):
parameterBuffer(storePointer, parameterDataLen) { parameterBuffer(storePointer, parameterDataLen) {
#if FSFW_VERBOSE_LEVEL >= 1 #if FSFW_VERBOSE_LEVEL >= 1
if(parameterDataLen < sizeof(object_id_t) + sizeof(ParameterId_t) + 4) { if(parameterDataLen == 0) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "ParameterCommand: Parameter data length is less than 12!" sif::warning << "ParameterCommand: Parameter data length is 0" << std::endl;
<< std::endl;
#else #else
sif::printWarning("ParameterCommand: Parameter data length is less than 12!\n"); sif::printWarning("ParameterCommand: Parameter data length is 0!\n");
#endif #endif
} }
#endif /* FSFW_VERBOSE_LEVEL >= 1 */ #endif /* FSFW_VERBOSE_LEVEL >= 1 */