fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master

This commit is contained in:
Robin Müller 2020-12-13 21:51:09 +01:00
parent b7dbdb072d b2d01a31c2
commit 62e16b13d3
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
power/Fuse.h
View File

@ -85,10 +85,7 @@ private:
};
PowerMonitor powerMonitor;
StaticLocalDataSet<3> set;
//LocalPoolDataSetBase* set = nullptr;
//PIDReader<float> voltage;
//PIDReader<float> current;
//PIDReader<uint8_t> state;
lp_var_t<float> voltage;
lp_var_t<float> current;
lp_var_t<uint8_t> state;

19
thermal/ThermalModule.cpp
View File

@ -256,15 +256,16 @@ bool ThermalModule::calculateModuleHeaterRequestAndSetModuleStatus(
}
void ThermalModule::setHeating(bool on) {
// GlobDataSet mySet;
// gp_int8_t writableTargetState(targetState.getDataPoolId(),
// &mySet, PoolVariableIF::VAR_WRITE);
// if (on) {
// writableTargetState = STATE_REQUEST_HEATING;
// } else {
// writableTargetState = STATE_REQUEST_PASSIVE;
// }
// mySet.commit(PoolVariableIF::VALID);
ReturnValue_t result = targetState.read();
if(result == HasReturnvaluesIF::RETURN_OK) {
if(on) {
targetState.value = STATE_REQUEST_HEATING;
}
else {
targetState.value = STATE_REQUEST_PASSIVE;
}
}
targetState.setValid(true);
}
void ThermalModule::updateTargetTemperatures(ThermalComponentIF* component,

3
thermal/ThermalModule.h
View File

@ -5,8 +5,6 @@
#include "tcsDefinitions.h"
#include "RedundantHeater.h"
//#include "../datapoolglob/GlobalDataSet.h"
//#include "../datapoolglob/GlobalPoolVariable.h"
#include "../datapoollocal/LocalPoolDataSetBase.h"
#include "../datapoollocal/LocalPoolVariable.h"
#include "../devicehandlers/HealthDevice.h"
@ -78,7 +76,6 @@ protected:
Parameters parameters;
lp_var_t<float> moduleTemperature;
//gp_float_t moduleTemperature;
RedundantHeater *heater = nullptr;