Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r647ed0beef9e4aeefb3a0bc0267254dd36cfe685 -rfda570ba4c27bd2f3458d3549474b18f2c367aa0 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 647ed0beef9e4aeefb3a0bc0267254dd36cfe685) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision fda570ba4c27bd2f3458d3549474b18f2c367aa0) @@ -18,6 +18,7 @@ // TODO for testing only remove #include "mibspi.h" +#include "FPGA.h" // TODO for testing only remove #include "AlarmMgmt.h" @@ -598,9 +599,9 @@ #ifdef DEBUG_ENABLED { char debugTempStr[ 256 ]; - sprintf( debugTempStr, "MPDuty: %6.2f, SPDuty: %6.2f, THDuty: %6.2f, TPi: %6.2f, TPo: %6.2f, TD1: %6.2f, " - "TD2: %6.2f, TRo: %6.2f, TDi: %6.2f, TPh: %6.2f, TTh: %6.2f, PTarg: %6.2f, TTarg: %6.2f\r\n", - mainPrimaryHeaterDutyCycle, smallPrimaryHeaterDutyCycle, trimmerHeaterDutyCycle, + sprintf( debugTempStr, "MPDC: %2d, SPDC: %2d, THDC: %2d, TPi: %6.2f, TPo: %6.2f, TD1: %6.2f, " + "TD2: %6.2f, TRo: %6.2f, TDi: %6.2f, TPh: %6.2f, TTh: %6.2f, PTarg: %6.2f, TTarg: %6.2f, ROFlow: %6.2f\r\n", + (U32)(mainPrimaryHeaterDutyCycle*100), (U32)(smallPrimaryHeaterDutyCycle*100), (U32)(trimmerHeaterDutyCycle*100), getTemperatureValue ( TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR ), getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR ), getTemperatureValue ( TEMPSENSORS_CONDUCTIVITY_SENSOR_1_TEMP_SENSOR ), @@ -609,7 +610,8 @@ getTemperatureValue ( TEMPSENSORS_INLET_DIALYSATE_TEMP_SENSOR ), getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP_SENSOR ), getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP_SESNOR ), - primaryHeaterTargetTemperature, trimmerHeaterTargetTemperature); + primaryHeaterTargetTemperature, trimmerHeaterTargetTemperature, + (F32)(getFPGAROPumpFlowRate()*0.00018)); sendDebugData ( (U08*)debugTempStr, strlen(debugTempStr) ); } #endif