Index: dialin/common/hd_defs.py =================================================================== diff -u -r5f109951b1eec291a8da38aba01470d3aa5a95b5 -r4cf3bd245a8cbaf4b5bfc20a0e2d9473255a5b9b --- dialin/common/hd_defs.py (.../hd_defs.py) (revision 5f109951b1eec291a8da38aba01470d3aa5a95b5) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision 4cf3bd245a8cbaf4b5bfc20a0e2d9473255a5b9b) @@ -230,22 +230,7 @@ HD_POST_TREATMENT_VERIFY_STATE = 3 # Verify cartridge removed, syringe removed, and reservoirs drained state NUM_OF_HD_POST_TREATMENT_STATES = 4 # Number of post-treatment mode states - @unique -class PreTreatmentModeStates(DialinEnum): - HD_PRE_TREATMENT_START_STATE = 0 # Start pre-treatment mode state - HD_PRE_TREATMENT_WATER_SAMPLE_STATE = 1 # Water sample state - HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE = 2 # Consumable self-tests state - HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE = 3 # No cartridge self-tests state - HD_PRE_TREATMENT_CART_INSTALL_STATE = 4 # Consumable and cartridge installation state - HD_PRE_TREATMENT_SELF_TEST_DRY_STATE = 5 # Self-tests when the cartridge is dry state - HD_PRE_TREATMENT_PRIME_STATE = 6 # Prime blood and dialysate circuits and run wet self-tests state - HD_PRE_TREATMENT_RECIRCULATE_STATE = 7 # Re-circulate blood and dialysate circuits state - HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE = 8 # Patient connection state - NUM_OF_HD_PRE_TREATMENT_STATES = 9 # Number of pre-treatment mode states - - -@unique class PreTreatmentSampleWaterStates(DialinEnum): SAMPLE_WATER_SETUP_STATE = 0 # Sample water setup (flush filter) state SAMPLE_WATER_STATE = 1 # Sample water state, receiving sample water commands from the user Index: dialin/common/msg_ids.py =================================================================== diff -u -r1c5dbffa6b205c14f92e05badc563f2a84980bfa -r4cf3bd245a8cbaf4b5bfc20a0e2d9473255a5b9b --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 1c5dbffa6b205c14f92e05badc563f2a84980bfa) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 4cf3bd245a8cbaf4b5bfc20a0e2d9473255a5b9b) @@ -339,6 +339,9 @@ MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND = 0x8082 MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0x8083 MSG_ID_HD_SEND_ALARMS_COMMAND = 0x8084 + MSG_ID_HD_BLOOD_PUMP_SET_PWM = 0x8085 + MSG_ID_HD_DIAL_IN_SET_PWM = 0x8086 + MSG_ID_HD_DIAL_OUT_SET_PWM = 0x8087 MSG_ID_DG_TESTER_LOGIN_REQUEST = 0xA000 MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001