mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

compiling again

Browse Source
This commit is contained in:
Robin Müller
2020-11-30 16:06:59 +01:00
parent f70ee7696a
commit 4bb9dd816e
12 changed files with 196 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
power/Fuse.cpp
View File

@ -72,19 +72,19 @@ ReturnValue_t Fuse::check() {
checkFuseState();
calculateFusePower();
//Check if power is valid and if fuse state is off or invalid.
// if (!power.isValid() || (state == 0) || !state.isValid()) {
// result = powerMonitor.setToInvalid();
// } else {
// float lowLimit = 0.0;
// float highLimit = RESIDUAL_POWER;
// calculatePowerLimits(&lowLimit, &highLimit);
// result = powerMonitor.checkPower(power, lowLimit, highLimit);
// if (result == MonitoringIF::BELOW_LOW_LIMIT) {
// reportEvents(POWER_BELOW_LOW_LIMIT);
// } else if (result == MonitoringIF::ABOVE_HIGH_LIMIT) {
// reportEvents(POWER_ABOVE_HIGH_LIMIT);
// }
// }
if (!power.isValid() || (state == 0) || !state.isValid()) {
result = powerMonitor.setToInvalid();
} else {
float lowLimit = 0.0;
float highLimit = RESIDUAL_POWER;
calculatePowerLimits(&lowLimit, &highLimit);
result = powerMonitor.checkPower(power.value, lowLimit, highLimit);
if (result == MonitoringIF::BELOW_LOW_LIMIT) {
reportEvents(POWER_BELOW_LOW_LIMIT);
} else if (result == MonitoringIF::ABOVE_HIGH_LIMIT) {
reportEvents(POWER_ABOVE_HIGH_LIMIT);
}
}
set.commit();
return result;
}
@ -135,7 +135,7 @@ void Fuse::calculateFusePower() {
return;
}
//Calculate fuse power.
//power = current * voltage;
power.value = current.value * voltage.value;
power.setValid(PoolVariableIF::VALID);
}
@ -188,20 +188,20 @@ void Fuse::checkFuseState() {
oldFuseState = 0;
return;
}
// if (state == 0) {
// if (oldFuseState != 0) {
// reportEvents(FUSE_WENT_OFF);
// }
// }
// oldFuseState = state;
if (state == 0) {
if (oldFuseState != 0) {
reportEvents(FUSE_WENT_OFF);
}
}
oldFuseState = state.value;
}
float Fuse::getPower() {
// if (power.isValid()) {
// return power;
// } else {
// return 0.0;
// }
if (power.isValid()) {
return power.value;
} else {
return 0.0;
}
}
void Fuse::setDataPoolEntriesInvalid() {

36
power/PowerSensor.cpp
View File

@ -26,24 +26,24 @@ ReturnValue_t PowerSensor::calculatePower() {
powerSensorSet.read();
ReturnValue_t result1 = HasReturnvaluesIF::RETURN_FAILED;
ReturnValue_t result2 = HasReturnvaluesIF::RETURN_FAILED;
// if (healthHelper.healthTable->isHealthy(getObjectId()) && voltage.isValid()
// && current.isValid()) {
// result1 = voltageLimit.doCheck(voltage);
// result2 = currentLimit.doCheck(current);
// } else {
// voltageLimit.setToInvalid();
// currentLimit.setToInvalid();
// result1 = OBJECT_NOT_HEALTHY;
// }
// if (result1 != HasReturnvaluesIF::RETURN_OK
// || result2 != HasReturnvaluesIF::RETURN_OK) {
// result1 = MonitoringIF::INVALID;
// power.setValid(PoolVariableIF::INVALID);
// } else {
// power.setValid(PoolVariableIF::VALID);
// power = current * voltage;
// }
// powerSensorSet.commit();
if (healthHelper.healthTable->isHealthy(getObjectId()) && voltage.isValid()
&& current.isValid()) {
result1 = voltageLimit.doCheck(voltage.value);
result2 = currentLimit.doCheck(current.value);
} else {
voltageLimit.setToInvalid();
currentLimit.setToInvalid();
result1 = OBJECT_NOT_HEALTHY;
}
if (result1 != HasReturnvaluesIF::RETURN_OK
|| result2 != HasReturnvaluesIF::RETURN_OK) {
result1 = MonitoringIF::INVALID;
power.setValid(PoolVariableIF::INVALID);
} else {
power.setValid(PoolVariableIF::VALID);
power.value = current.value * voltage.value;
}
powerSensorSet.commit();
return result1;
}