start replacing chained locks #372

Merged
muellerr merged 4 commits from awesome_acs_branch into develop 2023-02-08 17:52:08 +01:00
3 changed files with 40 additions and 28 deletions
Showing only changes of commit 1d12d5f144 - Show all commits

View File

@@ -254,8 +254,6 @@ void AcsController::performDetumble() {
} }
void AcsController::performPointingCtrl() { void AcsController::performPointingCtrl() {
ACS::SensorValues sensorValues;
timeval now; timeval now;
Clock::getClock_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() { void AcsController::copyGyrData() {
ACS::SensorValues sensorValues; 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();
}

View File

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