Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -rd2f63f7b752a67a5805b5cb72afab07349afa408 -r417631131615f93f77d6d1bfe44c385a8eab6d5b --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision d2f63f7b752a67a5805b5cb72afab07349afa408) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 417631131615f93f77d6d1bfe44c385a8eab6d5b) @@ -7,8 +7,8 @@ * * @file Heaters.c * -* @author (last) Michael Garthwaite -* @date (last) 16-Mar-2023 +* @author (last) Bill Bracken +* @date (last) 31-Mar-2023 * * @author (original) Dara Navaei * @date (original) 23-Apr-2020 @@ -81,7 +81,6 @@ static const F32 WATER_SPECIFIC_HEAT_DIVIDED_BY_MINUTES = 4184 / SEC_PER_MIN; ///< Water specific heat in J/KgC / 60. static const F32 PRIMARY_HEATERS_MAXIMUM_POWER_WATTS = 475 + 237.5F; ///< Primary heaters maximum power (main primary = 475W and small primary = 237.5W). static const F32 HEATERS_VOLTAGE_TOLERANCE_V = HEATERS_MAX_OPERATING_VOLTAGE_V * HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL; ///< Heaters voltage tolerance in volts. -static const F32 PRIMARY_HEATER_VOLTAGE_TOLERANCE_V = HEATERS_MAX_OPERATING_VOLTAGE_V * PRIMARY_HEATER_POWER_TOL; ///< Primary heater power voltage tolerance in volts. /// Heaters data structure typedef struct @@ -115,7 +114,7 @@ static HEATERS_STATE_T handleHeaterStateTrimmerRampToTarget( void ); static HEATERS_STATE_T handleHeaterStateTrimmerControlToTarget( void ); -static void setHeaterDutyCycle( DG_HEATERS_T heater, F32 pwm ); +static void setHeaterDutyCycle( DG_HEATERS_T heater ); static F32 calculatePrimaryHeaterDutyCycle( F32 targetTemperature, F32 currentTemperature, F32 flow, BOOL checkEfficiency ); static F32 calculateTrimmerHeaterDutyCycle( F32 targetTemperature, F32 currentTemperature, F32 flow, BOOL checkEfficiency ); static BOOL haveHeaterControlConditionsChanged( DG_HEATERS_T heater ); @@ -163,7 +162,6 @@ initPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); - initPersistentAlarm( ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS ); @@ -341,7 +339,8 @@ // Check if the heater is requested to be off if ( FALSE == heatersStatus[ heater ].isHeaterOn ) { - setHeaterDutyCycle( heater, HEATERS_MIN_DUTY_CYCLE ); + heatersStatus[ heater ].dutyCycle.data = HEATERS_MIN_DUTY_CYCLE; + setHeaterDutyCycle( heater ); heatersStatus[ heater ].state = HEATER_EXEC_STATE_OFF; } } @@ -560,7 +559,8 @@ heatersStatus[ DG_PRIMARY_HEATER ].calculatedTemperatureC = targetTemperature; heatersStatus[ DG_PRIMARY_HEATER ].targetFlowLPM = targetFlowLPM; heatersStatus[ DG_PRIMARY_HEATER ].nomTargetFlowLPM = getTargetROPumpFlowRateLPM(); - setHeaterDutyCycle( heater, dutyCycle ); + heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle.data = dutyCycle; + setHeaterDutyCycle( heater ); return state; } @@ -592,7 +592,8 @@ heatersStatus[ heater ].calculatedTemperatureC = targetTemperature; heatersStatus[ heater ].targetFlowLPM = targetFlow; heatersStatus[ heater ].hasTargetTempChanged = FALSE; - setHeaterDutyCycle( heater, dutyCycle ); + heatersStatus[ heater ].dutyCycle.data = dutyCycle; + setHeaterDutyCycle( heater ); } return state; @@ -616,18 +617,24 @@ if ( currentTemperature < targetTemperature ) { - setHeaterDutyCycle( DG_TRIMMER_HEATER, HEATERS_MAX_DUTY_CYCLE ); - setHeaterDutyCycle( DG_PRIMARY_HEATER, HEATERS_MAX_DUTY_CYCLE ); + heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle.data = HEATERS_MAX_DUTY_CYCLE; + heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle.data = HEATERS_MAX_DUTY_CYCLE; + setHeaterDutyCycle( DG_TRIMMER_HEATER ); + setHeaterDutyCycle( DG_PRIMARY_HEATER ); } else if ( currentTemperature - targetTemperature < HEATERS_DISINFECT_TEMPERATURE_DRIFT_C ) { - setHeaterDutyCycle( DG_TRIMMER_HEATER, HEATERS_DISINFECT_DUTY_CYCLE ); - setHeaterDutyCycle( DG_PRIMARY_HEATER, HEATERS_DISINFECT_DUTY_CYCLE ); + heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle.data = HEATERS_DISINFECT_DUTY_CYCLE; + heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle.data = HEATERS_DISINFECT_DUTY_CYCLE; + setHeaterDutyCycle( DG_TRIMMER_HEATER ); + setHeaterDutyCycle( DG_PRIMARY_HEATER ); } else { - setHeaterDutyCycle( DG_TRIMMER_HEATER, HEATERS_MIN_DUTY_CYCLE ); - setHeaterDutyCycle( DG_PRIMARY_HEATER, HEATERS_MIN_DUTY_CYCLE ); + heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle.data = HEATERS_MIN_DUTY_CYCLE; + heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle.data = HEATERS_MIN_DUTY_CYCLE; + setHeaterDutyCycle( DG_TRIMMER_HEATER ); + setHeaterDutyCycle( DG_PRIMARY_HEATER ); } return state; @@ -691,8 +698,8 @@ heatersStatus[ heater ].isThisFirstControl = TRUE; // Cap the minimum duty cycle. So if it is calculated to negative, set it to 0 - dutyCycle = MAX( dutyCycle, HEATERS_MIN_DUTY_CYCLE ); - setHeaterDutyCycle( heater, dutyCycle ); + heatersStatus[ heater ].dutyCycle.data = MAX( dutyCycle, HEATERS_MIN_DUTY_CYCLE ); + setHeaterDutyCycle( heater ); return state; } @@ -735,8 +742,8 @@ tempDutyCycle = heatersStatus[ heater ].dutyCycle.data + dutyCycle; tempDutyCycle = MIN( tempDutyCycle, HEATERS_MAX_DUTY_CYCLE ); tempDutyCycle = MAX( tempDutyCycle, HEATERS_MIN_DUTY_CYCLE ); - - setHeaterDutyCycle( heater, tempDutyCycle ); + heatersStatus[ heater ].dutyCycle.data = tempDutyCycle; + setHeaterDutyCycle( heater ); } return state; @@ -751,14 +758,13 @@ * @param pwm: The PWM that is set * @return none *************************************************************************/ -static void setHeaterDutyCycle( DG_HEATERS_T heater, F32 pwm ) +static void setHeaterDutyCycle( DG_HEATERS_T heater ) { if ( heater < NUM_OF_DG_HEATERS ) { F32 duty; - heatersStatus[ heater ].dutyCycle.data = pwm; - duty = getHeaterDutyCycle( heater ); + duty = getHeaterDutyCycle( heater ); if ( DG_PRIMARY_HEATER == heater ) { @@ -1010,9 +1016,8 @@ else #endif { - // TODO this is not working on DVT-002 - // If the system is DVT, check the FPGA persistent alarm of the main primary heater's voltage ADC - //checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCErrorCount(), getFPGAHeaterGateADCReadCount() ); + // If the system is DVT, check the FPGA persistent alarm of the main primary heater's voltage ADC + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCReadCount() ); } isMainPriOut = ( fabs( mainPriExpectedVoltage - mainPriVoltage ) > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE ); @@ -1024,17 +1029,6 @@ checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isMainPriOut, mainPriDC, HEATERS_VOLTAGE_TOLERANCE_V ); checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPriDC, HEATERS_VOLTAGE_TOLERANCE_V ); checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, isTrimmerOut, trimmerDC, HEATERS_VOLTAGE_TOLERANCE_V ); - -#ifndef _RELEASE_ - if ( getHardwareConfigStatus() != HW_CONFIG_BETA ) -#endif - { - // If the system is DVT, check the primary heater's power line voltage - F32 powerMainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_POWER_PRIM_HTR_V ); - BOOL isPriPowerOut = ( fabs( powerMainPriVoltage - HEATERS_MAX_OPERATING_VOLTAGE_V ) > PRIMARY_HEATER_VOLTAGE_TOLERANCE_V ? TRUE : FALSE ); - - checkPersistentAlarm( ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, isPriPowerOut, powerMainPriVoltage, PRIMARY_HEATER_VOLTAGE_TOLERANCE_V ); - } } } @@ -1066,7 +1060,7 @@ if ( TRUE == heatersStatus[ (DG_HEATERS_T)heater ].isHeaterOn ) { - setHeaterDutyCycle( (DG_HEATERS_T)heater, value ); + setHeaterDutyCycle( (DG_HEATERS_T)heater ); } } } @@ -1091,11 +1085,8 @@ result = TRUE; heatersStatus[ (DG_HEATERS_T)heater ].dutyCycle.override = OVERRIDE_RESET; heatersStatus[ (DG_HEATERS_T)heater ].dutyCycle.ovData = heatersStatus[ (DG_HEATERS_T)heater ].dutyCycle.ovInitData; + setHeaterDutyCycle( (DG_HEATERS_T)heater ); - if ( TRUE == heatersStatus[ (DG_HEATERS_T)heater ].isHeaterOn ) - { - setHeaterDutyCycle( (DG_HEATERS_T)heater, heatersStatus[ (DG_HEATERS_T)heater ].dutyCycle.data ); - } } return result;