Index: dialin/common/alarm_defs.py =================================================================== diff -u -r8474f8e345f165187d4dde17840575ee4e98a9b4 -re21625cbe20d1a836cb78dbc1350fcd894bdcb9f --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 8474f8e345f165187d4dde17840575ee4e98a9b4) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision e21625cbe20d1a836cb78dbc1350fcd894bdcb9f) @@ -86,10 +86,10 @@ ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 63 ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 64 ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 65 - ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID = 66 + ALARM_ID____AVAILABLE_21 = 66 ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE = 67 - ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE = 68 - ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE = 69 + ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE = 68 + ALARM_ID____AVAILABLE_6 = 69 ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE = 70 ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE = 71 ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE = 72 @@ -107,17 +107,17 @@ ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR = 84 ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE = 85 ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR = 86 - ALARM_ID_HD_DPI_OCCLUSON_READ_TIMEOUT_ERROR = 87 - ALARM_ID_HD_DPO_OCCLUSION_READ_TIMEOUT_ERROR = 88 + ALARM_ID____AVAILABLE_10 = 87 + ALARM_ID____AVAILABLE_11 = 88 ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR = 89 - ALARM_ID_HD_DPI_OCCLUSION_SENSOR_ERROR = 90 - ALARM_ID_HD_DPO_OCCLUSION_SENSOR_ERROR = 91 - ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR = 92 - ALARM_ID_HD_BP_FLOW_SENSOR_ERROR = 93 - ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR = 94 - ALARM_ID_HD_DP_FLOW_SENSOR_ERROR = 95 - ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR = 96 - ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR = 97 + ALARM_ID____AVAILABLE_12 = 90 + ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE = 91 + ALARM_ID____AVAILABLE_14 = 92 + ALARM_ID____AVAILABLE_15 = 93 + ALARM_ID____AVAILABLE_16 = 94 + ALARM_ID____AVAILABLE_17 = 95 + ALARM_ID____AVAILABLE_18 = 96 + ALARM_ID____AVAILABLE_19 = 97 ALARM_ID_HD_BATTERY_COMM_FAULT = 98 ALARM_ID_HD_SYRINGE_PUMP_STALL = 99 ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100 @@ -126,7 +126,7 @@ ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR = 103 ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS = 104 ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID = 105 - ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID = 106 + ALARM_ID____AVAILABLE_20 = 106 ALARM_ID_DG_RESTARTED_FAULT = 107 ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR = 108 ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR = 109 @@ -175,9 +175,9 @@ ALARM_ID_INLET_WATER_LOW_PRESSURE = 152 ALARM_ID_PRIME_COMPLETED_HIGH = 153 ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 154 - ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR = 155 + ALARM_ID____AVAILABLE_22 = 155 ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 156 - ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = 157 + ALARM_ID____AVAILABLE_23 = 157 ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 158 ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159 ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 160 @@ -188,8 +188,8 @@ ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM = 165 ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM = 166 ALARM_ID_CARTRIDGE_DOOR_OPENED = 167 - ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH = 168 - ALARM_ID_DIALYSATE_TEMPERATURE_TOO_LOW = 169 + ALARM_ID_HD_ACTIVE_RESERVOIR_DEPLETION_TIME_OUT = 168 + ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE = 169 ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY = 170 ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION = 171 ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM = 172 @@ -257,7 +257,7 @@ ALARM_ID_RTC_RAM_OPS_ERROR = 234 ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK = 235 ALARM_ID_INSTALL_NEW_CARTRIDGE = 236 - ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY = 237 + ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT = 237 ALARM_ID_NO_CARTRIDGE_LOADED = 238 ALARM_ID_CARTRIDGE_REMOVAL_FAILURE = 239 ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 240 @@ -293,3 +293,19 @@ ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED = 270 ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED = 271 ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE = 272 + ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE = 273 + ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE = 274 + ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE = 275 + ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE = 276 + ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE = 277 + ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE = 278 + ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT = 279 + ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR = 280 + ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME = 281 + ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME = 282 + ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE = 283 + ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE = 284 + ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING = 285 + ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING = 286 + ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 287 + ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT = 288 Index: tests/test_uf.py =================================================================== diff -u -r5400dea744738a3fed51b246038c93ebffcd914a -re21625cbe20d1a836cb78dbc1350fcd894bdcb9f --- tests/test_uf.py (.../test_uf.py) (revision 5400dea744738a3fed51b246038c93ebffcd914a) +++ tests/test_uf.py (.../test_uf.py) (revision e21625cbe20d1a836cb78dbc1350fcd894bdcb9f) @@ -64,12 +64,15 @@ ", ROP.s, " + '{:9.2f}'.format(dg.ro_pump.target_pressure_psi) + \ ", DRP.s, " + '{:9.2f}'.format(dg.drain_pump.target_drain_pump_rpm) pumpMeasSpds = ", BP.m, " + '{:7.1f}'.format(hd.bloodflow.measured_blood_pump_speed) + \ + ", BP.m2, " + '{:7.1f}'.format(hd.bloodflow.get_measured_blood_pump_motor_controller_speed()) + \ ", BP.r, " + '{:6.1f}'.format(hd.bloodflow.measured_blood_pump_rotor_speed) + \ ", BP.f, " + '{:7.1f}'.format(hd.bloodflow.measured_blood_flow_rate) + \ ", DPi.m, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_speed) + \ + ", DPi.m2, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.get_measured_dialysate_inlet_pump_motor_controller_speed()) + \ ", DPi.r, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_rotor_speed) + \ ", DPi.f, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_flow_rate) + \ ", DPo.m, " + '{:7.1f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_speed) + \ + ", DPo.m2, " + '{:7.1f}'.format(hd.dialysate_outlet_flow.get_measured_dialysate_outlet_pump_motor_controller_speed()) + \ ", DPo.r, " + '{:6.1f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_rotor_speed) + \ ", FMD.f, " + '{:7.4f}'.format(dg.dialysate_flow_sensor.get_flow_rate()) + \ ", ROP.f, " + '{:9.3f}'.format(dg.ro_pump.measured_flow_rate_lpm)