Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -rb549cc9586c585902f891e1aac5e59b7de445f71 -r85339f0aa398217143fa3178a05ad5d6c6374bb8 --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision b549cc9586c585902f891e1aac5e59b7de445f71) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 85339f0aa398217143fa3178a05ad5d6c6374bb8) @@ -225,7 +225,7 @@ checkPersistentAlarm( ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT, isBicarbPumpParked, isBicarbPumpParked, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS ); } - checkPersistentAlarm(ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, isConcPumpFault , fpgaConcPumpsFault, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD ); + checkPersistentAlarm( ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, isConcPumpFault, fpgaConcPumpsFault, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD ); if ( ++concentratePumpMonitorTimerCounter >= getU32OverrideValue( &concentratePumpDataPublishInterval ) ) { Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r4c92e7dd693425816a40a80f64aeb777384f639d -r85339f0aa398217143fa3178a05ad5d6c6374bb8 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 4c92e7dd693425816a40a80f64aeb777384f639d) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 85339f0aa398217143fa3178a05ad5d6c6374bb8) @@ -145,9 +145,9 @@ heatersStatus[ heater ].state = HEATER_EXEC_STATE_OFF; heatersStatus[ heater ].startHeaterSignal = FALSE; heatersStatus[ heater ].isHeaterOn = FALSE; - heatersStatus[ heater ].dutyCycle.data = 0.0F; - heatersStatus[ heater ].dutyCycle.ovData = 0.0F; - heatersStatus[ heater ].dutyCycle.ovInitData = 0.0F; + heatersStatus[ heater ].dutyCycle.data = HEATERS_MIN_DUTY_CYCLE; + heatersStatus[ heater ].dutyCycle.ovData = HEATERS_MIN_DUTY_CYCLE; + heatersStatus[ heater ].dutyCycle.ovInitData = HEATERS_MIN_DUTY_CYCLE; heatersStatus[ heater ].dutyCycle.override = 0; heatersStatus[ heater ].targetFlow = 0.0F; heatersStatus[ heater ].hasTargetTempChanged = FALSE; Index: firmware/App/Modes/ModeHeatDisinfect.c =================================================================== diff -u -rac264e13479986e5db728ce6ba3c08cb1a871266 -r85339f0aa398217143fa3178a05ad5d6c6374bb8 --- firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision ac264e13479986e5db728ce6ba3c08cb1a871266) +++ firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision 85339f0aa398217143fa3178a05ad5d6c6374bb8) @@ -1823,7 +1823,7 @@ if ( ALARM_ID_NO_ALARM == alarmDetectedPendingTrigger ) { #ifndef _RELEASE_ - if ( nelsonSupport != NELSON_INOCULATE ) + if ( ( nelsonSupport != NELSON_INOCULATE ) && ( nelsonSupport != NELSON_POS_CONTROL_HEAT_DISINFECT ) ) #endif { if ( TDiTempC >= HEAT_DISINFECT_TRIMMER_HEATER_STOP_TEMP_C ) Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r686acb428a08c632526ca35c8a0102ab22836bd0 -r85339f0aa398217143fa3178a05ad5d6c6374bb8 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 686acb428a08c632526ca35c8a0102ab22836bd0) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 85339f0aa398217143fa3178a05ad5d6c6374bb8) @@ -502,7 +502,7 @@ } // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED ); + serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_REQUIRED ); } /*********************************************************************//**