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

ACS Ctrl Action Cmds #401

Merged
muellerr merged 26 commits from eggert/acs-ctrl-action-cmds into develop 2023-02-24 15:51:08 +01:00
Conversation 1 Commits 26 Files Changed 31 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89230b60d7 - Show all commits

7
mission/controller/AcsController.cpp
View File

@ -265,9 +265,10 @@ void AcsController::performPointingCtrl() {
triggerEvent(acs::MEKF_INVALID_MODE_VIOLATION); triggerEvent(acs::MEKF_INVALID_MODE_VIOLATION);
} }
mekfInvalidCounter++; mekfInvalidCounter++;
commandActuators(0, 0, 0, acsParameters.magnetorquesParameter.torqueDuration, cmdSpeedRws[0], // commandActuators(0, 0, 0, acsParameters.magnetorquesParameter.torqueDuration,
cmdSpeedRws[1], cmdSpeedRws[2], cmdSpeedRws[3], // cmdSpeedRws[0],
acsParameters.rwHandlingParameters.rampTime); // cmdSpeedRws[1], cmdSpeedRws[2], cmdSpeedRws[3],
// acsParameters.rwHandlingParameters.rampTime);
return; return;
} else { } else {
mekfInvalidFlag = false; mekfInvalidFlag = false;