Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r96b5f969bbba7b44593c85c8ac003be0a2d87151 -r353cb96644812b6278a5b2d98c1b7946a5c47d6e --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 96b5f969bbba7b44593c85c8ac003be0a2d87151) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 353cb96644812b6278a5b2d98c1b7946a5c47d6e) @@ -86,15 +86,15 @@ /// Heaters data structure typedef struct { - F32 targetTemp; ///< Heater target temperature. + F32 targetTempC; ///< Heater target temperature. HEATERS_STATE_T state; ///< Heater state. BOOL startHeaterSignal; ///< Heater start indication flag. BOOL isHeaterOn; ///< Heater on/off status flag. OVERRIDE_F32_T dutyCycle; ///< Heater duty cycle. - F32 targetFlow; ///< Heater target flow. + F32 targetFlowLPM; ///< Heater target flow in L/min. BOOL hasTargetTempChanged; ///< Heater target temperature change flag indicator. F32 heaterEstGain; ///< Heater estimation gain during the run. - F32 calculatedTemperature; ///< Heater calculated temperature. + F32 calculatedTemperatureC; ///< Heater calculated temperature. DG_RESERVOIR_ID_T inactiveRsrvr; ///< Heater inactive reservoir. U32 controlIntervalCounter; ///< Heater control interval counter. BOOL isThisFirstControl; ///< Heater is this first control interval. @@ -141,15 +141,15 @@ for ( heater = DG_PRIMARY_HEATER; heater < NUM_OF_DG_HEATERS; heater++ ) { - heatersStatus[ heater ].targetTemp = 0.0F; + heatersStatus[ heater ].targetTempC = 0.0F; heatersStatus[ heater ].state = HEATER_EXEC_STATE_OFF; heatersStatus[ heater ].startHeaterSignal = FALSE; heatersStatus[ heater ].isHeaterOn = FALSE; heatersStatus[ heater ].dutyCycle.data = HEATERS_MIN_DUTY_CYCLE; heatersStatus[ heater ].dutyCycle.ovData = HEATERS_MIN_DUTY_CYCLE; heatersStatus[ heater ].dutyCycle.ovInitData = HEATERS_MIN_DUTY_CYCLE; heatersStatus[ heater ].dutyCycle.override = 0; - heatersStatus[ heater ].targetFlow = 0.0F; + heatersStatus[ heater ].targetFlowLPM = 0.0F; heatersStatus[ heater ].hasTargetTempChanged = FALSE; heatersStatus[ heater ].heaterEstGain = HEATERS_NEUTRAL_EST_GAIN; heatersStatus[ heater ].controlIntervalCounter = 0; @@ -192,7 +192,7 @@ // Check if the requested temperature is within the allowed range if ( ( targetTemperature >= MINIMUM_TARGET_TEMPERATURE ) && ( targetTemperature <= MAXIMUM_TARGET_TEMPERATURE ) ) { - heatersStatus[ heater ].targetTemp = targetTemperature; + heatersStatus[ heater ].targetTempC = targetTemperature; heatersStatus[ heater ].hasTargetTempChanged = TRUE; result = TRUE; } @@ -214,7 +214,7 @@ *************************************************************************/ F32 getHeaterTargetTemperature( DG_HEATERS_T heater ) { - return heatersStatus[ heater ].targetTemp; + return heatersStatus[ heater ].targetTempC; } /*********************************************************************//** @@ -275,7 +275,15 @@ *************************************************************************/ void stopHeater( DG_HEATERS_T heater ) { - heatersStatus[ heater ].isHeaterOn = FALSE; + if( heater < NUM_OF_DG_HEATERS ) + { + heatersStatus[ heater ].startHeaterSignal = FALSE; + heatersStatus[ heater ].isHeaterOn = FALSE; + } + else + { + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_INVALID_HEATER_ID_SELECTED, heater ) + } } /*********************************************************************//** @@ -433,7 +441,7 @@ F32 heaterEstGain = heatersStatus[ heater ].heaterEstGain; F32 heaterDutyCycle = heatersStatus[ heater ].dutyCycle.data; F32 lastFillTemperature = getAvgFillTemperature(); - F32 primaryTargetTemperature = heatersStatus[ heater ].targetTemp; + F32 primaryTargetTemperature = heatersStatus[ heater ].targetTempC; BOOL isTempUnderTarget = ( lastFillTemperature < primaryTargetTemperature ? TRUE : FALSE ); if ( TRUE == isTempUnderTarget ) @@ -510,7 +518,7 @@ F32 inletTemperature = getTemperatureValue( (U32)TEMPSENSORS_HEAT_DISINFECT ); F32 targetFlow = 0.0F; F32 dutyCycle = 0.0F; - F32 targetTemperature = heatersStatus[ heater ].targetTemp; + F32 targetTemperature = heatersStatus[ heater ].targetTempC; DG_OP_MODE_T opMode = getCurrentOperationMode(); if ( DG_MODE_FILL == opMode ) @@ -547,8 +555,8 @@ } // Update the calculated target temperature and flow - heatersStatus[ DG_PRIMARY_HEATER ].calculatedTemperature = targetTemperature; - heatersStatus[ DG_PRIMARY_HEATER ].targetFlow = targetFlow; + heatersStatus[ DG_PRIMARY_HEATER ].calculatedTemperatureC = targetTemperature; + heatersStatus[ DG_PRIMARY_HEATER ].targetFlowLPM = targetFlow; setHeaterDutyCycle( heater, dutyCycle ); return state; @@ -574,13 +582,13 @@ else if ( TRUE == heatersStatus[ heater ].hasTargetTempChanged ) { F32 inletTemperature = getTemperatureValue( (U32)TEMPSENSORS_HEAT_DISINFECT ); - F32 targetTemperature = heatersStatus[ heater ].targetTemp; + F32 targetTemperature = heatersStatus[ heater ].targetTempC; F32 targetFlow = getTargetROPumpFlowRateLPM(); F32 dutyCycle = calculatePrimaryHeaterDutyCycle( targetTemperature, inletTemperature, targetFlow, TRUE ); - heatersStatus[ heater ].calculatedTemperature = targetTemperature; - heatersStatus[ heater ].targetFlow = targetFlow; - heatersStatus[ heater ].hasTargetTempChanged = FALSE; + heatersStatus[ heater ].calculatedTemperatureC = targetTemperature; + heatersStatus[ heater ].targetFlowLPM = targetFlow; + heatersStatus[ heater ].hasTargetTempChanged = FALSE; setHeaterDutyCycle( heater, dutyCycle ); } @@ -602,7 +610,7 @@ { HEATERS_STATE_T state = HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET; F32 currentTemperature = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER ); - F32 targetTemperature = heatersStatus[ heater ].targetTemp; + F32 targetTemperature = heatersStatus[ heater ].targetTempC; if ( currentTemperature < targetTemperature ) { @@ -638,7 +646,7 @@ F32 currentTemperature = 0.0F; F32 targetFlowLPM = getTargetDialysateFlowLPM(); F32 dutyCycle = 0.0F; - F32 targetTemperature = heatersStatus[ heater ].targetTemp; + F32 targetTemperature = heatersStatus[ heater ].targetTempC; DG_OP_MODE_T opMode = getCurrentOperationMode(); if ( ( DG_MODE_FILL == opMode ) || ( DG_MODE_GENE == opMode ) || ( DG_MODE_DRAI == opMode ) ) @@ -675,10 +683,10 @@ // Update the calculated target temperature // Reset the duty cycle since the reservoir has been switched - heatersStatus[ heater ].calculatedTemperature = currentTemperature; - heatersStatus[ heater ].inactiveRsrvr = getInactiveReservoir(); - heatersStatus[ heater ].targetFlow = targetFlowLPM; - heatersStatus[ heater ].isThisFirstControl = TRUE; + heatersStatus[ heater ].calculatedTemperatureC = currentTemperature; + heatersStatus[ heater ].inactiveRsrvr = getInactiveReservoir(); + heatersStatus[ heater ].targetFlowLPM = targetFlowLPM; + 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 ); @@ -718,8 +726,8 @@ // When the trimmer heater is on, its duty cycle is adjusted at the control interval. For this control check, // dialysate inlet temperature sensor is used rather than the theoretical calculations. F32 outletRedundantTemperature = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT ); - F32 targetTemperature = heatersStatus[ heater ].targetTemp; - F32 targetFlowLPM = heatersStatus[ heater ].targetFlow; + F32 targetTemperature = heatersStatus[ heater ].targetTempC; + F32 targetFlowLPM = heatersStatus[ heater ].targetFlowLPM; F32 dutyCycle = calculateTrimmerHeaterDutyCycle( targetTemperature, outletRedundantTemperature, targetFlowLPM, TRUE ); tempDutyCycle = heatersStatus[ heater ].dutyCycle.data + dutyCycle; @@ -842,13 +850,13 @@ { BOOL status = FALSE; F32 targetFlow = ( DG_PRIMARY_HEATER == heater ? getTargetROPumpFlowRateLPM() : getTargetDialysateFlowLPM() ); - BOOL hasFlowChanged = ( fabs( targetFlow - heatersStatus[ heater ].targetFlow ) > NEARLY_ZERO ? TRUE : FALSE ); + BOOL hasFlowChanged = ( fabs( targetFlow - heatersStatus[ heater ].targetFlowLPM ) > NEARLY_ZERO ? TRUE : FALSE ); // Check if the target flow has changed or the target temperature has changed. if ( TRUE == hasFlowChanged ) { - status = TRUE; - heatersStatus[ heater ].targetFlow = targetFlow; + status = TRUE; + heatersStatus[ heater ].targetFlowLPM = targetFlow; } return status; @@ -950,13 +958,13 @@ data.mainPrimayHeaterDC = getHeaterDutyCycle( DG_PRIMARY_HEATER ) * FRACTION_TO_PERCENT_FACTOR; data.smallPrimaryHeaterDC = getHeaterDutyCycle( DG_PRIMARY_HEATER ) * FRACTION_TO_PERCENT_FACTOR; data.trimmerHeaterDC = getHeaterDutyCycle( DG_TRIMMER_HEATER ) * FRACTION_TO_PERCENT_FACTOR; - data.primaryTargetTemp = heatersStatus[ DG_PRIMARY_HEATER ].targetTemp; - data.trimmerTargetTemp = heatersStatus[ DG_TRIMMER_HEATER ].targetTemp; + data.primaryTargetTemp = heatersStatus[ DG_PRIMARY_HEATER ].targetTempC; + data.trimmerTargetTemp = heatersStatus[ DG_TRIMMER_HEATER ].targetTempC; data.primaryHeaterState = heatersStatus[ DG_PRIMARY_HEATER ].state; data.trimmerHeaterState = heatersStatus[ DG_TRIMMER_HEATER ].state; data.primaryEfficiency = heatersStatus[ DG_PRIMARY_HEATER ].heaterEstGain * FRACTION_TO_PERCENT_FACTOR; - data.primaryCalcTargetTemp = heatersStatus[ DG_PRIMARY_HEATER ].calculatedTemperature; - data.trimmerCalcCurrentTemp = heatersStatus[ DG_TRIMMER_HEATER ].calculatedTemperature; + data.primaryCalcTargetTemp = heatersStatus[ DG_PRIMARY_HEATER ].calculatedTemperatureC; + data.trimmerCalcCurrentTemp = heatersStatus[ DG_TRIMMER_HEATER ].calculatedTemperatureC; data.trimmerUseLastDC = (U32)heatersStatus[ DG_TRIMMER_HEATER ].useLastDutyCycle; dataPublicationTimerCounter = 0;