Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -re3ea1f5251b7a7af6e47b9e013c3cfc11466e255 -r696a272b81bab714038cbc3f25f0b8d633cbcf53 --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision e3ea1f5251b7a7af6e47b9e013c3cfc11466e255) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 696a272b81bab714038cbc3f25f0b8d633cbcf53) @@ -965,6 +965,7 @@ static CONCENTRATE_PUMP_STATE_T handleConcentratePumpRampToTargetSpeedState( CONCENTRATE_PUMPS_T pumpId ) { CONCENTRATE_PUMP_STATE_T state = CONCENTRATE_PUMP_RAMP_TO_TARGET_SPEED_STATE; + //U16 currentMeasuredRev = getConcPumpCurrentMeasuredRevolutionCount( pumpId ); if ( TRUE == stepConcentratePumpToTargetSpeed( pumpId ) ) { @@ -995,6 +996,7 @@ static CONCENTRATE_PUMP_STATE_T handleConcentratePumpControlTargetSpeedState( CONCENTRATE_PUMPS_T pumpId ) { CONCENTRATE_PUMP_STATE_T state = CONCENTRATE_PUMP_CONTROL_TARGET_SPEED_STATE; + //U16 currentMeasuredRev = getConcPumpCurrentMeasuredRevolutionCount( pumpId ); F32 targetToCurreSpeedDiffMLPM = fabs( getPumpTargetSpeed( pumpId ) - concentratePumps[ pumpId ].currentPumpSpeed ); if ( ++concentratePumps[ pumpId ].controlTimerCounter >= CONCENTRATE_PUMP_CONTROL_INTERVAL ) Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r6afd2e6ec147014937743fa10d0d2cf65b12e37a -r696a272b81bab714038cbc3f25f0b8d633cbcf53 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 6afd2e6ec147014937743fa10d0d2cf65b12e37a) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 696a272b81bab714038cbc3f25f0b8d633cbcf53) @@ -41,6 +41,7 @@ */ // ********** private definitions ********** + #define AC_HEATER_TX_MAX_DUTY_CYCLE 0.50F ///< AC Heater treatment mode max duty cycle (50% of 1400W : 700W ) #define AC_HEATER_HEAT_MAX_DUTY_CYCLE 0.70F ///< AC Heater heat disinfect mode max duty cycle (70% of 1400W : 980W ) #define AC_HEATER_MAX_DUTY_CYCLE 1.0F ///< AC Heater max duty cycle (100.0%) or ON state Index: firmware/App/DDCommon.h =================================================================== diff -u -r399c6b8efe0bf5ca7f5afb0aa0bc38c557fa36be -r696a272b81bab714038cbc3f25f0b8d633cbcf53 --- firmware/App/DDCommon.h (.../DDCommon.h) (revision 399c6b8efe0bf5ca7f5afb0aa0bc38c557fa36be) +++ firmware/App/DDCommon.h (.../DDCommon.h) (revision 696a272b81bab714038cbc3f25f0b8d633cbcf53) @@ -25,7 +25,7 @@ #define DD_VERSION_MAJOR 0 #define DD_VERSION_MINOR 0 #define DD_VERSION_MICRO 0 -#define DD_VERSION_BUILD 11 +#define DD_VERSION_BUILD 13 // ********** development build switches ********** @@ -40,7 +40,7 @@ //#define __PITEST__ 1 //Uncomment below if diener concentrate pump used -//#define __DIENER_CONC_PUMP__ 1 +#define __DIENER_CONC_PUMP__ 1 //Uncomment below if beta hardware is used //#define __BETA_HW_VER__ 1 @@ -55,7 +55,7 @@ //#define ENABLE_ALARM_2 //Uncomment below if balancing chamber pressure alarm is required -#define __BC_PRESSURE_ALARM__ 1 +//#define __BC_PRESSURE_ALARM__ 1 //Uncomment below to disable heaters debug message #define __HEATERS_DEBUG__ 1