Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -rbeb046149da1b7cf85dbdadb500467490f350fb8 -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision beb046149da1b7cf85dbdadb500467490f350fb8) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) @@ -50,15 +50,13 @@ DD_POST_STATE_FAILED = 13 NUM_OF_DD_POST_STATES = 14 - @unique class DDFaultStates(DialinEnum): DD_FAULT_STATE_START = 0 # DD fault start state DD_FAULT_STATE_RUN_NV_POSTS = 1 # DD fault run RTC and NV data management post DD_FAULT_STATE_COMPLETE = 2 # DD fault complete NUM_OF_DD_FAULT_STATES = 3 # Number of fault mode states - @unique class DDStandByModeStates(DialinEnum): DD_STANDBY_MODE_STATE_IDLE = 0 # Idle standby mode state @@ -98,7 +96,6 @@ DD_EVENT_TD_COMMUNICATION_LOSS = 7 # DD TD communication loss NUM_OF_DD_EVENT_IDS = 8 # Total number of DD events - @unique class DDEventDataType(DialinEnum): EVENT_DATA_TYPE_NONE = 0 @@ -108,7 +105,6 @@ EVENT_DATA_TYPE_BOOL = 4 NUM_OF_EVENT_DATA_TYPES = 5 - @unique class DDServiceModesStates(DialinEnum): DD_SERVICE_STATE_START = 0 # Start service mode state @@ -132,6 +128,34 @@ NUM_OF_BAL_CHAMBER_SW = 2 # Number of balancing chamber states @unique +class ConcentratePumpsEnum(DialinEnum): + D11_CP1_ACID = 0 + D10_CP2_BICARB = 1 + D76_UF = 2 + NUM_OF_CONCENTRATE_PUMPS = 3 + +@unique +class DDConcentratePumpsStates(DialinEnum): + CONCENTRATE_PUMP_OFF_STATE = 0 + CONCENTRATE_PUMP_RAMP_TO_TARGET_SPEED_STATE = 1 + CONCENTRATE_PUMP_CONTROL_TARGET_SPEED_STATE = 2 + NUM_OF_CONCENTRATE_PUMP_STATES = 3 + +@unique +class DDConcentratePumpAttributesEnum(DialinEnum): + CURRENT_STATE = 0 + CURRENT_SET_SPEED = 1 + MEASURED_SPEED = 2 + TARGET_SPEED = 3 + PULSE_US = 4 + TARGET_REV_COUNT = 5 + MEASURED_REV_COUNT = 6 + NUM_OF_D76_CONCENTRATE_PUMP_ATTRIBUTES = 7 + PARKED = NUM_OF_D76_CONCENTRATE_PUMP_ATTRIBUTES + PARK_FAULT = 8 + NUM_OF_D10_D11_CONCENTRATE_PUMP_ATTRIBUTES = 9 + +@unique class ConductivitySensorsEnum(DialinEnum): D17_COND = 0 D27_COND = 1 @@ -144,6 +168,7 @@ class DialysatePumpsEnum(DialinEnum): D12_PUMP = 0 # Fresh Dialysate Pump D48_PUMP = 1 # Spent Dialysate Pump + NUM_OF_DIALYSATE_PUMPS = 2 @unique class DialysatePumpAttributesEnum(DialinEnum): @@ -157,12 +182,14 @@ CONTROL = 7 DIRECTION_ERROR_COUNT = 8 MEASURED_DIRECTION = 9 + NUM_OF_DIALYSATE_PUMP_ATTRIBUTES = 10 @unique class DDDialysatePumpsStates(DialinEnum): DIALYSATE_PUMP_OFF_STATE = 0 DIALYSATE_PUMP_RAMP_UP_STATE = 1 DIALYSATE_PUMP_CONTROL_TO_TARGET_STATE = 2 + NUM_OF_DIALYSATE_PUMP_STATES = 3 @unique class HeatersStartStop(DialinEnum): @@ -192,6 +219,7 @@ PWM_PERIOD = 4 ADJUSTED_TARGET_TEMP = 5 TARGET_TEMP_TD = 6 + NUM_OF_DD_HEATER_ATTRIBUTES = 7 @unique class DDLevelSensorEnum(DialinEnum): @@ -212,6 +240,7 @@ CONTROL_STATE = 0, SW_COUNTER = 1, CYCLE_COUNTER = 2 + NUM_OF_PISTON_PUMP_ATTRIBUTES = 3 @unique class PressureNames(DialinEnum): @@ -229,4 +258,62 @@ @unique class PressureAttributesEnum (DialinEnum): PRES = 0 - TEMP = 1 \ No newline at end of file + TEMP = 1 + NUM_OF_PRES_SENSOR_ATTRIBUTES = 2 + +COND_SENSOR_INDEX_OFFSET = 5 + +@unique +class DDTemperaturesNames(DialinEnum): + D1_TEMP = 0 # Heat exchanger Inlet temperature sensor + X6_TEMP = 1 # Heat exchanger Outlet temperature sensor + D4_TEMP = 2 # Hydraulics primary heater temperature sensor + D50_TEMP = 3 # Trimmer heater temperature sensor + BRD_TEMP = 4 # Barometric temperature sensor + BARO_TEMP = 5 # DD board temperature sensor ( thermistor ) + D17_TEMP = 6 # D16 temperature value + D27_TEMP = 7 # D28 temperature value + D29_TEMP = 8 # D30 temperature value + D44_TEMP = 9 # D44 temperature value + D75_TEMP = 10 # D75 temperature value + D4_AVG_TEMP = 11 # D4 Filtered value + D50_AVG_TEMP = 12 # D50 Filtered value + D28_AVG_TEMP = 13 # D28 Filtered value + D30_AVG_TEMP = 14 # D30 Filtered value + +@unique +class DDValveStates(DialinEnum): + VALVE_STATE_CLOSED = 0 + VALVE_STATE_OPEN = 1 + +@unique +class DDValveNames(DialinEnum): + D14_VALV = 0 # Valve Hydraulics Outlet (D14) + D52_VALV = 1 # Valve Thermal Disinfect (D52) + D8_VALV = 2 # Valve Hydraulics Bypass (D8) + D54_VALV = 3 # Valve Rinse Port (D54) + D53_VALV = 4 # Valve Drain (D53) + D34_VALV = 5 # Valve Dialyzer Bypass (D34) + D64_VALV = 6 # Valve Purge 1 (D64) + D31_VALV = 7 # Valve Pressure Test (D31) + D65_VALV = 8 # Valve DryBcarb Inlet (D65) + D35_VALV = 9 # Valve Dialyzer Inlet (D35) + D40_VALV = 10 # Valve Dialyzer Outlet (D40) + D47_VALV = 11 # Valve Dialysate Out Purge 2 (D47) + D3_VALV = 12 # Valve Hydraulics Inlet (D3) + M4_VALV = 13 # Valve Water Inlet (M4) + RSRVD_SPACE1 = 14 # This space has been reserved + RSRVD_SPACE2 = 15 # This space has been reserved + D23_VALV = 16 # Balancing chamber Valve 1 (D23) + D19_VALV = 17 # Balancing chamber Valve 2 (D19) + D25_VALV = 18 # Balancing chamber Valve 3 (D25) + D26_VALV = 19 # Balancing chamber Valve 7 (D26) + D24_VALV = 20 # Balancing chamber Valve 5 (D24) + D20_VALV = 21 # Balancing chamber Valve 6 (D20) + D21_VALV = 22 # Balancing chamber Valve 4 (D21) + D22_VALV = 23 # Balancing chamber Valve 8 (D22) + D69_VALV = 24 # Ultrafiltration Valve 1 Inlet (D69) + D71_VALV = 25 # Ultrafiltration Valve 2 Inlet (D71) + D70_VALV = 26 # Ultrafiltration Valve 1 Outlet (D70) + D72_VALV = 27 # Ultrafiltration Valve 2 Outlet (D72) + NUM_OF_DD_VALVES = 28 \ No newline at end of file