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

IMTQ Assembly #420

Merged
muellerr merged 13 commits from feature_imtq_assy into develop 2023-03-06 13:57:42 +01:00
Conversation 0 Commits 13 Files Changed 20 +819 -732
20 changed files with 819 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 350b892bb7 - Show all commits

4
linux/devices/ImtqPollingTask.cpp
View File

@@ -149,7 +149,7 @@ void ImtqPollingTask::handleMeasureStep() {
if (i2cCmdExecMeasure(imtq::CC::GET_CAL_MTM_MEASUREMENT) != returnvalue::OK) { if (i2cCmdExecMeasure(imtq::CC::GET_CAL_MTM_MEASUREMENT) != returnvalue::OK) {
return; return;
} }
if(mgmMeasurementTooOld) { if (mgmMeasurementTooOld) {
sif::error << "IMTQ: MGM measurement too old" << std::endl; sif::error << "IMTQ: MGM measurement too old" << std::endl;
} }
return; return;
@@ -201,7 +201,7 @@ void ImtqPollingTask::handleActuateStep() {
return; return;
} }
if(measurementWasTooOld) { if (measurementWasTooOld) {
sif::error << "IMTQ: MGM measurement too old" << std::endl; sif::error << "IMTQ: MGM measurement too old" << std::endl;
} }
return; return;

9
mission/system/objects/ImtqAssembly.cpp
View File

@@ -4,7 +4,14 @@
using namespace returnvalue; using namespace returnvalue;
ImtqAssembly::ImtqAssembly(object_id_t objectId) : AssemblyBase(objectId) {} ImtqAssembly::ImtqAssembly(object_id_t objectId) : AssemblyBase(objectId) {
ModeListEntry entry;
entry.setObject(objects::IMTQ_HANDLER);
entry.setMode(MODE_OFF);
entry.setSubmode(SUBMODE_NONE);
entry.setInheritSubmode(false);
commandTable.insert(entry);
}
ReturnValue_t ImtqAssembly::commandChildren(Mode_t mode, Submode_t submode) { ReturnValue_t ImtqAssembly::commandChildren(Mode_t mode, Submode_t submode) {
commandTable[0].setMode(mode); commandTable[0].setMode(mode);

2
mission/system/tree/acsModeTree.cpp
View File

@@ -107,7 +107,7 @@ Subsystem& satsystem::acs::init() {
check(table.insert(entry), "satsystem::acs::init: generic target"); check(table.insert(entry), "satsystem::acs::init: generic target");
}; };
// Build TARGET PT transition 0 // Build TARGET PT transition 0
iht(objects::IMTQ_HANDLER, NML, 0, ACS_TABLE_PTG_TRANS_0.second); iht(objects::IMTQ_ASSY, NML, 0, ACS_TABLE_PTG_TRANS_0.second);
iht(objects::SUS_BOARD_ASS, NML, 0, ACS_TABLE_PTG_TRANS_0.second); iht(objects::SUS_BOARD_ASS, NML, 0, ACS_TABLE_PTG_TRANS_0.second);
iht(objects::ACS_BOARD_ASS, NML, 0, ACS_TABLE_PTG_TRANS_0.second); iht(objects::ACS_BOARD_ASS, NML, 0, ACS_TABLE_PTG_TRANS_0.second);
iht(objects::RW_ASSY, NML, 0, ACS_TABLE_PTG_TRANS_0.second); iht(objects::RW_ASSY, NML, 0, ACS_TABLE_PTG_TRANS_0.second);