Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -r27cf459aaabea8e98188e929d2d762942b3e78e1 -r969ec174d1d6254ef5b7f90723d5b5313cfa3932 --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 27cf459aaabea8e98188e929d2d762942b3e78e1) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 969ec174d1d6254ef5b7f90723d5b5313cfa3932) @@ -52,7 +52,6 @@ #define DIALYSATE_FILL_TIME_OUT ( 5 * SEC_PER_MIN * MS_PER_SECOND ) ///< Time out period when reservoir is not filled with correct dialysate. #define EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS ( 5 * MS_PER_SECOND ) ///< Persistent period for empty bottle detect. - #define CONCENTRATE_PUMP_PRIME_INTERVAL ( 3 * MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Persistent time interval for concentrate pumps prime. #define ACID_BICARB_CONCENTRATE_ADDITION_MULTIPLER 1.06 ///< Acid and bicarbonate concentrates make up around 6% to total volume. @@ -603,13 +602,9 @@ #ifndef DISABLE_MIXING requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID ); requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB ); - - if ( concentratePumpPrimeCount++ > CONCENTRATE_PUMP_PRIME_INTERVAL ) #endif - { - setValveState( VPO, VALVE_STATE_FILL_C_TO_NC ); - result = DG_FILL_MODE_STATE_DELIVER_DIALYSATE; - } + setValveState( VPO, VALVE_STATE_FILL_C_TO_NC ); + result = DG_FILL_MODE_STATE_DELIVER_DIALYSATE; } else { @@ -887,9 +882,10 @@ static void setFillInfoToRTCRAM( void ) { DG_HEATERS_RECORD_T record; + record.averageFillFlow = fillStatus.fillFlowRateAverage; - setHeatersInfoRecord( (U08*)&record ); + setHeatersInfoRecord( (U08*)&record, sizeof( DG_HEATERS_RECORD_T ) ); } /**@}*/