Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r1953056032ff6dd26042e5761453a7a499b09364 -r09583a9e0a51bb47dd04c825cd706f5a3774bded --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 1953056032ff6dd26042e5761453a7a499b09364) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 09583a9e0a51bb47dd04c825cd706f5a3774bded) @@ -932,6 +932,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 ) ) { @@ -962,6 +963,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 -r4b09605126f35b80406e95d079f3822c51a3ba25 -r09583a9e0a51bb47dd04c825cd706f5a3774bded --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 4b09605126f35b80406e95d079f3822c51a3ba25) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 09583a9e0a51bb47dd04c825cd706f5a3774bded) @@ -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 -r734bf9d37fee349983baba56e3590600b4606241 -r09583a9e0a51bb47dd04c825cd706f5a3774bded --- firmware/App/DDCommon.h (.../DDCommon.h) (revision 734bf9d37fee349983baba56e3590600b4606241) +++ firmware/App/DDCommon.h (.../DDCommon.h) (revision 09583a9e0a51bb47dd04c825cd706f5a3774bded) @@ -25,8 +25,9 @@ #define DD_VERSION_MAJOR 0 #define DD_VERSION_MINOR 0 #define DD_VERSION_MICRO 0 -#define DD_VERSION_BUILD 9 +#define DD_VERSION_BUILD 30 + // ********** development build switches ********** #ifndef _RELEASE_ Index: firmware/App/Drivers/TemperatureSensors.c =================================================================== diff -u -r9e6e86f604c8cce7c1704ae55d1e026de3422782 -r09583a9e0a51bb47dd04c825cd706f5a3774bded --- firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 9e6e86f604c8cce7c1704ae55d1e026de3422782) +++ firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 09583a9e0a51bb47dd04c825cd706f5a3774bded) @@ -34,6 +34,8 @@ // ********** private definitions ********** +#define USE_PT_100 1 ///< flag to check PT100 use in calculations + #define PRIMARY_HEATER_TEMP_SENSORS_GAIN 8U ///< Primary heater temperature sensors gain. #define PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE 20000 ///< Primary heater temperature sensors reference resistance. #define PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE 1000U ///< Primary heater temperature sensors zero degree resistance. Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r67731d57db9a620418b3b848d8f75ff204902c36 -r09583a9e0a51bb47dd04c825cd706f5a3774bded --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 67731d57db9a620418b3b848d8f75ff204902c36) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 09583a9e0a51bb47dd04c825cd706f5a3774bded) @@ -169,6 +169,11 @@ { execBalancingChamberControl(); } + //Test request to handle only balancing chamber switching + else if ( TRUE == pendingBalanceChamberSwOnlyRequest ) + { + execBalancingChamberControl(); + } // else if ( TRUE == pendingStartDDFlushRequest ) // { // pendingStartDDFlushRequest = FALSE; Index: firmware/source/sys_main.c =================================================================== diff -u -r4b09605126f35b80406e95d079f3822c51a3ba25 -r09583a9e0a51bb47dd04c825cd706f5a3774bded --- firmware/source/sys_main.c (.../sys_main.c) (revision 4b09605126f35b80406e95d079f3822c51a3ba25) +++ firmware/source/sys_main.c (.../sys_main.c) (revision 09583a9e0a51bb47dd04c825cd706f5a3774bded) @@ -46,6 +46,7 @@ /* USER CODE END */ /* Include Files */ + #include "sys_common.h" /* USER CODE BEGIN (1) */