Index: AlarmDefs.h =================================================================== diff -u -r466c854c5ea54c2983ba4e6a209e32e98e7b594a -rf4dcc8b48798363022d3da610d95829f6d4f77a6 --- AlarmDefs.h (.../AlarmDefs.h) (revision 466c854c5ea54c2983ba4e6a209e32e98e7b594a) +++ AlarmDefs.h (.../AlarmDefs.h) (revision f4dcc8b48798363022d3da610d95829f6d4f77a6) @@ -182,6 +182,7 @@ 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 NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -475,7 +476,8 @@ { 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_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 }, + { 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 }, + { ALARM_PRIORITY_HIGH, 110, TRUE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT }, }; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID /// Table of alarms and their rank. @@ -585,6 +587,7 @@ { 110, ALARM_ID_FP_FILTER_HEALTH_PRESSURE_OUT_OF_RANGE }, { 110, ALARM_ID_FP_PERMEATE_FLUSH_CONDUCTIVITY_TIMEOUT }, { 110, ALARM_ID_FP_CONCENTRATE_FLUSH_VOLUME_OUT_OF_RANGE }, + { 110, ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT }, { 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 }, @@ -814,7 +817,8 @@ // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition { 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_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. | "}, + { 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. | "}, + { 153 , ALARM_ID_FP_GEN_PERMEATE_TANK_FULL_TIMEOUT , "FP | FP: Permeate Overfill | 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 Tank: Tank is too full | FP tank level is too high | If the float sensor reads high for at least 60 seconds | "}, }; #endif // manual alarms Index: FPDefs.h =================================================================== diff -u -r57cf24a496d5c1e2987fde2a925957e15dd1b018 -rf4dcc8b48798363022d3da610d95829f6d4f77a6 --- FPDefs.h (.../FPDefs.h) (revision 57cf24a496d5c1e2987fde2a925957e15dd1b018) +++ FPDefs.h (.../FPDefs.h) (revision f4dcc8b48798363022d3da610d95829f6d4f77a6) @@ -125,8 +125,8 @@ /// Enumeration of Defeatured Gen Permeate mode states. enum FP_GenP_Def_Mode_States { - FP_GENW_DEF_SUPPLY_WATER = 0, ///< Gen Water Defeatured Supply Water state - FP_GENW_DEF_PAUSED, ///< Gen Water Defeatured Paused state + FP_GENP_DEF_SUPPLY_WATER = 0, ///< Gen Permeate Defeatured Supply Water state + FP_GENP_DEF_PAUSED, ///< Gen Permeate Defeatured Paused state NUM_OF_FP_GENP_DEF_MODE_STATES ///< Number of gen Permeate states }; typedef enum FP_GenP_Def_Mode_States FP_GENP_DEF_MODE_STATE_T; ///< Type for FP Gen Permeate mode states enumeration @@ -166,6 +166,22 @@ /**@}*/ /** + * @addtogroup FPConcentrateFlush + * @{ + */ + +/// Enumeration of Concentrate Flush states. +enum FP_Concentrate_Flush_States +{ + CONC_FLUSH_IN_PROGRESS = 0, ///< Concentrate Flush in progress state + CONC_FLUSH_PAUSED, ///< Concentrate Flush paused state + NUM_OF_CONC_FLUSH_STATES ///< Number of Concentrate flush states +}; +typedef enum FP_Concentrate_Flush_States FP_CONC_FLUSH_STATE_T; ///< Type for FP Concentrate Flush states enumeration + +/**@}*/ + +/** * @addtogroup CommonHeader * @{ */ @@ -176,6 +192,13 @@ FP_EVENT_STARTUP = 0, ///< FP startup event FP_EVENT_OP_MODE_CHANGE, ///< FP Op mode change event FP_EVENT_SUB_MODE_CHANGE, ///< FP Op sub-mode change event + FP_EVENT_PRE_GEN_RO_SET_PWM, + FP_EVENT_GENP_BOOST_SET_PWM, + FP_EVENT_GENP_CHANGE, + FP_EVENT_PRE_GEN_CHANGE, + FP_EVENT_PRE_GEN_DEF_CHANGE, + FP_EVENT_GENP_DEF_CHANGE, + NUM_OF_FP_EVENT_IDS ///< Total number of FP events }; typedef enum FP_Event_List FP_EVENT_ID_T; ///< Type for FP event list enumeration Index: MsgDefs.h =================================================================== diff -u -r466c854c5ea54c2983ba4e6a209e32e98e7b594a -rf4dcc8b48798363022d3da610d95829f6d4f77a6 --- MsgDefs.h (.../MsgDefs.h) (revision 466c854c5ea54c2983ba4e6a209e32e98e7b594a) +++ MsgDefs.h (.../MsgDefs.h) (revision f4dcc8b48798363022d3da610d95829f6d4f77a6) @@ -116,7 +116,9 @@ MSG_ID_TD_BATTERY_DATA = 0x54, ///< TD Battery broadcast data MSG_ID_FP_FILTER_FLUSH_DATA = 0x55, ///< FP Filter Flush broadcast data MSG_ID_FP_PERMEATE_FLUSH_DATA = 0x56, ///< FP Permeate Flush broadcast data - MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57, ///< FP Concentrate Flush broadcast data + MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57, ///< FP Concentrate Flush broadcast data + MSG_ID_FP_GENP_DEF_DATA = 0x58, + MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59, #ifdef __PUMPTEST__ MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0, ///< DD piston pump data