Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r5d59b2fb541de1cc5f9b213650a72dec0d66152e -rb36ca0b49c410f690519c0622990825fd5dba500 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 5d59b2fb541de1cc5f9b213650a72dec0d66152e) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision b36ca0b49c410f690519c0622990825fd5dba500) @@ -52,7 +52,7 @@ #define HEATERS_DUTY_CYCLE_CONVERSION_FACTOR 100.0F ///< Heaters duty cycle 0: OFF, 100: 100% duty cycle. #define HEATERS_ZERO_EFFICIENCY 0.0F ///< Zero heater efficiency #define HEATER_CNTL_TRANSFER_DELTA_TEMP_C 0.50F ///< AC heater delta temperature to transfer control from open to close loop -#define MAX_ADJ_DELTA_TEMP_C 3.0F ///< Maximum adjusted delta temperature to add/remove from calculated target temperature +#define MAX_ADJ_DELTA_TEMP_C 3.0F ///< Maximum adjusted delta temperature to add/remove from calculated target temperature #define D5_HEAT_TX_INIT_FEED_FORWARD 0.0F ///< Initial Feed forward term for heater control //#define D5_HEAT_TX_P_COEFFICIENT 0.050F ///< P Term for AC primary heater control during treatment mode. @@ -127,7 +127,7 @@ static U32 dataPublicationTimerCounter; ///< Data publication timer counter. static U32 primaryTargetTempAdjCounter; ///< Primary target temperature adjustment counter. static BOOL isTargetTempAdjusted; ///< Flag indicating that target temperature is adjusted -static U32 adjustedTargetTemp; ///< Adjusted primary target temperature +static U32 adjustedPrimaryTargetTemp; ///< Adjusted primary target temperature static const F32 WATER_SPECIFIC_HEAT_DIVIDED_BY_MINUTES = 4184.0F / (F32)SEC_PER_MIN; ///< Water specific heat in J/KgC / 60. static OVERRIDE_U32_T heatersDataPublishInterval = { HEATERS_DATA_PUBLISH_INTERVAL, HEATERS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Heaters data publish time interval. static F32 convertDC; ///< AC Heater converted duty cycle @@ -144,7 +144,7 @@ static HEATERS_STATE_T handleHeaterStateRampToTarget( DD_HEATERS_T heater ); static HEATERS_STATE_T handleHeaterStateControlToTarget( DD_HEATERS_T heater ); static HEATERS_STATE_T handleHeaterStateControlToDisinfectTarget( DD_HEATERS_T heater ); -static void updatePrimaryHeaterTargetTemp( DD_HEATERS_T heater ); +static void updatePrimaryHeaterTargetTemp( void ); static F32 calculateDutyCycle( F32 flowrate, F32 deltaTemp, F32 power, F32 efficiency, F32 min, F32 max ); static void setHeaterControl( DD_HEATERS_T heater ); @@ -196,7 +196,7 @@ startupHeaterControl = TRUE; lastDialTargetTemperatureSet = 0.0F; primaryTargetTempAdjCounter = 0; - adjustedTargetTemp = 0.0F; + adjustedPrimaryTargetTemp = 0.0F; isTargetTempAdjusted = FALSE; for ( heater = DD_HEATERS_FIRST; heater < NUM_OF_DD_HEATERS; heater++ ) @@ -359,19 +359,16 @@ /*********************************************************************//** * @brief - * The signaltoResetAdjustedTargetTemp function resets the flag to - * update/adjust the target dialysate temperature + * The signaltoResetPrimaryHeaterAdjustedTargetTemp function resets the flag to + * update/adjust the primary heater target dialysate temperature * @details \b Inputs: none * @details \b Outputs: isTargetTempAdjusted * @param heater: heater ID to update the heater control. * @return none *************************************************************************/ -void signaltoResetAdjustedTargetTemp( DD_HEATERS_T heater ) +void signaltoResetPrimaryHeaterAdjustedTargetTemp( void ) { - if ( D5_HEAT == heater ) - { - isTargetTempAdjusted = FALSE; - } + isTargetTempAdjusted = FALSE; } /*********************************************************************//** @@ -380,36 +377,32 @@ * target dialysate temperature * @details \b Inputs: Set Target Temperature, D28 Temp * @details \b Outputs: Adjusted target temperature - * @param heater: heater ID to update the heater control. * @return none *************************************************************************/ -static void updatePrimaryHeaterTargetTemp( DD_HEATERS_T heater ) +static void updatePrimaryHeaterTargetTemp( void ) { - if ( D5_HEAT == heater ) + if ( ++primaryTargetTempAdjCounter >= D5_TARGET_TEMP_ADJUST_INTERVAL_MS ) { - if ( ++primaryTargetTempAdjCounter >= D5_TARGET_TEMP_ADJUST_INTERVAL_MS ) + F32 targetTempfromTD = getTDTargetDialysateTemperature(); + F32 measuredTempAtDialyzer = getConductivityTemperatureValue( D27_COND ); + F32 calcTargetTemp = getHeaterTargetTemperature( D5_HEAT ); + F32 deltaTempC = targetTempfromTD - measuredTempAtDialyzer; + F32 capDeltaTempC = MIN( fabs(deltaTempC), MAX_ADJ_DELTA_TEMP_C ); + + if ( deltaTempC > HEATERS_ZERO_DELTA_TEMP_C ) { - F32 targetTempfromTD = getTDTargetDialysateTemperature(); - F32 measuredTempAtDialyzer = getConductivityTemperatureValue( D27_COND ); - F32 calcTargetTemp = getHeaterTargetTemperature( heater ); - F32 deltaTempC = targetTempfromTD - measuredTempAtDialyzer; - F32 capDeltaTempC = MIN( fabs(deltaTempC), MAX_ADJ_DELTA_TEMP_C ); + adjustedPrimaryTargetTemp = calcTargetTemp + capDeltaTempC; + } + else + { + adjustedPrimaryTargetTemp = calcTargetTemp - capDeltaTempC; + } - if ( deltaTempC > HEATERS_ZERO_DELTA_TEMP_C ) - { - adjustedTargetTemp = calcTargetTemp + capDeltaTempC; - } - else - { - adjustedTargetTemp = calcTargetTemp - capDeltaTempC; - } + adjustedPrimaryTargetTemp = MIN(adjustedPrimaryTargetTemp, ( calcTargetTemp + MAX_ADJ_DELTA_TEMP_C ) ); + adjustedPrimaryTargetTemp = MAX(adjustedPrimaryTargetTemp, ( calcTargetTemp - MAX_ADJ_DELTA_TEMP_C ) ); - adjustedTargetTemp = MIN(adjustedTargetTemp, ( calcTargetTemp + MAX_ADJ_DELTA_TEMP_C ) ); - adjustedTargetTemp = MAX(adjustedTargetTemp, ( calcTargetTemp - MAX_ADJ_DELTA_TEMP_C ) ); - - isTargetTempAdjusted = TRUE; - primaryTargetTempAdjCounter = 0; - } + isTargetTempAdjusted = TRUE; + primaryTargetTempAdjCounter = 0; } } @@ -698,7 +691,11 @@ F32 measuredTemperature = 0.0F; F32 ctrl = 0.0F; - updatePrimaryHeaterTargetTemp( heater ); + // Update primary heater target temperature at defined interval + if ( D5_HEAT == heater ) + { + updatePrimaryHeaterTargetTemp(); + } if ( ++heatersStatus[ heater ].controlIntervalCounter >= controlInterval[ heater ] ) { @@ -710,22 +707,24 @@ if ( TRUE == startupHeaterControl ) { - startupHeaterControl = FALSE; F32 deltaTempC = targetTemperature - inletTemperature; F32 capDeltaTempC = MAX( deltaTempC, HEATERS_ZERO_DELTA_TEMP_C ); F32 flowrate = getTDDialysateFlowrate() / LITER_IN_ML ; F32 feedforward = calculateDutyCycle( flowrate, capDeltaTempC, PRIMARY_HEATER_MAX_PWR_WATTS, AC_HEATER_EFFICIENCY, HEATERS_MIN_DUTY_CYCLE, AC_HEATER_TX_MAX_DUTY_CYCLE ); + startupHeaterControl = FALSE; control[ heater ].data = feedforward; resetPIController( PI_CONTROLLER_ID_D5_HEAT, HEATERS_MIN_DUTY_CYCLE, feedforward ); } else { + F32 deltaTempC = 0.0F; + if ( TRUE == isTargetTempAdjusted ) { - targetTemperature = adjustedTargetTemp; + targetTemperature = adjustedPrimaryTargetTemp; } - F32 deltaTempC = fabs( targetTemperature - measuredTemperature ); + deltaTempC = fabs( targetTemperature - measuredTemperature ); if ( deltaTempC >= D5_HEATER_DEADBAND_CONTROL ) { @@ -930,20 +929,15 @@ HEATERS_DATA_T data; data.d5_HeaterDC = getHeaterControl( D5_HEAT ) * HEATERS_DUTY_CYCLE_CONVERSION_FACTOR; - data.d45_HeaterDC = getTDTargetDialysateTemperature(); - //data.d45_HeaterDC = getHeaterControl( D45_HEAT ) * HEATERS_DUTY_CYCLE_CONVERSION_FACTOR; + data.d45_HeaterDC = getHeaterControl( D45_HEAT ) * HEATERS_DUTY_CYCLE_CONVERSION_FACTOR; data.d5_HeaterTargetTemp = getHeaterTargetTemperature( D5_HEAT ); - data.d45_HeaterTargetTemp = adjustedTargetTemp; - //data.d45_HeaterTargetTemp = getHeaterTargetTemperature( D45_HEAT ); + data.d45_HeaterTargetTemp = getHeaterTargetTemperature( D45_HEAT ); data.d5_HeaterState = heatersStatus[ D5_HEAT ].state; data.d45_HeaterState = heatersStatus[ D45_HEAT ].state; -#ifndef __HEATERS_DEBUG__ - data.d5_HeaterControlCounter = heatersStatus[ D5_HEAT ].controlIntervalCounter; - data.d45_HeaterControlCounter = heatersStatus[ D45_HEAT ].controlIntervalCounter; -#else - data.d5_HeaterControlCounter = (U32)convertDC; - data.d45_HeaterControlCounter = (U32)getHeaterPWMPeriod( D5_HEAT ); -#endif + data.d5_dutyCycleCnt = convertDC; + data.d5_PWMPeriod = getHeaterPWMPeriod( D5_HEAT ); + data.d5_adjsutedTargetTemp = adjustedPrimaryTargetTemp; + data.d5_targetTempFromTD = getTDTargetDialysateTemperature(); #ifdef __HEATERS_DEBUG__ data.dbg1 = pIControlSignal[ 0 ]; data.dbg2 = pIControlSignal[ 1 ];