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

a new issue
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2023-02-19 15:28:59 +01:00
parent ffebe00f93
commit f945252d3c
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mission/devices/ImtqHandler.cpp
View File

@ -184,7 +184,8 @@ ReturnValue_t ImtqHandler::scanForReply(const uint8_t* start, size_t remainingSi
} }
ReturnValue_t ImtqHandler::interpretDeviceReply(DeviceCommandId_t id, const uint8_t* packet) { ReturnValue_t ImtqHandler::interpretDeviceReply(DeviceCommandId_t id, const uint8_t* packet) {
ReturnValue_t result = returnvalue::OK; ReturnValue_t result;
ReturnValue_t status = returnvalue::OK;
// arrayprinter::print(packet, ImtqReplies::BASE_LEN); // arrayprinter::print(packet, ImtqReplies::BASE_LEN);
if (requestStep == imtq::RequestType::MEASURE) { if (requestStep == imtq::RequestType::MEASURE) {
requestStep = imtq::RequestType::ACTUATE; requestStep = imtq::RequestType::ACTUATE;
@ -194,6 +195,8 @@ ReturnValue_t ImtqHandler::interpretDeviceReply(DeviceCommandId_t id, const uint
result = parseStatusByte(imtq::CC::GET_ENG_HK_DATA, engHkReply); result = parseStatusByte(imtq::CC::GET_ENG_HK_DATA, engHkReply);
if (result == returnvalue::OK) { if (result == returnvalue::OK) {
fillEngHkDataset(hkDatasetNoTorque, engHkReply); fillEngHkDataset(hkDatasetNoTorque, engHkReply);
} else {
status = result;
} }
} }
@ -202,6 +205,8 @@ ReturnValue_t ImtqHandler::interpretDeviceReply(DeviceCommandId_t id, const uint
result = parseStatusByte(imtq::CC::GET_SYSTEM_STATE, sysStateReply); result = parseStatusByte(imtq::CC::GET_SYSTEM_STATE, sysStateReply);
if (result == returnvalue::OK) { if (result == returnvalue::OK) {
fillSystemStateIntoDataset(sysStateReply); fillSystemStateIntoDataset(sysStateReply);
} else {
status = result;
} }
} }
if (replies.wasGetRawMgmMeasurementRead()) { if (replies.wasGetRawMgmMeasurementRead()) {
@ -209,6 +214,8 @@ ReturnValue_t ImtqHandler::interpretDeviceReply(DeviceCommandId_t id, const uint
result = parseStatusByte(imtq::CC::GET_RAW_MTM_MEASUREMENT, rawMgmMeasurement); result = parseStatusByte(imtq::CC::GET_RAW_MTM_MEASUREMENT, rawMgmMeasurement);
if (result == returnvalue::OK) { if (result == returnvalue::OK) {
fillRawMtmDataset(rawMgmMeasurement); fillRawMtmDataset(rawMgmMeasurement);
} else {
status = result;
} }
} }
@ -217,6 +224,8 @@ ReturnValue_t ImtqHandler::interpretDeviceReply(DeviceCommandId_t id, const uint
result = parseStatusByte(imtq::CC::GET_CAL_MTM_MEASUREMENT, calibMgmMeasurement); result = parseStatusByte(imtq::CC::GET_CAL_MTM_MEASUREMENT, calibMgmMeasurement);
if (result == returnvalue::OK) { if (result == returnvalue::OK) {
fillRawMtmDataset(calibMgmMeasurement); fillRawMtmDataset(calibMgmMeasurement);
} else {
status = result;
} }
} }
} else { } else {
@ -230,6 +239,8 @@ ReturnValue_t ImtqHandler::interpretDeviceReply(DeviceCommandId_t id, const uint
result = parseStatusByte(imtq::CC::GET_RAW_MTM_MEASUREMENT, rawMgmMeasurement); result = parseStatusByte(imtq::CC::GET_RAW_MTM_MEASUREMENT, rawMgmMeasurement);
if (result == returnvalue::OK) { if (result == returnvalue::OK) {
fillRawMtmDataset(rawMgmMeasurement); fillRawMtmDataset(rawMgmMeasurement);
} else {
status = result;
} }
} }
if (replies.wasEngHkRead()) { if (replies.wasEngHkRead()) {
@ -237,12 +248,13 @@ ReturnValue_t ImtqHandler::interpretDeviceReply(DeviceCommandId_t id, const uint
result = parseStatusByte(imtq::CC::GET_ENG_HK_DATA, engHkReply); result = parseStatusByte(imtq::CC::GET_ENG_HK_DATA, engHkReply);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;
} else {
status = result;
} }
fillEngHkDataset(hkDatasetNoTorque, engHkReply); fillEngHkDataset(hkDatasetNoTorque, engHkReply);
} }
return returnvalue::FAILED;
} }
return returnvalue::OK; return status;
} }
LocalPoolDataSetBase* ImtqHandler::getDataSetHandle(sid_t sid) { LocalPoolDataSetBase* ImtqHandler::getDataSetHandle(sid_t sid) {