Index: dialin/common/dg_defs.py =================================================================== diff -u -r7ea4b936cef531b2cde9053ae58b7119a3bf0e6c -r4c63e5617400d2246d2e0290a9c63da4defbb2fc --- dialin/common/dg_defs.py (.../dg_defs.py) (revision 7ea4b936cef531b2cde9053ae58b7119a3bf0e6c) +++ dialin/common/dg_defs.py (.../dg_defs.py) (revision 4c63e5617400d2246d2e0290a9c63da4defbb2fc) @@ -53,12 +53,13 @@ DG_POST_STATE_UV_REACTORS = 14 DG_POST_STATE_THERMISTORS = 15 DG_POST_STATE_FANS = 16 - DG_POST_STATE_WATCHDOG = 17 - DG_POST_STATE_SAFETY_SHUTDOWN = 18 - DG_POST_STATE_LOAD_CELL = 19 - DG_POST_STATE_COMPLETED = 20 - DG_POST_STATE_FAILED = 21 - NUM_OF_DG_POST_STATES = 22 + DG_POST_STATE_DIALYSATE_FLOW_SENSOR = 17 + DG_POST_STATE_WATCHDOG = 18 + DG_POST_STATE_SAFETY_SHUTDOWN = 19 + DG_POST_STATE_LOAD_CELL = 20 + DG_POST_STATE_COMPLETED = 21 + DG_POST_STATE_FAILED = 22 + NUM_OF_DG_POST_STATES = 23 @unique Index: dialin/hd/calibration_record.py =================================================================== diff -u -r7ea4b936cef531b2cde9053ae58b7119a3bf0e6c -r4c63e5617400d2246d2e0290a9c63da4defbb2fc --- dialin/hd/calibration_record.py (.../calibration_record.py) (revision 7ea4b936cef531b2cde9053ae58b7119a3bf0e6c) +++ dialin/hd/calibration_record.py (.../calibration_record.py) (revision 4c63e5617400d2246d2e0290a9c63da4defbb2fc) @@ -41,6 +41,7 @@ _DEFAULT_CONCENTRATE_VALUE = 1 _DEFAULT_CALIBRATION_VALUE = 1 _DEFAULT_BLOOD_LEAK_SET_POINT = 20 + _DEFAULT_HEPARIN_PUMP_VOLTAGE = 0.15 _DEFAULT_TIME_VALUE = 0 _DEFAULT_CRC_VALUE = 0 @@ -425,10 +426,7 @@ hardware = OrderedDict() for i in hardware_names: - hardware[i] = {'fourth_order': ['