Index: AlarmDefs.h =================================================================== diff -u -rf4dcc8b48798363022d3da610d95829f6d4f77a6 -r3906d25bfc0a3321bc9d8c504f17598070e703d6 --- AlarmDefs.h (.../AlarmDefs.h) (revision f4dcc8b48798363022d3da610d95829f6d4f77a6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 3906d25bfc0a3321bc9d8c504f17598070e703d6) @@ -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_FP_SOFTWARE_FAULT = 3, ///< RO software fault. Software found itself in an unexpected state + ALARM_ID_FP_SOFTWARE_FAULT = 3, ///< FP 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 @@ -47,7 +47,7 @@ ALARM_ID_TD_WATCHDOG_EXPIRED = 16, ///< TD watchdog expired ALARM_ID_DD_WATCHDOG_EXPIRED = 17, ///< DD watchdog expired ALARM_ID_DD_COMM_TOO_MANY_BAD_CRCS = 18, ///< DD too many bad communications CRC - ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO = 19, ///< DD didn't get ACK on message to RO that required acknowledgment + ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_FP = 19, ///< DD didn't get ACK on message to FP that required acknowledgment ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD = 20, ///< DD didn't get ACK on message to TD that required acknowledgment ALARM_ID_DD_FPGA_POST_TEST_FAILED = 21, ///< DD FPGA POST failure ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 22, ///< DD processor clock speed checks against FPGA clock failure @@ -111,10 +111,10 @@ 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_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_FP_CAN_MESSAGE_NOT_ACKED_BY_DD = 83, ///< FP can message not acked by DD fault + ALARM_ID_FP_FPGA_COMM_TIMEOUT = 84, ///< FP FPGA communication timeout + ALARM_ID_FP_COMM_TOO_MANY_BAD_CRCS = 85, ///< FP too many bad crcs + ALARM_ID_FP_VALVE_CONTROL_FAILURE = 86, ///< FP 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 @@ -164,25 +164,25 @@ ALARM_ID_DD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP = 132, ///< DD dialysate temperature above safety ALARM_ID_DD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP = 133, ///< DD dialysate temperature high ALARM_ID_DD_DIALYSATE_TEMP_BELOW_TARGET_TEMP = 134, ///< DD dialysate temperature low - ALARM_ID_FP_PRESSURE_RELIEF_OUT_LOW_RANGE = 135, ///< RO Pressure relief valve low - ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE = 136, ///< RO Pressure relief valve high - ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE = 137, ///< RO Power budget exceeded - ALARM_ID_FP_FLOW_RATE_LOW_RANGE = 138, ///< RO flow rate low - ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE = 139, ///< RO inlet water temperature low - ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE = 140, ///< RO inlet water temperature high - ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE = 141, ///< RO inlet pressure low - ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE = 142, ///< RO inlet pressure high - ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE = 143, ///< RO inlet conductivity high - ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE = 144, ///< RO inlet conductivty low + ALARM_ID_FP_PRESSURE_RELIEF_OUT_LOW_RANGE = 135, ///< FP Pressure relief valve low + ALARM_ID_FP_PRESSURE_RELIEF_OUT_HIGH_RANGE = 136, ///< FP Pressure relief valve high + ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE = 137, ///< FP Power budget exceeded + ALARM_ID_FP_FLOW_RATE_LOW_RANGE = 138, ///< FP flow rate low + ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE = 139, ///< FP inlet water temperature low + ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE = 140, ///< FP inlet water temperature high + ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE = 141, ///< FP inlet pressure low + ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE = 142, ///< FP inlet pressure high + ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE = 143, ///< FP inlet conductivity high + ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_LOW_RANGE = 144, ///< FP inlet conductivty low ALARM_ID_FP_RO_INLET_PRESSURE_OUT_HIGH_RANGE = 145, ///< RO pump inlet pressure high - ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE = 146, ///< RO pump outlet conductivity high - ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE = 147, ///< RO pump inlet conductivity high - ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE = 148, ///< RO rejection ratio low - ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE = 149, ///< RO inlet pressure regulator out of range - ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE = 150, ///< RO filter health pressure out of range - ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT = 151, ///< RO membrane flush timeout - ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE = 152, ///< RO membrane flush integrated out of range - ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT = 153, ///< RO tank full time out alarm + ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE = 146, ///< FP pump outlet conductivity high + ALARM_ID_FP_RO_INLET_CONDUCTIVITY_HIGH_RANGE = 147, ///< FP pump inlet conductivity high + ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE = 148, ///< FP rejection ratio low + ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE = 149, ///< FP inlet pressure regulator out of range + ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE = 150, ///< FP filter health pressure out of range + ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT = 151, ///< FP membrane flush timeout + ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE = 152, ///< FP membrane flush integrated out of range + ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT = 153, ///< FP tank full time out alarm NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -217,7 +217,7 @@ ALARM_SOURCE_UI = 0, ///< User interface alarm source ALARM_SOURCE_TD = 1, ///< TD firmware alarm source ALARM_SOURCE_DD = 2, ///< DD firmware alarm source - ALARM_SOURCE_FP = 3, ///< RO firmware alarm source + ALARM_SOURCE_FP = 3, ///< FP firmware alarm source NUMBER_OF_ALARM_SOURCES ///< Number of alarm sources }; typedef enum Alarm_Sources ALARM_SOURCE_T; ///< Type for alarm sources enumeration