Index: AlarmDefs.h =================================================================== diff -u -rf1bf9b68e5b701c465e1adc3e00097a6ddc976c5 -ra94c9ce15845c113e775d2b3741614aca112d0fd --- AlarmDefs.h (.../AlarmDefs.h) (revision f1bf9b68e5b701c465e1adc3e00097a6ddc976c5) +++ AlarmDefs.h (.../AlarmDefs.h) (revision a94c9ce15845c113e775d2b3741614aca112d0fd) @@ -31,7 +31,7 @@ ALARM_ID_NO_ALARM = 0, ///< Indication for when no alarms is a possible situation ALARM_ID_TD_SOFTWARE_FAULT = 1, ///< TD Software fault. Software found itself in an unexpected state ALARM_ID_DD_SOFTWARE_FAULT = 2, ///< DD software fault. Software found itself in an unexpected state - ALARM_ID_RO_SOFTWARE_FAULT = 3, ///< RO software fault. Software found itself in an unexpected state + ALARM_ID_FP_SOFTWARE_FAULT = 3, ///< RO software fault. Software found itself in an unexpected state ALARM_ID_TD_FPGA_POST_TEST_FAILED = 4, ///< TD FPGA POST failure ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED = 5, ///< TD Watchdog POST failure ALARM_ID_TD_UI_COMM_POST_FAILED = 6, ///< TD UI communication POST failure. UI failed to communicate within a reasonable time after power up @@ -111,23 +111,23 @@ ALARM_ID_TD_PINCH_VALVE_FAULT = 80, ///< TD pinch valve fault ALARM_ID_TD_VALVE_HOMING_FAILED = 81, ///< TD pinch valve homing fault ALARM_ID_TD_VALVE_TRANSITION_TIMEOUT = 82, ///< TD pinch valve transition timeout - ALARM_ID_RO_CAN_MESSAGE_NOT_ACKED_BY_DD = 83, ///< RO can message not acked by DD fault - ALARM_ID_RO_FPGA_COMM_TIMEOUT = 84, ///< RO FPGA communication timeout - ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS = 85, ///< RO too many bad crcs - ALARM_ID_RO_VALVE_CONTROL_FAILURE = 86, ///< RO valve control failure + ALARM_ID_FP_CAN_MESSAGE_NOT_ACKED_BY_DD = 83, ///< RO can message not acked by DD fault + ALARM_ID_FP_FPGA_COMM_TIMEOUT = 84, ///< RO FPGA communication timeout + ALARM_ID_FP_COMM_TOO_MANY_BAD_CRCS = 85, ///< RO too many bad crcs + ALARM_ID_FP_VALVE_CONTROL_FAILURE = 86, ///< RO valve control failure ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE = 87, ///< DD balance chamber state1 fill start pressure not in range ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE = 88, ///< DD balance chamber state1 fill end pressure not in range ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE = 89, ///< DD balance chamber state2 fill start pressure not in range ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE = 90, ///< DD balance chamber state2 fill end pressure not in range - ALARM_ID_AVAILABLE_91 = 91, ///< Available alarms - ALARM_ID_AVAILABLE_92 = 92, ///< Available alarms - ALARM_ID_AVAILABLE_93 = 93, ///< Available alarms + ALARM_ID_FP_PRE_GEN_LOW_REJECTION_RATIO = 91, ///< Available alarms + ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE = 92, ///< Available alarms + ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE = 93, ///< Available alarms ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE = 94, ///< DD balance chamber state1 fill initiated and pressure drop is not in range ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE = 95, ///< DD balance chamber state2 fill initiated and pressure drop is not in range ALARM_ID_TD_TREATMENT_STOPPED_BY_USER = 96, ///< TD treatment paused by user ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT = 97, ///< DD D74 bicarb conductivity sensor freshness/error timeout fault - ALARM_ID_AVAILABLE_98 = 98, ///< Available alarms - ALARM_ID_AVAILABLE_99 = 99, ///< Available alarms + ALARM_ID_FP_MEMBRANE_FLUSH_CONDUCTIVITY_HIGH_RANGE = 98, ///< Available alarms + ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE = 99, ///< Available alarms // Added 30 TD-UI Alarms +1 TD only from 100 to 130 with some reserved IDs ALARM_ID_TD_COMM_TIMEOUT = 100, ///< TD communication timeout ALARM_ID_UI_POST_FAILURE_OS_VERSION = 101, ///< UI POST OS version compatibility failure @@ -160,6 +160,20 @@ ALARM_ID_UI_RESERVED_128 = 128, ///< UI Reserved failure ALARM_ID_UI_RESERVED_129 = 129, ///< UI Reserved failure ALARM_ID_UI_RESERVED_130 = 130, ///< UI Reserved failure + ALARM_ID_FP_INLET_PRESSURE_OUT_OF_RANGE = 131, + ALARM_ID_FP_PRESSURE_RELIEF_OUT_OF_RANGE = 132, + ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE = 133, + ALARM_ID_FP_FLOW_RATE_LOW_RANGE = 134, + ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE = 135, + ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE = 136, + ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE = 137, + ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE = 138, + ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE = 139, + ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE = 140, + ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE = 141, + ALARM_ID_FP_INLET_BOOST_PRESSURE_OUT_LOW_RANGE = 142, + ALARM_ID_FP_INLET_BOOST_PRESSURE_OUT_HIGH_RANGE = 143, + ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE = 144, NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -299,7 +313,7 @@ { ALARM_PRIORITY_NONE, 999, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_SOFTWARE_FAULT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_SOFTWARE_FAULT }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_SOFTWARE_FAULT }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_FP_SOFTWARE_FAULT }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_FPGA_POST_TEST_FAILED }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_WATCHDOG_POST_TEST_FAILED }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_UI_COMM_POST_FAILED }, @@ -382,10 +396,10 @@ { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_PINCH_VALVE_FAULT }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_VALVE_HOMING_FAILED }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_VALVE_TRANSITION_TIMEOUT }, - { ALARM_PRIORITY_HIGH, 111, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_CAN_MESSAGE_NOT_ACKED_BY_DD }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_FPGA_COMM_TIMEOUT }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_VALVE_CONTROL_FAILURE }, + { ALARM_PRIORITY_HIGH, 111, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_FP_CAN_MESSAGE_NOT_ACKED_BY_DD }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_FP_FPGA_COMM_TIMEOUT }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_FP_COMM_TOO_MANY_BAD_CRCS }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_FP_VALVE_CONTROL_FAILURE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE }, @@ -482,12 +496,12 @@ { 110, ALARM_ID_DD_CRITICAL_DATA_ERROR }, { 110, ALARM_ID_DD_WATCHDOG_EXPIRED }, { 110, ALARM_ID_DD_SOFTWARE_FAULT }, - { 110, ALARM_ID_RO_SOFTWARE_FAULT }, + { 110, ALARM_ID_FP_SOFTWARE_FAULT }, { 110, ALARM_ID_DD_FPGA_POST_TEST_FAILED }, { 110, ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE }, { 110, ALARM_ID_DD_FPGA_COMM_TIMEOUT }, { 110, ALARM_ID_DD_VALVE_CONTROL_FAILURE }, - { 110, ALARM_ID_RO_VALVE_CONTROL_FAILURE }, + { 110, ALARM_ID_FP_VALVE_CONTROL_FAILURE }, { 110, ALARM_ID_DD_HYD_OUTLET_PRES_TIMEOUT_FAULT }, { 110, ALARM_ID_DD_BIBAG_PRES_TIMEOUT_FAULT }, { 110, ALARM_ID_DD_SPENT_DIALYSATE_PRES_TIMEOUT_FAULT }, @@ -497,7 +511,7 @@ { 110, ALARM_ID_DD_D27_COND_SENSOR_FPGA_FAULT }, { 110, ALARM_ID_DD_D29_COND_SENSOR_FPGA_FAULT }, { 110, ALARM_ID_DD_D43_COND_SENSOR_FPGA_FAULT }, - { 110, ALARM_ID_RO_FPGA_COMM_TIMEOUT }, + { 110, ALARM_ID_FP_FPGA_COMM_TIMEOUT }, { 110, ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR }, { 110, ALARM_ID_DD_D10_PUMP_SPEED_CONTROL_ERROR }, { 110, ALARM_ID_DD_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE }, @@ -520,7 +534,7 @@ { 110, ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D45_HEAT_IS_ON }, { 110, ALARM_ID_DD_WATER_INLET_INPUT_PRES_TIMEOUT_FAULT }, { 110, ALARM_ID_DD_WATER_INLET_OUTPUT_PRES_TIMEOUT_FAULT }, - { 110, ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS }, + { 110, ALARM_ID_FP_COMM_TOO_MANY_BAD_CRCS }, { 110, ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE }, { 110, ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE }, { 110, ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE }, @@ -532,7 +546,7 @@ { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD }, - { 111, ALARM_ID_RO_CAN_MESSAGE_NOT_ACKED_BY_DD }, + { 111, ALARM_ID_FP_CAN_MESSAGE_NOT_ACKED_BY_DD }, { 200, ALARM_ID_TD_VENOUS_PRESSURE_LOW }, { 201, ALARM_ID_TD_VENOUS_PRESSURE_HIGH }, { 202, ALARM_ID_TD_ARTERIAL_PRESSURE_LOW }, Index: MsgDefs.h =================================================================== diff -u -r86a8d915dbacdcf2a1ece823bf4b3adf83e49396 -ra94c9ce15845c113e775d2b3741614aca112d0fd --- MsgDefs.h (.../MsgDefs.h) (revision 86a8d915dbacdcf2a1ece823bf4b3adf83e49396) +++ MsgDefs.h (.../MsgDefs.h) (revision a94c9ce15845c113e775d2b3741614aca112d0fd) @@ -79,7 +79,7 @@ MSG_ID_DD_GEN_DIALYSATE_MODE_DATA = 0x2F, ///< DD Generate dialysate mode data MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA = 0x30, ///< DD Generate dialysate request data coming from TD with additional parameters MSG_ID_RO_VALVES_STATES_DATA = 0x31, ///< RO valves data - MSG_ID_RO_PUMP_DATA = 0x32, ///< RO pumps data + MSG_ID_RO_PUMP_DATA = 0x32, ///< RO broadcast P12 pump data MSG_ID_RO_OP_MODE_DATA = 0x33, ///< RO broadcast operation mode data MSG_ID_RO_PRESSURES_DATA = 0x34, ///< RO broadcast pressures data MSG_ID_RO_LEVEL_DATA = 0x35, ///< RO broadcast level data @@ -107,6 +107,7 @@ MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x4B, ///< DD Post-gen dialysate mode data MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x4C, ///< DD Pre Generate dialysate request data coming from TD. MSG_ID_RO_PRE_GEN_WATER_MODE_DATA = 0x4D, ///< RO Pre Generate water mode data. + MSG_ID_RO_BOOST_PUMP_DATA = 0x4E, ///< RO broadcast P40 pump data #ifdef __PUMPTEST__ MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0, ///< DD piston pump data #endif Index: RODefs.h =================================================================== diff -u -r1c5d6b5ba16fe6ff2c213e5ab0d8dc9a859226e3 -ra94c9ce15845c113e775d2b3741614aca112d0fd --- RODefs.h (.../RODefs.h) (revision 1c5d6b5ba16fe6ff2c213e5ab0d8dc9a859226e3) +++ RODefs.h (.../RODefs.h) (revision a94c9ce15845c113e775d2b3741614aca112d0fd) @@ -72,9 +72,14 @@ /// Enumeration of Pre Gen Water mode states. enum RO_Pre_GenW_Mode_States { - RO_PRE_GENW_STATE_START = 0, ///< Pre Gen Water start state - RO_PRE_GENW_STATE_COMPLETE, ///< Pre Gen Water complete state - NUM_OF_RO_PRE_GENP_MODE_STATES ///< Number of Pre Gen Water states + RO_PRE_GENW_STATE_START = 0, ///< Pre Gen Water start state + RO_PRE_GENW_FILTER_FLUSH, ///< Pre Gen Water complete state + RO_PRE_GENW_CONCENTRATE_FLUSH, + RO_PRE_GENW_PERMEATE_FLUSH, + RO_PRE_GENW_RO_REJECTION_ADJUST, + RO_PRE_GENW_VERIFY_WATER, + RO_PRE_GENW_WATER_SUPPLY, + NUM_OF_RO_PRE_GENP_MODE_STATES ///< Number of Pre Gen Water states }; typedef enum RO_Pre_GenW_Mode_States RO_PRE_GENW_MODE_STATE_T; ///< Type for RO Gen Water mode states enumeration @@ -91,6 +96,7 @@ RO_GENW_STATE_START = 0, ///< Gen Water start state RO_GENW_TANK_LOW_STATE, ///< Gen Water tank low state RO_GENW_TANK_FULL_STATE, ///< Gen Water tank full state + RO_GENW_SUPPLY_WATER, NUM_OF_RO_GENP_MODE_STATES ///< Number of gen water states }; typedef enum RO_GenW_Mode_States RO_GENW_MODE_STATE_T; ///< Type for RO Gen Water mode states enumeration