eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge remote-tracking branch 'origin/develop' into irini
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2022-08-31 16:37:32 +02:00
commit 079fa04d69
7 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit 141dcb1f149b824b5bd6e5d3339ecb712835751e Subproject commit 2fa76d366325372e92a2188f71f143a485e652fc

2
linux/devices/startracker/StarTrackerHandler.cpp
View File

@ -1830,7 +1830,7 @@ ReturnValue_t StarTrackerHandler::handleChecksumReply() {
} }
PoolReadGuard rg(&checksumSet); PoolReadGuard rg(&checksumSet);
checksumSet.checksum = checksumReply.getChecksum(); checksumSet.checksum = checksumReply.getChecksum();
handleDeviceTm(util::DataWrapper(checksumSet), startracker::CHECKSUM); handleDeviceTm(checksumSet, startracker::CHECKSUM);
#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_STARTRACKER == 1 #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_STARTRACKER == 1
checksumReply.printChecksum(); checksumReply.printChecksum();
#endif /* OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_STARTRACKER == 1 */ #endif /* OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_STARTRACKER == 1 */

2
mission/devices/ACUHandler.cpp
View File

@ -43,7 +43,7 @@ void ACUHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pack
} }
void ACUHandler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) { void ACUHandler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) {
handleDeviceTm(util::DataWrapper(packet, ACU::CONFIG_TABLE_SIZE), id); handleDeviceTm(packet, ACU::CONFIG_TABLE_SIZE, id);
} }
LocalPoolDataSetBase *ACUHandler::getDataSetHandle(sid_t sid) { LocalPoolDataSetBase *ACUHandler::getDataSetHandle(sid_t sid) {

6
mission/devices/GomspaceDeviceHandler.cpp
View File

@ -177,9 +177,7 @@ ReturnValue_t GomspaceDeviceHandler::interpretDeviceReply(DeviceCommandId_t id,
switch (id) { switch (id) {
case (GOMSPACE::PING): { case (GOMSPACE::PING): {
SerializeElement<uint32_t> replyTime = *packet; SerializeElement<uint32_t> replyTime = *packet;
util::DataWrapper wrapper; handleDeviceTm(replyTime, true);
wrapper.setSerializable(replyTime);
handleDeviceTm(wrapper, id, true);
break; break;
} }
case (GOMSPACE::PARAM_GET): { case (GOMSPACE::PARAM_GET): {
@ -206,7 +204,7 @@ ReturnValue_t GomspaceDeviceHandler::interpretDeviceReply(DeviceCommandId_t id,
uint16_t address = cspGetParamReply.getAddress(); uint16_t address = cspGetParamReply.getAddress();
/* Pack relevant information into a tm packet */ /* Pack relevant information into a tm packet */
ParamReply paramReply(action, tableId, address, payloadLength, tempPayloadBuffer); ParamReply paramReply(action, tableId, address, payloadLength, tempPayloadBuffer);
handleDeviceTm(util::DataWrapper(paramReply), id, true); handleDeviceTm(paramReply, id, true);
break; break;
} }
case (GOMSPACE::PARAM_SET): { case (GOMSPACE::PARAM_SET): {

2
mission/devices/P60DockHandler.cpp
View File

@ -268,5 +268,5 @@ void P60DockHandler::printHkTableLatchups() {
void P60DockHandler::setDebugMode(bool enable) { this->debugMode = enable; } void P60DockHandler::setDebugMode(bool enable) { this->debugMode = enable; }
void P60DockHandler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) { void P60DockHandler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) {
handleDeviceTm(util::DataWrapper(packet, P60Dock::CONFIG_TABLE_SIZE), id); handleDeviceTm(packet, P60Dock::CONFIG_TABLE_SIZE, id);
} }

4
mission/devices/PDU1Handler.cpp
View File

@ -80,9 +80,7 @@ ReturnValue_t PDU1Handler::setParamCallback(SetParamMessageUnpacker &unpacker,
} }
void PDU1Handler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) { void PDU1Handler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) {
util::DataWrapper wrapper; handleDeviceTm(packet, PDU::CONFIG_TABLE_SIZE, id);
wrapper.setRawData({packet, PDU::CONFIG_TABLE_SIZE});
handleDeviceTm(wrapper, id);
} }
void PDU1Handler::parseHkTableReply(const uint8_t *packet) { void PDU1Handler::parseHkTableReply(const uint8_t *packet) {

4
mission/devices/PDU2Handler.cpp
View File

@ -25,9 +25,7 @@ void PDU2Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pac
} }
void PDU2Handler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) { void PDU2Handler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) {
util::DataWrapper wrapper; handleDeviceTm(packet, PDU::CONFIG_TABLE_SIZE, id);
wrapper.setRawData({packet, PDU::CONFIG_TABLE_SIZE});
handleDeviceTm(wrapper, id);
} }
void PDU2Handler::assignChannelHookFunction(GOMSPACE::ChannelSwitchHook hook, void *args) { void PDU2Handler::assignChannelHookFunction(GOMSPACE::ChannelSwitchHook hook, void *args) {