Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -re0102a0a08c0d83bcc8e959551079063e2e60d9f -r4d529ed12453439c30f85108ce8b357a3df83348 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision e0102a0a08c0d83bcc8e959551079063e2e60d9f) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 4d529ed12453439c30f85108ce8b357a3df83348) @@ -933,13 +933,10 @@ 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 ]; Index: firmware/App/Controllers/Heaters.h =================================================================== diff -u -re0102a0a08c0d83bcc8e959551079063e2e60d9f -r4d529ed12453439c30f85108ce8b357a3df83348 --- firmware/App/Controllers/Heaters.h (.../Heaters.h) (revision e0102a0a08c0d83bcc8e959551079063e2e60d9f) +++ firmware/App/Controllers/Heaters.h (.../Heaters.h) (revision 4d529ed12453439c30f85108ce8b357a3df83348) @@ -52,8 +52,10 @@ F32 d45_HeaterTargetTemp; ///< Trimmer heater target temperature U32 d5_HeaterState; ///< Primary heater state U32 d45_HeaterState; ///< Trimmer heater state - U32 d5_HeaterControlCounter; ///< Primary heater control interval count - U32 d45_HeaterControlCounter; ///< Trimmer heater control interval count + F32 d5_dutyCycleCnt; ///< Primary heater duty cycle in counts + F32 d5_PWMPeriod; ///< Primary heater PWM period + F32 d5_adjsutedTargetTemp; ///< Primary heater adjsuted target temperature + F32 d5_targetTempFromTD; ///< User set target temperature #ifdef __HEATERS_DEBUG__ F32 dbg1; F32 dbg2;