esbo_ds/testArduino
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The printing of the sensor data has been commented out. Errors in the device handler and controller tasks.

Browse Source
This commit is contained in:
mmode
2021-09-13 17:43:07 +02:00
parent d857487d17
commit 2ce14d84f0
6 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mission/Controller/ArduinoTCSTemperatureSensor.cpp
View File

@ -32,7 +32,6 @@ void ArduinoTCSTemperatureSensor::doChildOperation() {
return;
}
outputTemperature = calculateOutputTemperature(*inputTemperature);
outputTemperature.setValid(PoolVariableIF::VALID);
if (outputTemperature<parameters.lowerLimit || outputTemperature>parameters.upperLimit){
outputTemperature.setValid(PoolVariableIF::INVALID);
outputTemperature = INVALID_TEMPERATURE;

10
mission/Controller/ThermalController.cpp
View File

@ -40,8 +40,6 @@ ThermalController::~ThermalController() {
ReturnValue_t ThermalController::initialize() {
sif::debug<<"\nDEBUG_TCS: Controller starts initialization. "<<std::endl;
ReturnValue_t result = ControllerBase::initialize();
if (result != HasReturnvaluesIF::RETURN_OK) {
return result;
@ -65,7 +63,7 @@ ReturnValue_t ThermalController::initialize() {
}*/
/* ************************ */
sif::debug<<"\nDEBUG_TCS: Controller ends initialization. "<<std::endl;
sif::debug<<"\nDEBUG_TCS: Start initialization"<<std::endl;
return HasReturnvaluesIF::RETURN_OK;
}
@ -88,6 +86,7 @@ ReturnValue_t ThermalController::handleCommandMessage(CommandMessage *message) {
ReturnValue_t ThermalController::performOperation() {
sif::debug<<"\nDEBUG_TCS: Start of controller operations"<<std::endl;
std::cout << "\nDEBUG_TCS: Start of controller operations" << std::endl;
for (std::list<ArduinoTCSTemperatureSensor>::iterator iter = sensors.begin(); iter != sensors.end(); iter++) {
iter->performHealthOp();
@ -105,14 +104,15 @@ ReturnValue_t ThermalController::performOperation() {
}
TCSData.commit();
TCSData.read();
TCSData.read(); // ?check the read, separate dataset
//calculateStrategy(true, true);
ThermalComponentIF::HeaterRequest request;
for (std::list<TCS_ThermalComponent>::iterator iter = components.begin(); iter != components.end(); iter++) {
request = iter->performOperation(0, true, false);
request = iter->performOperation(0, true, false); // request returnvalue
//request = iter->performOperation(0, ThermalComponentIF::SAFE, true, false);
}
TCSData.commit();
std::cout << "\nDEBUG_TCS: End of controller operations" << std::endl;
return HasReturnvaluesIF::RETURN_OK;
}