Index: dialin/common/alarm_defs.py =================================================================== diff -u -rcb2190355fffbd80254aeb2c9c4c05a2e561c447 -r1cd628a756982ce0e144d9f457c7052d5d48e5a0 --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision cb2190355fffbd80254aeb2c9c4c05a2e561c447) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 1cd628a756982ce0e144d9f457c7052d5d48e5a0) @@ -293,7 +293,7 @@ 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_AVAILABLE_10 = 273 + ALARM_ID_AVAILABLE_30 = 273 ALARM_ID_DG_INACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE = 274 ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE = 275 ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE = 276 Index: dialin/common/hd_defs.py =================================================================== diff -u -rcb2190355fffbd80254aeb2c9c4c05a2e561c447 -r1cd628a756982ce0e144d9f457c7052d5d48e5a0 --- dialin/common/hd_defs.py (.../hd_defs.py) (revision cb2190355fffbd80254aeb2c9c4c05a2e561c447) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision 1cd628a756982ce0e144d9f457c7052d5d48e5a0) @@ -301,7 +301,9 @@ TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE = 1 # Re-circulate Dialysate only state of the treatment re-circulate sub-mode state machine TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE = 2 # Re-circulate Blood only state of the treatment re-circulate sub-mode state machine TREATMENT_STOP_NO_RECIRC_STATE = 3 # No re-circulation state of the treatment stop sub-mode state machine - NUM_OF_TREATMENT_STOP_STATES = 4 # Number of treatment stop sub-mode states + TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE = 4 # Treatment stop recover blood detect state + TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE = 5 # Treatment stop deliver saline bolus state + NUM_OF_TREATMENT_STOP_STATES = 6 # Number of treatment stop sub-mode states @unique class TreatmentRinsebackStates(DialinEnum): @@ -369,7 +371,9 @@ HD_EVENT_PARTIAL_OCCLUSION_BASELINE = 30 # HD event partial occlusion baseline event HD_EVENT_BLOOD_LEAK_ZEROING_REQUEST = 31 # HD event blood leak zeroing request HD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED = 32 # HD event blood leak zeroing required - NUM_OF_EVENT_IDS = 33 # Total number of HD events + HD_EVENT_UF_RATE_TX_DUR = 33 # HD event UF rate changes in treatment duration. + HD_EVENT_UF_RATE_TIME_TX_DUR = 34 # HD event UF rate time difference in treatment duration. + NUM_OF_EVENT_IDS = 35 # Total number of HD events @unique class HDEventDataType(DialinEnum): @@ -391,8 +395,7 @@ SALINE_BOLUS_STATE_IDLE = 0 # No saline bolus delivery is in progress SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP = 1 # Wait for pumps to stop before starting bolus SALINE_BOLUS_STATE_IN_PROGRESS = 2 # A saline bolus delivery is in progress - SALINE_BOLUS_STATE_MAX_DELIVERED = 3 # Maximum saline bolus volume reached - no more saline bolus deliveries allowed - NUM_OF_SALINE_BOLUS_STATES = 4 # Number of saline bolus states + NUM_OF_SALINE_BOLUS_STATES = 3 # Number of saline bolus states @unique class TreatmentParameters(DialinEnum): @@ -444,3 +447,35 @@ BLD_ZEROING_VERIFY_ZEROING_STATE = 4 # Blood leak zeroing verify zeroing state. BLD_ZEROING_COMPLETE_STATE = 5 # Blood leak zeroing complete state. NUM_OF_BLD_ZEROING_STATES = 6 # Number of blood leak zeroing states. + +@unique +class GenericConfirmCommand(DialinEnum): + GENERIC_CONFIRM_CMD_REQUEST_OPEN = 0 # Generic Confirm command to display the confirmation + GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE = 1 # Generic Confirm command to hide the confirmation, due to timeout user confirmation + GENERIC_CONFIRM_CMD_REJECT = 2 # Generic Confirm command to display the confirmation rejection in case the request in not valid/accepted anymore. + GENERIC_CONFIRM_CMD_ACCEPT_CLOSE = 3 # Generic Confirm command to hide the confirmation, due to accept user confirmation. + NUM_OF_GENERIC_CONFIRM_COMMAND = 4 # Total number of generic confirm commands + +@unique +class GenericConfirmID(DialinEnum): + GENERIC_CONFIRM_ID_NONE = 0 # Generic Confirm None + GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH = 1 # Water flush stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT = 2 # Heat disinfect stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL = 3 # Chemical disinfect stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH = 4 # Chemical disinfect flush stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL = 5 # Chemical disinfect sample flush pass/fail + GENERIC_CONFIRM_ID_TREATMENT_END = 6 # End treatment user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_ACTIVE_COOL = 7 # Active cool stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_RO_PERMEATE_SAMPLE = 8 # RO permeate sample stop user confirmation + GENERIC_CONFIRM_ID_RO_PERMEATE_SAMPLE_STOP_OR_DISPENSE = 9 # RO permeate sample stop or dispense + GENERIC_CONFIRM_ID_UF_RATE_CHANGE_IN_TX_DURATION_CHANGE = 10 # Ultrafiltration rate change in treatment duration change + NUM_OF_GENERIC_CONFIRM_IDS = 11 # Total number of generic confirm IDs + +@unique +class GenericConfirmationStatus(DialinEnum): + CONFIRMATION_REQUEST_STATUS_REJECTED = 0 # Confirmation status rejected + CONFIRMATION_REQUEST_STATUS_ACCEPTED = 1 # Confirmation status accepted + CONFIRMATION_REQUEST_STATUS_TIMEOUT = 2 # Confirmation status timeout + CONFIRMATION_REQUEST_STATUS_PENDING = 3 # Confirmation status pending response + CONFIRMATION_REQUEST_STATUS_UNUSED = 4 # Confirmation status Unused + NUM_OF_CONFIRMATION_REQUEST_STATUS = 5 # Number of confirmation status Index: dialin/common/msg_defs.py =================================================================== diff -u -rcb2190355fffbd80254aeb2c9c4c05a2e561c447 -r1cd628a756982ce0e144d9f457c7052d5d48e5a0 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision cb2190355fffbd80254aeb2c9c4c05a2e561c447) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 1cd628a756982ce0e144d9f457c7052d5d48e5a0) @@ -126,14 +126,14 @@ REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE = 17 REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION = 18 REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED = 19 - REQUEST_REJECT_REASON_AVAILABLE_2 = 20 - REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED = 21 + REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_ALLOWED = 20 + REQUEST_REJECT_REASON_AVAILABLE_3 = 21 REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 22 REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE = 23 REQUEST_REJECT_REASON_ALARM_IS_ACTIVE = 24 REQUEST_REJECT_REASON_INVALID_COMMAND = 25 REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED = 26 - REQUEST_REJECT_REASON_ADDL_RINSEBACK_MAX_VOLUME_REACHED = 27 + REQUEST_REJECT_REASON_AVAILABLE_4 = 27 REQUEST_REJECT_REASON_DIALYZER_NOT_INVERTED = 28 REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM = 29 REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE = 30 Index: dialin/common/test_config_defs.py =================================================================== diff -u -rcb2190355fffbd80254aeb2c9c4c05a2e561c447 -r1cd628a756982ce0e144d9f457c7052d5d48e5a0 --- dialin/common/test_config_defs.py (.../test_config_defs.py) (revision cb2190355fffbd80254aeb2c9c4c05a2e561c447) +++ dialin/common/test_config_defs.py (.../test_config_defs.py) (revision 1cd628a756982ce0e144d9f457c7052d5d48e5a0) @@ -21,9 +21,10 @@ @unique class DGTestConfigOptions(DialinEnum): TEST_CONFIG_MIX_WITH_WATER = 0 # Test config mix with water. - TEST_CONFIG_DISABLE_INLET_WATER_TEMP_CHECK = 1 # Test config disable inlet water temperature check - TEST_CONFIG_RECOVER_TREATMENT = 2 # Test config recover treatment - NUM_OF_TEST_CONFIGS = 3 # Number of test configuration. + TEST_CONFIG_DISABLE_INLET_WATER_TEMP_CHECK = 1 # Test config disable inlet water temperature check. + TEST_CONFIG_RECOVER_TREATMENT = 2 # Test config recover treatment. + TEST_CONFIG_EXPEDITE_PRE_TREATMENT = 3 # Test config expedite pre-treatment. + NUM_OF_TEST_CONFIGS = 4 # Number of test configuration. @unique Index: dialin/ui/hd_simulator.py =================================================================== diff -u -rcb2190355fffbd80254aeb2c9c4c05a2e561c447 -r1cd628a756982ce0e144d9f457c7052d5d48e5a0 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision cb2190355fffbd80254aeb2c9c4c05a2e561c447) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 1cd628a756982ce0e144d9f457c7052d5d48e5a0) @@ -1836,8 +1836,8 @@ actual_treatment_duration: int, acid_concentrate_type: int, bicarbonate_concentrate_type: int, - potassium_concentration: int, - calcium_concentration: int, + potassium_concentration: float, + calcium_concentration: float, bicarbonate_concentration: int, sodium_concentration: int, dialysate_temperature: float, @@ -1914,8 +1914,8 @@ payload += unsigned_integer_to_bytearray(int(actual_treatment_duration)) payload += unsigned_integer_to_bytearray(int(acid_concentrate_type)) payload += unsigned_integer_to_bytearray(int(bicarbonate_concentrate_type)) - payload += unsigned_integer_to_bytearray(int(potassium_concentration)) - payload += unsigned_integer_to_bytearray(int(calcium_concentration)) + payload += float_to_bytearray(float(potassium_concentration)) + payload += float_to_bytearray(float(calcium_concentration)) payload += unsigned_integer_to_bytearray(int(bicarbonate_concentration)) payload += unsigned_integer_to_bytearray(int(sodium_concentration)) payload += float_to_bytearray(float(dialysate_temperature))