Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up' into develop

DEN-11750 added a build switch for heat disinfect

Seems like this should be an alarm.

Seems like this should be an alarm.

This will be addressed once we were working on deciding the number of rinses.

This will be addressed once we were working on deciding the number of rinses.

This will be addressed once we were working on deciding the number of rinses.

This will be addressed once we were working on deciding the number of rinses.

This will be addressed once we were working on deciding the number of rinses.

This will be addressed once we were working on deciding the number of rinses.

This will be addressed once we were working on deciding the number of rinses.

This will be addressed once we were working on deciding the number of rinses.

Done.

Done.

Done.

Done.

I will test this in DEN-12224.

I will test this in DEN-12224.

Done.

Done.

DG-DEN-12121_SW Dev Sprint 65
DG-DEN-12121_SW Dev Sprint 65
Removed the lines requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB ); The concentrate pumps are already OFF prior to transitioning to ...

Removed the lines
requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );

The concentrate pumps are already OFF prior to transitioning to produce dialysate state.

According Blain's PowerPoint, for bicard, the RO Pump speed is 400mL/min. 800mL/min is for acid.

According Blain's PowerPoint, for bicard, the RO Pump speed is 400mL/min. 800mL/min is for acid.

Done.

Done.

Added param: testValue, baseValue, percentFactor

Added param: testValue, baseValue, percentFactor

RO pump rate is already set in the previous state.

RO pump rate is already set in the previous state.

Done.

Done.

Added requestNewOperationMode( DG_MODE_GENE );

Added requestNewOperationMode( DG_MODE_GENE );

Renamed roPumpSpeed to roPumpFlushBubblesSpeed and updated comments

Renamed roPumpSpeed to roPumpFlushBubblesSpeed and updated comments

Added high and low temperature check BOOL isWaterTempTooHigh = ( temperature > MAX_WATER_TEMPERATURE_ALARM ); BOOL isWaterTempTooLow = ( temperature < MIN_WATER_TEMPERATURE_ALARM );

Added high and low temperature check
BOOL isWaterTempTooHigh = ( temperature > MAX_WATER_TEMPERATURE_ALARM );

BOOL isWaterTempTooLow = ( temperature < MIN_WATER_TEMPERATURE_ALARM );

Renamed #define to #define MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE 22U #define MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE 24U #define MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE 37U #define MAX_WATER_TE...

Renamed #define to

#define MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE 22U
#define MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE 24U
#define MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE 37U
#define MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE 39U
#define MIN_WATER_TEMPERATURE_ALARM 22U
#define MAX_WATER_TEMPERATURE_ALARM 39U

Renamed #define to #define MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE 22U #define MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE 24U #define MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE 37U #define MAX_WATER_TE...

Renamed #define to

#define MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE 22U
#define MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE 24U
#define MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE 37U
#define MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE 39U
#define MIN_WATER_TEMPERATURE_ALARM 22U
#define MAX_WATER_TEMPERATURE_ALARM 39U

Changed CONCENTRATE_PUMP_MAX_SPEED from 40.0 to 48.0.

Changed CONCENTRATE_PUMP_MAX_SPEED from 40.0 to 48.0.

Added a blank line. Asked Dara to add acid and bicard values to the calibration record on 2/8/2022.

Added a blank line.
Asked Dara to add acid and bicard values to the calibration record on 2/8/2022.

Checked with Systems. Conductivity min value is 100. #define COND_SENSOR_CPI_MAX_VALUE 2200 #define COND_SENSOR_CPI_WARNING_HIGH 2200 #define COND_SENSOR_CPI_WARNING_LOW 2000 #define COND_SENSOR_CP...

Checked with Systems. Conductivity min value is 100.
#define COND_SENSOR_CPI_MAX_VALUE 2200
#define COND_SENSOR_CPI_WARNING_HIGH 2200
#define COND_SENSOR_CPI_WARNING_LOW 2000
#define COND_SENSOR_CPI_MIN_VALUE 100

Updated code to include checking for high conductivity

Updated code to include checking for high conductivity

Added ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY = 158, ///< Inlet water conductivity too high in AlarmDefs.h

Added ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY = 158, ///< Inlet water conductivity too high in AlarmDefs.h

Do we need to fix this?

Do we need to fix this?