Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -rf655c82fa922bac151e5ee1ef15433cb327753c1 -rc4a05fb43aae836fb6ea31c860c2bc233ebd9dc9 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision f655c82fa922bac151e5ee1ef15433cb327753c1) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision c4a05fb43aae836fb6ea31c860c2bc233ebd9dc9) @@ -8,7 +8,7 @@ * @file Heaters.c * * @author (last) Dara Navaei -* @date (last) 15-Feb-2023 +* @date (last) 07-Mar-2023 * * @author (original) Dara Navaei * @date (original) 23-Apr-2020 @@ -71,7 +71,7 @@ #define TRIMMER_HEATER_CONTROL_INTERVAL_COUNT ( ( 30 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) ///< Trimmer heater control interval count. #define TRIMMER_HEATER_MIN_DIALYSATE_FLOWRATE_LPM 0.00F ///< Trimmer heater minimum dialysate flow rate in L/min. -#define DELTA_TEMPERATURE_TIME_COSNTANT_C 8.6F ///< Delta temperature calculated from time constant. +#define DELTA_TEMPERATURE_TIME_CONSTANT_C 8.6F ///< Delta temperature calculated from time constant. #define PRIMARY_HEATER_DUTY_CYCLE_PER_TEMPERATURE_C 0.015F ///< Primary heaters duty cycle per temperature in C. #define DATA_PUBLISH_COUNTER_START_COUNT 70 ///< Data publish counter start count. #define MIN_RO_HEATER_FLOWRATE_LPM 0.2F ///< Minimum target RO heater flow rate in L/min. @@ -86,15 +86,16 @@ /// 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 to calculate the duty cycle. + F32 nomTargetFlowLPM; ///< Heater nominal 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 +142,16 @@ 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 ].nomTargetFlowLPM = 0.0F; heatersStatus[ heater ].hasTargetTempChanged = FALSE; heatersStatus[ heater ].heaterEstGain = HEATERS_NEUTRAL_EST_GAIN; heatersStatus[ heater ].controlIntervalCounter = 0; @@ -192,7 +194,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 +216,7 @@ *************************************************************************/ F32 getHeaterTargetTemperature( DG_HEATERS_T heater ) { - return heatersStatus[ heater ].targetTemp; + return heatersStatus[ heater ].targetTempC; } /*********************************************************************//** @@ -275,7 +277,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 +443,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 ) @@ -508,47 +518,48 @@ HEATERS_STATE_T state = HEATER_EXEC_STATE_PRIMARY_RAMP_TO_TARGET; DG_HEATERS_T heater = DG_PRIMARY_HEATER; F32 inletTemperature = getTemperatureValue( (U32)TEMPSENSORS_HEAT_DISINFECT ); - F32 targetFlow = 0.0F; + F32 targetFlowLPM = 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 ) { // If the previous average fill flow rate is 0, use the nominal target RO flow from the RO pump - targetFlow = ( getAvgFillFlowRateLPM() - 0.0F > NEARLY_ZERO ? getAvgFillFlowRateLPM() : getTargetROPumpFlowRateLPM() ); - dutyCycle = calculatePrimaryHeaterDutyCycle( targetTemperature, inletTemperature, targetFlow, TRUE ); - state = HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET; + targetFlowLPM = ( getAvgFillFlowRateLPM() > NEARLY_ZERO ? getAvgFillFlowRateLPM() : getTargetROPumpFlowRateLPM() ); + dutyCycle = calculatePrimaryHeaterDutyCycle( targetTemperature, inletTemperature, targetFlowLPM, TRUE ); + state = HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET; } else if ( ( DG_MODE_GENE == opMode ) || ( DG_MODE_DRAI == opMode ) ) { - targetTemperature += DELTA_TEMPERATURE_TIME_COSNTANT_C; - targetFlow = getTargetROPumpFlowRateLPM(); - dutyCycle = calculatePrimaryHeaterDutyCycle( targetTemperature, inletTemperature, targetFlow, FALSE ); + targetTemperature += DELTA_TEMPERATURE_TIME_CONSTANT_C; + targetFlowLPM = getTargetROPumpFlowRateLPM(); + dutyCycle = calculatePrimaryHeaterDutyCycle( targetTemperature, inletTemperature, targetFlowLPM, FALSE ); state = HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET; } else if ( ( DG_MODE_HEAT == opMode ) || ( DG_MODE_CHEM == opMode ) ) { // If the mode is any of the disinfects, specially heat, use the target flow rate instead of the avg. flow // Most of the times the heater should be running at 100% duty cycle since the target temperature is far from // the inlet temperature - targetFlow = getTargetROPumpFlowRateLPM(); + targetFlowLPM = getTargetROPumpFlowRateLPM(); inletTemperature = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER ); - dutyCycle = calculatePrimaryHeaterDutyCycle( targetTemperature, inletTemperature, targetFlow, FALSE ); + dutyCycle = calculatePrimaryHeaterDutyCycle( targetTemperature, inletTemperature, targetFlowLPM, FALSE ); state = HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET; } else { // Calculate the energy equation and set the duty cycle // This is for other modes (i.e. standby or service) - targetFlow = getTargetROPumpFlowRateLPM(); - dutyCycle = calculatePrimaryHeaterDutyCycle( targetTemperature, inletTemperature, targetFlow, FALSE ); - state = HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET; + targetFlowLPM = getTargetROPumpFlowRateLPM(); + dutyCycle = calculatePrimaryHeaterDutyCycle( targetTemperature, inletTemperature, targetFlowLPM, FALSE ); + state = HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET; } // 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 = targetFlowLPM; + heatersStatus[ DG_PRIMARY_HEATER ].nomTargetFlowLPM = getTargetROPumpFlowRateLPM(); setHeaterDutyCycle( heater, dutyCycle ); return state; @@ -574,14 +585,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 +612,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 +648,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 +685,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 +728,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; @@ -773,7 +783,7 @@ * @details Inputs: none * @details Outputs: none * @param targetTemperature target temperature of the heater - * @oaram currentTemperature current inlet temperature of the heater + * @param currentTemperature current inlet temperature of the heater * @param flow current flow * @return calculated duty cycle *************************************************************************/ @@ -798,7 +808,7 @@ * @details Inputs: none * @details Outputs: none * @param targetTemperature target temperature of the heater - * @oaram currentTemperature current inlet temperature of the heater + * @param currentTemperature current inlet temperature of the heater * @param flow current flow * @param check efficiency flag to indicate whether to consider heater's * efficiency @@ -842,13 +852,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 ].nomTargetFlowLPM ) > 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 +960,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; @@ -1053,6 +1063,11 @@ result = TRUE; heatersStatus[ (DG_HEATERS_T)heater ].dutyCycle.ovData = value; heatersStatus[ (DG_HEATERS_T)heater ].dutyCycle.override = OVERRIDE_KEY; + + if ( TRUE == heatersStatus[ (DG_HEATERS_T)heater ].isHeaterOn ) + { + setHeaterDutyCycle( (DG_HEATERS_T)heater, value ); + } } } Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -rf93ec3de5b9ce8b8d62a06378d12f10fe01a4365 -rc4a05fb43aae836fb6ea31c860c2bc233ebd9dc9 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision f93ec3de5b9ce8b8d62a06378d12f10fe01a4365) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision c4a05fb43aae836fb6ea31c860c2bc233ebd9dc9) @@ -8,7 +8,7 @@ * @file TemperatureSensors.c * * @author (last) Dara Navaei -* @date (last) 25-Jan-2023 +* @date (last) 06-Mar-2023 * * @author (original) Dara Navaei * @date (original) 08-Apr-2020 @@ -914,6 +914,10 @@ checkFPGAPersistentAlarms( FPGA_PERS_ERROR_THD_ADC_TEMP_SENSORS, readCount ); processTempSnsrsADCRead( TEMPSENSORS_HEAT_DISINFECT, getFPGATHdTemp() ); + + // Make sure the baro sensor coefficients are not corrupted + checkBaroSensorCRC(); + processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_THD_RTD, getFPGATHdInternalTemp() ); // Make sure the baro sensor coefficients are not corrupted