Index: AlarmDefs.h =================================================================== diff -u -r16067a34bbe2f63c78340dc92c6416bc849fcc81 -rae2a434072551837645764125d1d7cfa994e0786 --- AlarmDefs.h (.../AlarmDefs.h) (revision 16067a34bbe2f63c78340dc92c6416bc849fcc81) +++ AlarmDefs.h (.../AlarmDefs.h) (revision ae2a434072551837645764125d1d7cfa994e0786) @@ -53,6 +53,7 @@ ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 22, ///< DD processor clock speed checks against FPGA clock failure ALARM_ID_DD_FPGA_COMM_TIMEOUT = 23, ///< DG FPGA communication down for too long ALARM_ID_TD_ALARM_AUDIO_SELF_TEST_FAILURE = 24, ///< TD alarm audio failed POST + ALARM_ID_DD_VALVE_CONTROL_FAILURE = 25, ///< DD FPGA not accepting commanded valve states NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -210,6 +211,8 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_FPGA_COMM_TIMEOUT }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_ALARM_AUDIO_SELF_TEST_FAILURE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_VALVE_CONTROL_FAILURE }, + }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID /// Table of alarms and their rank. @@ -235,6 +238,7 @@ { 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 }, { 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 }, @@ -287,6 +291,7 @@ { 22 , ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE , "DD | Service Required: Dialysate 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. | DD Fault: Proc- FPGA Clock | FPGA clock speed failure | If the FPGA clock speed is relatively close to the processor clock for a certain period of time. | "}, { 23 , ALARM_ID_DD_FPGA_COMM_TIMEOUT , "DD | Service Required: Dialysate 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. | DD Fault: FPGA Com | DD FPGA communication down for too long | If retries for commands exceeds limit or FPGA reports comm error. | "}, { 24 , ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE , "TD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\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. | HD POST: Primary Alarm Current | HD alarm audio failed POST | If alarm audio current is NOT in expected range for than 1 second while alarm tone is being output | "}, + { 25 , ALARM_ID_DD_VALVE_CONTROL_FAILURE , "DD | Service Required: Dialysate 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. | DD Fault: Valve Control | DD FPGA not accepting commanded valve states | If the read back FPGA valve states does not match the commanded valve states for a certain amount of time. | "}, // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition }; Index: DDDefs.h =================================================================== diff -u -r2f9aacdc29711409fba96c2b5eaccbcbeaaeb71a -rae2a434072551837645764125d1d7cfa994e0786 --- DDDefs.h (.../DDDefs.h) (revision 2f9aacdc29711409fba96c2b5eaccbcbeaaeb71a) +++ DDDefs.h (.../DDDefs.h) (revision ae2a434072551837645764125d1d7cfa994e0786) @@ -5,7 +5,7 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file DGDefs.h +* @file DDDefs.h * * @author (last) Sean * @date (last) 30-Jul-2024 @@ -37,45 +37,45 @@ DD_MODE_HCOL, ///< Heat Disinfect cooling mode DD_MODE_ROPS, ///< RO permeate sample mode DD_MODE_NLEG, ///< Not legal - an illegal mode transition occurred - NUM_OF_DD_MODES ///< Number of DG operation modes + NUM_OF_DD_MODES ///< Number of DD operation modes }; typedef enum DD_Op_Modes DD_OP_MODE_T; ///< Type for DD operation modes enumeration /**@}*/ /** - * @addtogroup DGInitAndPOSTMode + * @addtogroup DDInitAndPOSTMode * @{ */ /// Enumeration of init & POST mode states. enum DD_POST_States { - DG_POST_STATE_START = 0, ///< Start initialize & POST mode state - DG_POST_STATE_FW_COMPATIBILITY, ///< Run firmware compatibility test state - DG_POST_STATE_FW_INTEGRITY, ///< Run firmware image integrity test state - DG_POST_STATE_FPGA, ///< FPGA POST test state - DG_POST_STATE_RTC, ///< RTC POST test state - DG_POST_STATE_NVDATAMGMT, ///< Non-volatile data management POST state - DG_POST_STATE_TEMPERATURE_SENSORS, ///< Temperature Sensors POST state - DG_POST_STATE_ACCELEROMETER, ///< Accelerometer POST state - DG_POST_STATE_PRESSURES, ///< Pressure sensors POST state - DG_POST_STATE_DRAIN_PUMP, ///< Drain pump POST state - DG_POST_STATE_CONCENTRATE_PUMPS, ///< Concentrate pumps POST state - DG_POST_STATE_CONDUCTIVITY_SENSORS, ///< Conductivity sensors POST state - DG_POST_STATE_RESERVOIRS, ///< Reservoirs POST state - DG_POST_STATE_UV_REACTORS, ///< UV reactors POST state - DG_POST_STATE_THERMISTORS, ///< Thermistors POST state - DG_POST_STATE_FANS, ///< Fans POST state - DG_POST_STATE_FLOW_SENSORS, ///< Flow sensors POST state - DG_POST_STATE_WATCHDOG, ///< Watchdog POST test state - DG_POST_STATE_SAFETY_SHUTDOWN, ///< Safety shutdown POST test state - DG_POST_STATE_LOAD_CELL, ///< Load cells POST state - DG_POST_STATE_COMPLETED, ///< POST completed successfully state - DG_POST_STATE_FAILED, ///< POST failed state - NUM_OF_DG_POST_STATES ///< Number of initialize & POST mode states + DD_POST_STATE_START = 0, ///< Start initialize & POST mode state + DD_POST_STATE_FW_COMPATIBILITY, ///< Run firmware compatibility test state + DD_POST_STATE_FW_INTEGRITY, ///< Run firmware image integrity test state + DD_POST_STATE_FPGA, ///< FPGA POST test state + DD_POST_STATE_RTC, ///< RTC POST test state + DD_POST_STATE_NVDATAMGMT, ///< Non-volatile data management POST state + DD_POST_STATE_TEMPERATURE_SENSORS, ///< Temperature Sensors POST state + DD_POST_STATE_ACCELEROMETER, ///< Accelerometer POST state + DD_POST_STATE_PRESSURES, ///< Pressure sensors POST state + DD_POST_STATE_DRAIN_PUMP, ///< Drain pump POST state + DD_POST_STATE_CONCENTRATE_PUMPS, ///< Concentrate pumps POST state + DD_POST_STATE_CONDUCTIVITY_SENSORS, ///< Conductivity sensors POST state + DD_POST_STATE_RESERVOIRS, ///< Reservoirs POST state + DD_POST_STATE_UV_REACTORS, ///< UV reactors POST state + DD_POST_STATE_THERMISTORS, ///< Thermistors POST state + DD_POST_STATE_FANS, ///< Fans POST state + DD_POST_STATE_FLOW_SENSORS, ///< Flow sensors POST state + DD_POST_STATE_WATCHDOG, ///< Watchdog POST test state + DD_POST_STATE_SAFETY_SHUTDOWN, ///< Safety shutdown POST test state + DD_POST_STATE_LOAD_CELL, ///< Load cells POST state + DD_POST_STATE_COMPLETED, ///< POST completed successfully state + DD_POST_STATE_FAILED, ///< POST failed state + NUM_OF_DD_POST_STATES ///< Number of initialize & POST mode states }; -typedef enum DD_POST_States DD_POST_STATE_T; ///< Type for DG POST states enumeration +typedef enum DD_POST_States DD_POST_STATE_T; ///< Type for DD POST states enumeration /**@}*/ @@ -85,14 +85,14 @@ */ /// Enumeration of fault mode states. -enum DG_Fault_States +enum DD_Fault_States { - DG_FAULT_STATE_START = 0, ///< DG fault start state - DG_FAULT_STATE_RUN_NV_POSTS, ///< DG fault run RTC and NV data management posts - DG_FAULT_STATE_COMPLETE, ///< DG fault complete - NUM_OF_DG_FAULT_STATES ///< Number of fault mode states + DD_FAULT_STATE_START = 0, ///< DD fault start state + DD_FAULT_STATE_RUN_NV_POSTS, ///< DD fault run RTC and NV data management posts + DD_FAULT_STATE_COMPLETE, ///< DD fault complete + NUM_OF_DD_FAULT_STATES ///< Number of fault mode states }; -typedef enum DG_Fault_States DG_FAULT_STATE_T; ///< Type for DG fault states enumeration +typedef enum DD_Fault_States DD_FAULT_STATE_T; ///< Type for DD fault states enumeration /**@}*/ @@ -118,16 +118,16 @@ */ /// Enumeration of standby mode states. -enum DG_Standby_Mode_States +enum DD_Standby_Mode_States { - DG_STANDBY_MODE_STATE_IDLE = 0, ///< Idle standby mode state - DG_STANDBY_MODE_STATE_FLUSH_FILTER, ///< Sample water flush filter state - DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE, ///< Sample water flush filter idle state - DG_STANDBY_MODE_STATE_SAMPLE_WATER, ///< Sample water state - DG_STANDBY_MODE_STATE_PAUSE, ///< Pause state - NUM_OF_DG_STANDBY_MODE_STATES ///< Number of standby mode states + DD_STANDBY_MODE_STATE_IDLE = 0, ///< Idle standby mode state + DD_STANDBY_MODE_STATE_FLUSH_FILTER, ///< Sample water flush filter state + DD_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE, ///< Sample water flush filter idle state + DD_STANDBY_MODE_STATE_SAMPLE_WATER, ///< Sample water state + DD_STANDBY_MODE_STATE_PAUSE, ///< Pause state + NUM_OF_DD_STANDBY_MODE_STATES ///< Number of standby mode states }; -typedef enum DG_Standby_Mode_States DG_STANDBY_MODE_STATE_T; ///< Type for DG standby mode states enumeration +typedef enum DD_Standby_Mode_States DD_STANDBY_MODE_STATE_T; ///< Type for DD standby mode states enumeration /**@}*/ @@ -515,7 +515,7 @@ /**@}*/ /** - * @addtogroup DGServiceMode + * @addtogroup DDServiceMode * @{ */ @@ -587,32 +587,32 @@ * @{ */ -/// Enumeration of DG event IDs. -enum DG_Event_List +/// Enumeration of DD event IDs. +enum DD_Event_List { - DG_EVENT_STARTUP = 0, ///< DG startup event - DG_EVENT_OP_MODE_CHANGE, ///< DG Op mode change event - DG_EVENT_SUB_MODE_CHANGE, ///< DG Op sub-mode change event - DG_EVENT_CONCENTRATE_CAP_SWITCH_CHANGE, ///< DG concentrate cap switch change - DG_EVENT_DIALYSATE_CAP_SWITCH_CHANGE, ///< DG dialysate cap switch change - DG_EVENT_CPU_RAM_ERROR_STATUS, ///< DG processor RAM error - DG_EVENT_CAL_RECORD_UPDATE, ///< DG new calibration record updated - DG_EVENT_SYSTEM_RECORD_UPDATE, ///< DG new system record has been updated - DG_EVENT_SERVICE_UPDATE, ///< DG new service record has been updated - DG_EVENT_USAGE_INFO_UPDATE, ///< DG new usage information has been updated - DG_EVENT_SW_CONFIG_UPDATE, ///< DG new software configuration has been updated - DG_EVENT_SCHEDULED_RUNS_UPDATE, ///< DG new scheduled runs information has been updated - DG_EVENT_HEATERS_INFO_UPDATE, ///< DG new heaters information has been updated - DG_EVENT_AVG_DIALYSATE_FILL_COND_VALUES, ///< DG average dialysate fill conductivity values - DG_EVENT_RESERVOIR_FILL_VALUES, ///< DG reservoir fill values - DG_EVENT_OPERATION_STATUS, ///< DG operation status event - DG_EVENT_TEMPERATURE_DRIFT, ///< DG temperature drift event - DG_EVENT_BICARB_CHECK_RESULT, ///< DG bicarb check result - DG_EVENT_ACID_CHECK_RESULT, ///< DG acid check result - DG_EVENT_COND1_VS_COND2_DIFF_RESULT, ///< DG CD1 (acid) vs. CD2 (bicarb) different result - NUM_OF_DG_EVENT_IDS ///< Total number of DG events + DD_EVENT_STARTUP = 0, ///< DD startup event + DD_EVENT_OP_MODE_CHANGE, ///< DD Op mode change event + DD_EVENT_SUB_MODE_CHANGE, ///< DD Op sub-mode change event + DD_EVENT_CONCENTRATE_CAP_SWITCH_CHANGE, ///< DD concentrate cap switch change + DD_EVENT_DIALYSATE_CAP_SWITCH_CHANGE, ///< DD dialysate cap switch change + DD_EVENT_CPU_RAM_ERROR_STATUS, ///< DD processor RAM error + DD_EVENT_CAL_RECORD_UPDATE, ///< DD new calibration record updated + DD_EVENT_SYSTEM_RECORD_UPDATE, ///< DD new system record has been updated + DD_EVENT_SERVICE_UPDATE, ///< DD new service record has been updated + DD_EVENT_USAGE_INFO_UPDATE, ///< DD new usage information has been updated + DD_EVENT_SW_CONFIG_UPDATE, ///< DD new software configuration has been updated + DD_EVENT_SCHEDULED_RUNS_UPDATE, ///< DD new scheduled runs information has been updated + DD_EVENT_HEATERS_INFO_UPDATE, ///< DD new heaters information has been updated + DD_EVENT_AVG_DIALYSATE_FILL_COND_VALUES, ///< DD average dialysate fill conductivity values + DD_EVENT_RESERVOIR_FILL_VALUES, ///< DD reservoir fill values + DD_EVENT_OPERATION_STATUS, ///< DD operation status event + DD_EVENT_TEMPERATURE_DRIFT, ///< DD temperature drift event + DD_EVENT_BICARB_CHECK_RESULT, ///< DD bicarb check result + DD_EVENT_ACID_CHECK_RESULT, ///< DD acid check result + DD_EVENT_COND1_VS_COND2_DIFF_RESULT, ///< DD CD1 (acid) vs. CD2 (bicarb) different result + NUM_OF_DD_EVENT_IDS ///< Total number of DD events }; -typedef enum DG_Event_List DG_EVENT_ID_T; ///< Type for DG event list enumeration +typedef enum DD_Event_List DD_EVENT_ID_T; ///< Type for DD event list enumeration /**@}*/