Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -raada74112204bc8e7c004510d0c86afb88cccc14 -r87acb1655edbf974497e4300f2c18eea62f8acba --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision aada74112204bc8e7c004510d0c86afb88cccc14) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 87acb1655edbf974497e4300f2c18eea62f8acba) @@ -220,9 +220,9 @@ if ( ( primaryHeaterTargetTemperature >= MINIMUM_TARGET_TEMPERATURE ) && ( primaryHeaterTargetTemperature <= MAXIMUM_TARGET_TEMPERATURE ) ) { -#ifndef DISABLE_HEATERS_AND_TEMPS +//#ifndef DISABLE_HEATERS_AND_TEMPS hasStartPrimaryHeaterRequested = TRUE; -#endif +//#endif status = TRUE; } @@ -335,7 +335,7 @@ if ( isPrimaryHeaterOn || isTrimmerHeaterOn ) { // If the RO pump is not on, turn off the heaters - if ( !isReverseOsmosisPumpOn() || getMeasuredROFlowRate() < MIN_RO_FLOWRATE_LPM ) + /*if ( !isReverseOsmosisPumpOn() || getMeasuredROFlowRate() < MIN_RO_FLOWRATE_LPM ) { if ( ++heatersOnWithNoFlowTimeOut > HEATERS_ON_WITH_NO_FLOW_TIMEOUT_COUNT ) { @@ -344,7 +344,7 @@ heatersOnWithNoFlowTimeOut = 0; } - } + }*/ } //TODO add code to remember the former state of the heaters and if they were on, turn them on again @@ -614,7 +614,7 @@ primaryHeaterTimerCounter = 0; } - if ( ! isPrimaryHeaterOn ) + if ( isPrimaryHeaterOn != TRUE ) { state = PRIMARY_HEATERS_EXEC_STATE_OFF; } @@ -777,9 +777,9 @@ { HEATERS_DATA_T data; - //data.mainPrimaryDutyCyclePct = mainPrimaryHeaterDutyCycle * 100; - //data.smallPrimaryDutyCyclePct = smallPrimaryHeaterDutyCycle * 100; - //data.trimmerDutyCyclePct = trimmerHeaterDutyCycle * 100; + data.mainPrimayHeaterDC = mainPrimaryHeaterDutyCycle * 100.0; + data.smallPrimaryHeaterDC = smallPrimaryHeaterDutyCycle * 100.0; + data.trimmerHeaterDC = trimmerHeaterDutyCycle * 100.0; broadcastHeatersData( &data );