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

start replacing chained locks #372

Merged
muellerr merged 4 commits from awesome_acs_branch into develop 2023-02-08 17:52:08 +01:00
Conversation 1 Commits 4 Files Changed 4 +11 -11
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d12d5f144 - Show all commits

18
mission/controller/AcsController.cpp
View File

@ -254,8 +254,6 @@ void AcsController::performDetumble() {
}
void AcsController::performPointingCtrl() {
ACS::SensorValues sensorValues;
timeval now;
Clock::getClock_timeval(&now);
@ -717,14 +715,6 @@ void AcsController::copySusData() {
}
}
ReturnValue_t AcsController::initialize() {
ReturnValue_t result = parameterHelper.initialize();
if (result != returnvalue::OK) {
return result;
}
return ExtendedControllerBase::initialize();
}
void AcsController::copyGyrData() {
ACS::SensorValues sensorValues;
{
@ -772,3 +762,11 @@ void AcsController::copyGyrData() {
}
}
}
ReturnValue_t AcsController::initialize() {
ReturnValue_t result = parameterHelper.initialize();
if (result != returnvalue::OK) {
return result;
}
return ExtendedControllerBase::initialize();
}

4
mission/controller/AcsController.h
View File

@ -38,7 +38,6 @@ class AcsController : public ExtendedControllerBase, public ReceivesParameterMes
private:
AcsParameters acsParameters;
ACS::SensorValues sensorValues;
SensorProcessing sensorProcessing;
Navigation navigation;
ActuatorCmd actuatorCmd;
@ -70,6 +69,9 @@ class AcsController : public ExtendedControllerBase, public ReceivesParameterMes
void modeChanged(Mode_t mode, Submode_t submode);
void announceMode(bool recursive);
/* ACS Sensor Values */
ACS::SensorValues sensorValues;
/* ACS Datasets */
IMTQ::DipoleActuationSet dipoleSet = IMTQ::DipoleActuationSet(objects::IMTQ_HANDLER);
// MGMs