Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -rd1377c677d8a9fc576f941f413ae3b6af6f50776 -r3284125031072078a4b61a83d36bff419a770918 --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision d1377c677d8a9fc576f941f413ae3b6af6f50776) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 3284125031072078a4b61a83d36bff419a770918) @@ -45,32 +45,33 @@ class TDInitStates(DialinEnum): POST_STATE_START = 0 # Start initialize & POST mode state POST_STATE_FW_INTEGRITY = 1 # Run firmware integrity test state - POST_STATE_RTC = 2 # Run RTC test state - POST_STATE_NVDATAMGMT = 3 # Run NV Data Mgmt. test state - POST_STATE_WATCHDOG = 4 # Run watchdog test state - POST_STATE_SAFETY_SHUTDOWN = 5 # Run safety shutdown test state - POST_STATE_BLOOD_FLOW = 6 # Run blood flow test state - POST_STATE_DIALYSATE_INLET_FLOW = 7 # Run dialysate inlet flow test state - POST_STATE_DIALYSATE_OUTLET_FLOW = 8 # Run dialysate outlet flow test state - POST_STATE_BLOOD_LEAK = 9 # Run blood leak sensor test state - POST_STATE_VALVES = 10 # Run valves test state - POST_STATE_SYRINGE_PUMP = 11 # Run syringe pump test state - POST_STATE_PRES_OCCL = 12 # Run pressure occlusion state - POST_STATE_ALARM_AUDIO = 13 # Run alarm audio test state - POST_STATE_ALARM_LAMP = 14 # Run alarm lamp test state - POST_STATE_ACCELEROMETER = 15 # Run Accelerometer test state - POST_STATE_TEMPERATURES = 16 # Run temperatures POST state - POST_STATE_FANS = 17 # Run fans POST state - POST_STATE_STUCK_BUTTON = 18 # Run stuck button test state - POST_STATE_UI_POST = 19 # Check whether UI passed its POST tests - POST_STATE_FW_COMPATIBILITY = 20 # Run firmware compatibility test state - POST_STATE_FPGA = 21 # Run FPGA test state - POST_STATE_COMPLETED = 22 # POST self-tests completed state - POST_STATE_FAILED = 23 # POST self-tests failed state - NUM_OF_POST_STATES = 24 # Number of initialize & POST mode states + POST_STATE_NVDATAMGMT = 2 # Run NV Data Mgmt. test state + POST_STATE_WATCHDOG = 3 # Run watchdog test state + POST_STATE_SAFETY_SHUTDOWN = 4 # Run safety shutdown test state + POST_STATE_BLOOD_FLOW = 5 # Run blood flow test state + POST_STATE_VALVES = 6 # Run valves test state + POST_STATE_SYRINGE_PUMP = 7 # Run syringe pump test state + POST_STATE_PRES_OCCL = 8 # Run pressure occlusion state + POST_STATE_ALARM_AUDIO = 9 # Run alarm audio test state + POST_STATE_ALARM_LAMP = 10 # Run alarm lamp test state + POST_STATE_TEMPERATURES = 11 # Run temperatures POST state + POST_STATE_FANS = 12 # Run fans POST state + POST_STATE_STUCK_BUTTON = 13 # Run stuck button test state + POST_STATE_UI_POST = 14 # Check whether UI passed its POST tests + POST_STATE_FW_COMPATIBILITY = 15 # Run firmware compatibility test state + POST_STATE_FPGA = 16 # Run FPGA test state + POST_STATE_COMPLETED = 17 # POST self-tests completed state + POST_STATE_FAILED = 18 # POST self-tests failed state + NUM_OF_POST_STATES = 19 # Number of initialize & POST mode states @unique -class PreTreatmentSubModes(DialinEnum): +class TDTreatmentParamStates(DialinEnum): + TD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_SEND = 0 # Wait for UI to send treatment params mode state + TD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_CONFIRM = 1 # Wait for UI to confirm treatment params mode state + NUM_OF_TD_TREATMENT_PARAMS_MODE_STATES = 2 # Number of treatment params mode states + +@unique +class TDPreTreatmentSubModes(DialinEnum): TD_PRE_TREATMENT_WATER_SAMPLE_STATE = 0 # Water sample state TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE = 1 # Consumable self-tests state TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE = 2 # No cartridge self-tests state @@ -83,15 +84,15 @@ @unique -class PostTreatmentStates(DialinEnum): +class TDPostTreatmentStates(DialinEnum): TD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE = 0 # Drain reservoirs state TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE = 1 # Patient disconnection state TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE = 2 # Disposable removal state TD_POST_TREATMENT_VERIFY_STATE = 3 # Verify cartridge removed, syringe removed, and reservoirs drained state NUM_OF_TD_POST_TREATMENT_STATES = 4 # Number of post-treatment mode states @unique -class PreTreatmentPrimeStates(DialinEnum): +class TDPreTreatmentPrimeStates(DialinEnum): TD_PRIME_WAIT_FOR_USER_START_STATE = 0 # Wait for user to start prime state TD_PRIME_SALINE_SETUP_STATE = 1 # Saline setup state TD_PRIME_SALINE_PURGE_AIR_STATE = 2 # Saline purge air state @@ -115,6 +116,26 @@ NUM_OF_TD_FAULT_STATES = 3 # Number of fault mode states @unique +class TDTreatmentStates(DialinEnum): + TREATMENT_START_STATE = 0 # Start treatment - initialize treatment and go to blood prime state + TREATMENT_BLOOD_PRIME_STATE = 1 # Prime blood-side of dialyzer with gradual ramp for 1 min. while dialyzer is bypassed. No dialysis or UF taking place. No treatment time. + TREATMENT_DIALYSIS_STATE = 2 # Perform dialysis. Deliver UF as prescribed. + TREATMENT_PAUSED_STATE = 3 # Treatment paused. All pumps off. Dializer bypassed + TREATMENT_RINSEBACK_STATE = 4 # Perform rinseback with saline. Dialyzer bypassed. Dialysate recirculating + TREATMENT_RECIRC_STATE = 5 # Recirculate saline and dialysate while patient disconnected. Blood lines open and shunted. Dialyzer is bypassed + TREATMENT_END_STATE = 6 # Dialysis has ended. Blood pump slowed. Dialyzer is bypassed. Dialysate is recirculated. User can rinseback + TREATMENT_ISO_UF_STATE = 7 # Isolated ultrafiltration. No dialysate flow. Ultrafiltration only. + TREATMENT_SALINE_BOLUS_STATE = 8 # Deliver a saline bolus. Blood pump draws from saline bag. Dialyzer bypassed. + TREATMENT_DIALYSATE_PAUSED_STATE = 9 # No dialysate flow. Dialyzer bypassed. + NUM_OF_TREATMENT_STATES = 10 # Number of treatment states (sub-modes) + +@unique +class TDDialysisStates(DialinEnum): + DIALYSIS_UF_STATE = 0 # Ultrafiltration state of the dialysis sub-mode state machine + DIALYSIS_UF_PAUSED_STATE = 1 # Ultrafiltration Paused state of the dialysis sub-mode state machine + NUM_OF_DIALYSIS_STATES = 2 # Number of dialysis sub-mode states + +@unique class TDEventList(DialinEnum): TD_EVENT_STARTUP = 0 # TD startup event TD_EVENT_OP_MODE_CHANGE = 1 # TD Op mode change event