Index: firmware/App/Controllers/DialysatePumps.c =================================================================== diff -u -r1644c24b0b51661ceaba579e5ebee0d1d5bad85f -r3f1b02b5eeec93b2b7ad22f8fffcf3caffaebbaf --- firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision 1644c24b0b51661ceaba579e5ebee0d1d5bad85f) +++ firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision 3f1b02b5eeec93b2b7ad22f8fffcf3caffaebbaf) @@ -39,14 +39,15 @@ */ // ********** private definitions ********** + #define DIALYSATE_PUMP_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the dialysate pump data is published on the CAN bus. #define DATA_PUBLISH_COUNTER_START_COUNT 60 ///< Data publish counter start count. #define DP_CONTROL_INTERVAL_MS 1000 ///< Dialysate pump control interval in ms #define DP_CONTROL_INTERVAL ( DP_CONTROL_INTERVAL_MS / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the dialysate pump is controlled. #define DIALYSATE_PUMP_CONTROL_RUN 0x01 ///< Dialysate pump control run pump. #define DIALYSATE_PUMP_CONTROL_STOP 0x00 ///< Dialysate pump control stop pump. #define DIALYSATE_PUMP_FORWARD_DIR 1 ///< Dialysate pump forward direction. reverse direction is not allowed. -#define DIALYSATE_PUMP_RAMP_SPEED_INCREMENT 10.0F ///< Speed increase when controlling dialysate pump ramp to target step speed. +#define DIALYSATE_PUMP_RAMP_SPEED_INCREMENT 50.0F ///< Speed increase when controlling dialysate pump ramp to target step speed. #define ZERO_SPEED 0.0F ///< Zero speed/RPM value. #define DIALYSATE_PUMP_MAX_CURRENT_WHEN_OFF_A 0.1F ///< Dialysate pump maximum current when the pump is off in amps. @@ -124,9 +125,8 @@ // ********** 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. static OVERRIDE_F32_T pumpTargetSpeed[ NUM_OF_DIALYSATE_PUMPS ]; ///< Target dialysate pumps' speed (mL/min).forward direction only, hence positive speed. @@ -202,6 +202,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; @@ -271,10 +276,11 @@ *************************************************************************/ static void calculateDegasPumpTargetPressure( void ) { - F32 pressureInmmHg = getFilteredPressure( BARO_PRES ); + //TODO: Uncomment below once baro reading available from TD. + //F32 pressureInmmHg = getFilteredPressure( BARO_PRES ); //Get the degassing target pressure - pumpTargetPressure[D12_PUMP].data = ( ( DEGAS_PUMP_SLOPE_FACTOR * pressureInmmHg ) + DEGAS_PUMP_INTERCEPT_FACTOR ) + DEGAS_PUMP_TARGET_PRES_ADJ_THRESHOLD; + //pumpTargetPressure[D12_PUMP].data = ( ( DEGAS_PUMP_SLOPE_FACTOR * pressureInmmHg ) + DEGAS_PUMP_INTERCEPT_FACTOR ) + DEGAS_PUMP_TARGET_PRES_ADJ_THRESHOLD; } /*********************************************************************//**