Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r7d24ef2e6a4130b3a049e6106a0371fc6503271f -ra8b1004967be1c3bd4d46e96ff5886a0ec1446cc --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 7d24ef2e6a4130b3a049e6106a0371fc6503271f) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision a8b1004967be1c3bd4d46e96ff5886a0ec1446cc) @@ -137,10 +137,8 @@ static BOOL acidConcentratePumpParkPersistenceClear; ///< Boolean acid park persistence clearing. static BOOL bicarbConcentratePumpParkPersistenceClear; ///< Boolean for bicarb park persistence clearing. static BOOL ufPumpParkPersistenceClear; ///< Boolean for UF pump park persistence clearing. +static OVERRIDE_U32_T concentratePumpDataPublishInterval; ///< Concentrate pump data publish interval. -/// Concentrate pump data publish interval. -static OVERRIDE_U32_T concentratePumpDataPublishInterval = { CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL, CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL, 0, 0 }; - static CONCENTRATE_PUMP_T concentratePumps[ NUM_OF_CONCENTRATE_PUMPS ]; ///< Array of concentrate pumps' data structure. static OVERRIDE_U32_T hasParkBeenRequested[ NUM_OF_CONCENTRATE_PUMPS ]; ///< Flag indicates a request to park the pump. static OVERRIDE_F32_T pumpTargetSpeed[ NUM_OF_CONCENTRATE_PUMPS ]; ///< Target concentrate pumps' speed (mL/min). @@ -225,6 +223,11 @@ isDosingCompleted[ pumpId ] = FALSE; } + concentratePumpDataPublishInterval.data = CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL; + concentratePumpDataPublishInterval.ovInitData = CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL; + concentratePumpDataPublishInterval.ovData = 0; + concentratePumpDataPublishInterval.override = OVERRIDE_RESET; + initPersistentAlarm( ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DD_D10_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS ); initPersistentAlarm( ALARM_ID_DD_D76_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS );