Index: AlarmDefs.h =================================================================== diff -u -r7979d9c0e7b0c2e3dd68ac8fe19d4290667d39fb -r57cf24a496d5c1e2987fde2a925957e15dd1b018 --- AlarmDefs.h (.../AlarmDefs.h) (revision 7979d9c0e7b0c2e3dd68ac8fe19d4290667d39fb) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 57cf24a496d5c1e2987fde2a925957e15dd1b018) @@ -180,8 +180,8 @@ 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_MEMBRANE_FLUSH_CONDUCTIVITY_TIMEOUT = 151, ///< RO membrane flush timeout - ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE = 152, ///< RO membrane flush integrated 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 NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -216,7 +216,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_RO = 3, ///< RO firmware alarm source + ALARM_SOURCE_FP = 3, ///< RO firmware alarm source NUMBER_OF_ALARM_SOURCES ///< Number of alarm sources }; typedef enum Alarm_Sources ALARM_SOURCE_T; ///< Type for alarm sources enumeration @@ -274,7 +274,7 @@ /**@}*/ -#if defined (__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_RO_C__) +#if defined (__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_FP_C__) /** * @addtogroup AlarmManagement @@ -474,8 +474,8 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, - { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_MEMBRANE_FLUSH_CONDUCTIVITY_TIMEOUT }, - { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE }, }; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID /// Table of alarms and their rank. @@ -583,8 +583,8 @@ { 110, ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE }, { 110, ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE }, { 110, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, - { 110, ALARM_ID_FP_MEMBRANE_FLUSH_CONDUCTIVITY_TIMEOUT }, - { 110, ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE }, + { 110, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, + { 110, ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE }, { 111, ALARM_ID_TD_DD_COMM_TIMEOUT }, { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO }, @@ -812,8 +812,8 @@ { 148 , ALARM_ID_FP_INLET_PRESSURE_REGULATOR_OUT_OF_RANGE , "FP | Service Required: FP Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | FP Fault: Pressure regulator not in range| FP pressure regulator is out of bounds | If M3 is not within 30 +/- 2 PSI | "}, { 149 , ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE , "FP | Service Required: FP Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | FP Fault: Power usage has exceeded budget| FP device is using too much power | If the device current is greater that its allowed percentage | "}, { 150 , ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE , "FP | FP: Filter Health | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | FP Filters: Pressure difference too high | FP pressure difference between the filters is too high | If the difference between M3 and P8 is ≥ 10 PSI after 2 minutes | "}, - { 151 , ALARM_ID_FP_MEMBRANE_FLUSH_CONDUCTIVITY_TIMEOUT , "FP | FP: Filter Health | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | FP Filters: Permeate conductivity high | FP conductivity after flushing the system is too high | If P18 conductivity > 200 uS/cm after 120 seconds ± 150ms of flushing. | "}, - { 152 , ALARM_ID_FP_MEMBRANE_FLUSH_VOLUME_OUT_OF_RANGE , "FP | FP: Filter Health | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | FP Filters: Volume difference too high | FP volume difference between integrated flow and expected volume | If P7 is <90% of the target integrated volume ( 1L ) after 30 seconds ± 150ms of flushing. | "}, + { 151 , ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT , "FP | FP: Filter Health | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | FP Filters: Permeate conductivity high | FP conductivity after flushing the system is too high | If P18 conductivity > 200 uS/cm after 120 seconds ± 150ms of flushing. | "}, + { 152 , ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE , "FP | FP: Filter Health | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | FP Filters: Volume difference too high | FP volume difference between integrated flow and expected volume | If P7 is <90% of the target integrated volume ( 1L ) after 30 seconds ± 150ms of flushing. | "}, }; #endif // manual alarms