Index: firmware/App/Controllers/DialysatePumps.c =================================================================== diff -u -r89f18a07a6d5837bf9b4559a69046e2b06f32c35 -ra8b1004967be1c3bd4d46e96ff5886a0ec1446cc --- firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35) +++ firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision a8b1004967be1c3bd4d46e96ff5886a0ec1446cc) @@ -124,9 +124,7 @@ // ********** private data ********** static U32 dialysatePumpDataPublicationTimerCounter; ///< Used to schedule dialysate pump data publication to CAN bus. -static OVERRIDE_U32_T dialysatePumpDataPublishInterval = { DIALYSATE_PUMP_DATA_PUB_INTERVAL, - DIALYSATE_PUMP_DATA_PUB_INTERVAL, - 0, 0 }; ///< Interval (in ms) at which to publish dialysate pump data to CAN bus. +static OVERRIDE_U32_T dialysatePumpDataPublishInterval; ///< Interval (in ms) at which to publish dialysate pump data to CAN bus. //static DD_DIALYSATE_PUMP_CAL_RECORD_T dialysatePumpCalRecord; ///< Dialysate pump calibration record. static DIALYSATE_PUMP_DATA_T dialysatePumps[ NUM_OF_DIALYSATE_PUMPS ]; ///< Array of dialysate pumps data structure. @@ -203,6 +201,11 @@ signalDialysatePumpHardStop( pumpId ); } + dialysatePumpDataPublishInterval.data = DIALYSATE_PUMP_DATA_PUB_INTERVAL; + dialysatePumpDataPublishInterval.ovInitData = DIALYSATE_PUMP_DATA_PUB_INTERVAL; + dialysatePumpDataPublishInterval.ovData = 0; + dialysatePumpDataPublishInterval.override = OVERRIDE_RESET; + pumpTargetPressure[D12_PUMP].data = DEFAULT_FRESH_DIALYSATE_TARGET_PRESSURE_PSI; pumpTargetPressure[D12_PUMP].ovInitData = DEFAULT_FRESH_DIALYSATE_TARGET_PRESSURE_PSI; pumpTargetPressure[D12_PUMP].ovData = 0.0F; @@ -261,6 +264,7 @@ *************************************************************************/ static void calculateDegasPumpTargetPressure( void ) { + //TODO: Uncomment below once baro reading available from TD. //F32 pressureInmmHg = getFilteredPressure( BARO_PRES ); //Get the degassing target pressure