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

First Version of ACS Controller #329

Merged
muellerr merged 106 commits from acs-ctrl-v1 into develop 2022-12-02 16:21:58 +01:00
Conversation 0 Commits 106 Files Changed 50 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7be6bbc948 - Show all commits

4
mission/controller/acs/SensorProcessing.cpp
View File

@ -443,8 +443,8 @@ void SensorProcessing::processGps(const double gps0latitude, const double gps0lo
} }
} }
void SensorProcessing::process(acsctrl::SusDataRaw *susData, timeval now, void SensorProcessing::process(timeval now, ACS::SensorValues *sensorValues,
ACS::SensorValues *sensorValues, ACS::OutputValues *outputValues, ACS::OutputValues *outputValues,
const AcsParameters *acsParameters) { const AcsParameters *acsParameters) {
sensorValues->update(); sensorValues->update();
// processGps(sensorValues->gps0latitude, sensorValues->gps0longitude, sensorValues->gps0Valid, // processGps(sensorValues->gps0latitude, sensorValues->gps0longitude, sensorValues->gps0Valid,

3
mission/controller/acs/SensorProcessing.h
View File

@ -23,8 +23,7 @@ class SensorProcessing {
SensorProcessing(AcsParameters *acsParameters_); SensorProcessing(AcsParameters *acsParameters_);
virtual ~SensorProcessing(); virtual ~SensorProcessing();
void process(acsctrl::SusDataRaw *susData, timeval now, ACS::SensorValues *sensorValues, void process(timeval now, ACS::SensorValues *sensorValues, ACS::OutputValues *outputValues,
ACS::OutputValues *outputValues,
const AcsParameters *acsParameters); // Will call protected functions const AcsParameters *acsParameters); // Will call protected functions
private: private:
protected: protected: