Index: AlarmDefs.h =================================================================== diff -u -r22c198bec7c2e7bb993e68d930a567bd8f26c36f -r4afc5fdb64135add3051d793f05cc15e52df6f89 --- AlarmDefs.h (.../AlarmDefs.h) (revision 22c198bec7c2e7bb993e68d930a567bd8f26c36f) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 4afc5fdb64135add3051d793f05cc15e52df6f89) @@ -51,7 +51,7 @@ 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 - ALARM_ID_DD_FPGA_COMM_TIMEOUT = 23, ///< DG FPGA communication down for too long + ALARM_ID_DD_FPGA_COMM_TIMEOUT = 23, ///< DD 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 @@ -156,7 +156,7 @@ ALARM_PRIORITY_T alarmPriority; ///< Priority of alarm U32 alarmSubRank; ///< Alarm's rank within it's priority BOOL alarmIsFault; ///< Alarm is a system fault? - BOOL alarmIsDGFault; ///< Alarm is a fault for DG + BOOL alarmIsDDFault; ///< Alarm is a fault for DD BOOL alarmStops; ///< Alarm activation should cause a controlled stop BOOL alarmConditionClearImmed; ///< Alarm condition is cleared immediately (does not persist after alarm triggered) BOOL alarmNoClear; ///< Alarm cannot be cleared (unrecoverable)? @@ -185,7 +185,7 @@ /// Table of alarms and their static properties. const ALARM_T ALARM_TABLE[] = -{ // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID +{ // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID { 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 }, @@ -213,7 +213,7 @@ { 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 +}; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID /// Table of alarms and their rank. const ALARM_RANK_T ALARM_RANK_TABLE[] = Index: DDDefs.h =================================================================== diff -u -r22c198bec7c2e7bb993e68d930a567bd8f26c36f -r4afc5fdb64135add3051d793f05cc15e52df6f89 --- DDDefs.h (.../DDDefs.h) (revision 22c198bec7c2e7bb993e68d930a567bd8f26c36f) +++ DDDefs.h (.../DDDefs.h) (revision 4afc5fdb64135add3051d793f05cc15e52df6f89) @@ -7,10 +7,10 @@ * * @file DDDefs.h * -* @author (last) Sean +* @author (last) Vinayakam Mani * @date (last) 30-Jul-2024 * -* @author (original) Sean +* @author (original) Vinayakam Mani * @date (original) 30-Jul-2024 * ***************************************************************************/ @@ -97,22 +97,6 @@ /**@}*/ /** - * @addtogroup DDSoloStandbyMode - * @{ - */ - -/// Enumeration of solo standby mode states. -enum DD_Solo_States -{ - DD_SOLO_STANDBY_STATE_START = 0, ///< Start solo standby mode state - DD_SOLO_IDLE_STATE, ///< Idle solo standby mode state - NUM_OF_DD_SOLO_STANDBY_STATES ///< Number of solo standby mode states -}; -typedef enum DD_Solo_States DD_SOLO_STANDBY_STATE_T; ///< Type for DD solo mode states enumeration - -/**@}*/ - -/** * @addtogroup DDStandbyMode * @{ */ @@ -129,89 +113,11 @@ }; typedef enum DD_Standby_Mode_States DD_STANDBY_MODE_STATE_T; ///< Type for DD standby mode states enumeration -/**@}*/ - -/** - * @addtogroup DDRecirculateMode - * @{ - */ - -/// Enumeration of generation idle mode states. -enum DD_Generation_Idle_Mode_States -{ - DD_GEN_IDLE_MODE_STATE_START = 0, ///< Start generation idle mode state - DD_GEN_IDLE_MODE_STATE_FLUSH_WATER, /// Handle normal fill state (idle 0.0) - DD_GEN_IDLE_MODE_STATE_HANDLE_BAD_FILL, ///< Handle bad fill state (idle 1.0) - NUM_OF_DD_GEN_IDLE_MODE_STATES ///< Number of idle mode states -}; -typedef enum DD_Generation_Idle_Mode_States DD_GEN_IDLE_MODE_STATE_T; ///< Type for DD generation idle mode states enumeration - -/// Enumeration of generation idle mode states. -enum DD_Generation_Idle_Mode_Bad_Fill_Substates -{ - DD_HANDLE_BAD_FILL_STATE_START = 0, ///< Bad fill start state - DD_HANDLE_BAD_FILL_STATE_FIRST_DRAIN, ///< First drain the dialysate - DD_HANDLE_BAD_FILL_STATE_FLUSH_FILL, ///< Flush then fill the dialysate - DD_HANDLE_BAD_FILL_STATE_SECOND_DRAIN, ///< Second drain the dialysate - DD_HANDLE_BAD_FILL_STATE_REFILL, ///< Refill the dialysate - NUM_OF_DD_HANDLE_BAD_FILL_STATES ///< Number of bad fill states -}; -typedef enum DD_Generation_Idle_Mode_Bad_Fill_Substates DD_GEN_IDLE_MODE_BAD_FILL_STATE_T; ///< Type for DD generation idle mode bad fill sub-states enumeration - -/**@}*/ - -/** - * @addtogroup DDFillMode - * @{ - */ - -/// Enumeration of fill mode states. -enum DD_Fill_Mode_States -{ - DD_FILL_MODE_STATE_TEST_INLET_WATER = 0, ///< Test inlet water quality state - DD_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES, ///< Prime the acid and bicarb concentrate lines - DD_FILL_MODE_STATE_FLUSH_BUBBLES, ///< Flush the bubbles in the lines state - DD_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY, ///< Test the conductivity range of the bicarb concentrate state - DD_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY, ///< Test the conductivity range of the acid concentrate state - DD_FILL_MODE_STATE_PRODUCE_DIALYSATE, ///< Dialysate production state - DD_FILL_MODE_STATE_DELIVER_DIALYSATE, ///< Dialysate deliver state - DD_FILL_MODE_STATE_PAUSED, ///< Dialysate generation pause state - NUM_OF_DD_FILL_MODE_STATES ///< Number of fill mode states -}; -typedef enum DD_Fill_Mode_States DD_FILL_MODE_STATE_T; ///< Type for DD fill mode states enumeration - -/**@}*/ - -/** - * @addtogroup DDDrainMode - * @{ - */ - -/// Enumeration of drain mode states. -enum DD_Drain_States -{ - DD_DRAIN_STATE_START = 0, ///< Start drain mode state - DD_DRAIN_STATE_DRAIN, ///< Drain drain mode state - DD_DRAIN_STATE_TARE, ///< Tare drain mode state - DD_DRAIN_STATE_RINSE, ///< Rinse concentrate lines drain mode state - NUM_OF_DD_DRAIN_STATES ///< Number of drain mode states -}; -typedef enum DD_Drain_States DD_DRAIN_STATE_T; ///< Type for DD drain mode states enumeration - -/**@}*/ - -/** - * @addtogroup HDDisinfectStates - * @{ - */ - /// Sub-mode states while in standby mode disinfect enum DD_Disinfect_States { DD_DISINFECT_FLUSH_STATE = 0, ///< DD disinfect flush DD_DISINFECT_HEAT_STATE, ///< DD disinfect heat - DD_DISINFECT_CHEM_STATE, ///< DD disinfect chemical - DD_DISINFECT_CHEM_FLUSH_STATE, ///< DD disinfect chemical flush DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE, ///< DD disinfect RO permeate sample DD_DISINFECT_NOT_RUNNING_STATE, ///< DD disinfect not running NUM_OF_DD_DISINFECT_STATES ///< Number of DD disinfect states @@ -260,7 +166,7 @@ }; typedef enum DD_Flush_UI_States DD_FLUSH_UI_STATE_T; ///< Type for DD flush mode UI states enumeration -#if defined(_HD_) || defined(_DD_) +#if defined(_TD_) || defined(_DD_) /// Flush mode data publish struct typedef struct { @@ -326,7 +232,7 @@ }; typedef enum DD_Heat_UI_States DD_HEAT_DISINFECT_UI_STATE_T; ///< Type for DD heat disinfect UI states enumeration -#if defined(_HD_) || defined(_DD_) +#if defined(_TD_) || defined(_DD_) /// Heat disinfect data publish struct typedef struct { @@ -347,7 +253,6 @@ CANCELLATION_MODE_BASIC, ///< Cancellation mode basic. CANCELLATION_MODE_HOT, ///< Cancellation mode hot. CANCELLATION_MODE_COLD, ///< Cancellation mode cold. - CANCELLATION_MODE_CHEMICAL, ///< Cancellation mode chemical. CANCELLATION_MODE_WATER, ///< Cancellation mode water. NUM_OF_CANCELLATION_MODES ///< Number of cancellation modes. } CANCELLATION_MODE_T; @@ -380,37 +285,6 @@ /**@}*/ -#if defined(_HD_) || defined(_DD_) -/// Chemical disinfect data -typedef struct -{ - U32 chemDisinfectState; ///< Chemical disinfect state. - U32 overallElapsedTime; ///< Overall elapsed time in chemical disinfect mode. - U32 stateElapsedTime; ///< Current chemical disinfect elapsed time. - U32 cancellationMode; ///< Chemical disinfect cancellation mode. - F32 R1FillLevel; ///< Reservoir 1 level upon starting the chemical disinfect. - F32 R2FillLevel; ///< Reservoir 2 level upon starting the chemical disinfect. - F32 acidAvgCondUSPCM; ///< Acid average conductivity in uS/cm. -} MODE_CHEMICAL_DISINFECT_DATA_T; -#endif - -/**@}*/ - -#if defined(_HD_) || defined(_DD_) -/// Chemical disinfect flush data -typedef struct -{ - U32 chemDisinfectFlushState; ///< Chemical disinfect flush state. - U32 overallElapsedTime; ///< Overall elapsed time in chemical disinfect flush mode. - U32 stateElapsedTime; ///< Current chemical disinfect flush elapsed time. - U32 cancellationMode; ///< Chemical disinfect flush cancellation mode. - U32 postDisinfectCurrentRinseCount; ///< Current post disinfect rinse count. - U32 chemDisinfectFlushUIState; ///< Chemical disinfect flush UI state. -} MODE_CHEMICAL_DISINFECT_FLUSH_DATA_T; -#endif - -/**@}*/ - /** * @addtogroup DDROPermeateSampleMode * @{ @@ -531,7 +405,7 @@ HEATER_EXEC_STATE_OFF = 0, ///< Heater exec state off. HEATER_EXEC_STATE_PRIMARY_RAMP_TO_TARGET, ///< Heater exec state primary ramp to target. HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET, ///< Heater exec state primary control to target. - HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET, ///< Heater exec state control to disinfect (heat or chemical) target. + HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET, ///< Heater exec state control to disinfect (heat) target. HEATER_EXEC_STATE_TRIMMER_RAMP_TO_TARGET, ///< Heater exec state trimmer ramp to target. HEATER_EXEC_STATE_TRIMMER_CONTROL_TO_TARGET, ///< Heater exec state trimmer control to target. NUM_OF_HEATERS_STATE, ///< Number of heaters state. @@ -547,7 +421,6 @@ NELSON_INOCULATE, // Nelson inoculate. NELSON_HEAT_DISINFECT, // Nelson heat disinfect. NELSON_POS_CONTROL_HEAT_DISINFECT, // Nelson positive control heat disinfect. - NELSON_CHEM_DISINFECT, // Nelson chemical disinfect. NELSON_DRAIN_SAMPLES, // Nelson drain sample. NUM_OF_NELSON_SUPPORT // Number of Nelson supports. } NELSON_SUPPORT_T; Index: MsgDefs.h =================================================================== diff -u -r22c198bec7c2e7bb993e68d930a567bd8f26c36f -r4afc5fdb64135add3051d793f05cc15e52df6f89 --- MsgDefs.h (.../MsgDefs.h) (revision 22c198bec7c2e7bb993e68d930a567bd8f26c36f) +++ MsgDefs.h (.../MsgDefs.h) (revision 4afc5fdb64135add3051d793f05cc15e52df6f89) @@ -22,7 +22,7 @@ // ********** public definitions ********** /** - * @addtogroup Messages + * @addtogroup Messaging * @{ */