Index: DDDefs.h =================================================================== diff -u -r4afc5fdb64135add3051d793f05cc15e52df6f89 -r5f6f19f4bdd2abcfb405622426420b9e8596f954 --- DDDefs.h (.../DDDefs.h) (revision 4afc5fdb64135add3051d793f05cc15e52df6f89) +++ DDDefs.h (.../DDDefs.h) (revision 5f6f19f4bdd2abcfb405622426420b9e8596f954) @@ -55,22 +55,14 @@ 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_DIALYSATE_PUMPS, ///< Dialysate pumps 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 @@ -105,9 +97,6 @@ enum DD_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 }; @@ -127,56 +116,40 @@ /**@}*/ /** - * @addtogroup DDFlushMode + * @addtogroup DDGenDialysateMode * @{ */ -/// Enumeration of flush mode states. -enum DD_Flush_States +/// Enumeration of GenDialysate mode states. +enum DD_GenD_Mode_States { - DD_FLUSH_STATE_START = 0, ///< Flush, start mode state - DD_FLUSH_STATE_DRAIN_R1, ///< Flush, drain reservoir 1 state - DD_FLUSH_STATE_DRAIN_R2, ///< Flush, drain reservoir 2 state - DD_FLUSH_STATE_FLUSH_DRAIN, ///< Flush, flush drain state - DD_FLUSH_STATE_FLUSH_DIALYSATE, ///< Flush, flush dialysate state - DD_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS, ///< Flush, flush concentrate straws state - DD_FLUSH_STATE_FLUSH_R1_TO_R2, ///< Flush, flush reservoir 1 to reservoir 2 state - DD_FLUSH_STATE_FLUSH_R2_AND_DRAIN_R1, ///< Flush, flush reservoir 2 and drain reservoir 1 state - DD_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE, ///< Flush, flush circulation drain line state - DD_FLUSH_STATE_FLUSH_CIRCULATION, ///< Flush, flush circulation state - DD_FLUSH_STATE_FLUSH_WITH_FRESH_WATER, ///< Flush, flush with fresh water - DD_FLUSH_STATE_CANCEL_BASIC_PATH, ///< Flush, cancel basic path state - DD_FLUSH_STATE_CANCEL_WATER_PATH, ///< Flush, cancel water path state - DD_FLUSH_STATE_COMPLETE, ///< Flush, complete mode state - NUM_OF_DD_FLUSH_STATES ///< Number of flush mode states + DD_GEND_STATE_START = 0, ///< Gen dialysate start state + DD_GEND_HYD_CHAMBER_WATER_INLET_CHECK_STATE, ///< Gen dialysate Hydraulic chamber water inlet check state + DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE, ///< Gen dialysate Hydraulic chamber pressure check state + DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE, ///< Gen dialysate fresh dialysate pressure check state + DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE, ///< Gen dialysate spent dialysate pressure check state + DD_GEND_PRODUCE_DIALYSATE_STATE, ///< Gen dialysate - produce dialysate state + DD_GEND_DIALYSATE_DELIVERY_STATE, ///< Gen dialysate - deliver dialysate state + DD_GEND_DIALYSATE_DELIVERY_PAUSE, ///< Gen dialysate - dialysate delivery pause state + NUM_OF_DD_GEND_MODE_STATES ///< Number of gen dialysate states }; -typedef enum DD_Flush_States DD_FLUSH_STATE_T; ///< Type for DD flush mode states enumeration +typedef enum DD_GenD_Mode_States DD_GEND_MODE_STATE_T; ///< Type for DD gen dialysate mode states enumeration -/// Enumeration of flush mode UI states. -enum DD_Flush_UI_States +/// DD acid types +typedef enum dd_acid_types { - FLUSH_UI_STATE_NOT_RUNNING = 0, ///< Flush UI, not running state - FLUSH_UI_STATE_DRAIN_DEVICE, ///< Flush UI, drain device state - FLUSH_UI_STATE_FLUSH_RESERVOIRS, ///< Flush UI, flush reservoirs - FLUSH_UI_STATE_DRAIN_RESERVOIRS, ///< Flush UI, drain reservoirs - FLUSH_UI_STATE_FLUSH_RECIRCULATION_PATH, ///< Flush UI, flush recirculation path - FLUSH_UI_STATE_CANCEL_FLUSH, ///< Flush UI, cancel flush state - FLUSH_UI_STATE_COMPLETE, ///< Flush UI, complete state - NUM_OF_FLUSH_UI_STATES ///< Number of flush UI states -}; -typedef enum DD_Flush_UI_States DD_FLUSH_UI_STATE_T; ///< Type for DD flush mode UI states enumeration + ACID_08_1251_1 = 0, ///< Acid type 08-1251-1. + ACID_08_2251_0, ///< Acid type 08-2251-0. + ACID_08_3251_9, ///< ACid type 08-3251-9. + NUM_OF_ACID_TYPE ///< Number of acid types. +} DD_ACID_TYPES_T; -#if defined(_TD_) || defined(_DD_) -/// Flush mode data publish struct -typedef struct +/// DD bicarb types +typedef enum dd_bicarb_types { - U32 flushState; ///< Flush state. - U32 overallElapsedTime; ///< Overall elapsed time in flush mode. - U32 stateElapsedTime; ///< Current flush elapsed time. - F32 drainLineVolume; ///< Drain line volume. - U32 flushUIState; ///< Flush UI state. -} MODE_FLUSH_DATA_T; -#endif + BICARB_08_677753_0 = 0, ///< Bicarb type 08-677753-0 + NUM_OF_BICARB_TYPE ///< Number of bicarb types. +} DD_BICARB_TYPES_T; /**@}*/ @@ -189,28 +162,7 @@ enum DD_Heat_States { DD_HEAT_DISINFECT_STATE_START = 0, ///< Heat disinfect, start mode state - DD_HEAT_DISINFECT_STATE_DRAIN_R1, ///< Heat disinfect, drain R1 state - DD_HEAT_DISINFECT_STATE_DRAIN_R2, ///< Heat disinfect, drain R2 state - DD_HEAT_DISINFECT_STATE_FLUSH_DRAIN, ///< Heat disinfect, flush drain state - DD_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION, ///< Heat disinfect, flush circulation state - DD_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2, ///< Heat disinfect, flush R1 and R2 state - DD_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1, ///< Heat disinfect, flush R2 and drain R1 state - DD_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2, ///< Heat disinfect, flush drain R2 state - DD_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1, ///< Heat disinfect, flush drain R1 state - DD_HEAT_DISINFECT_STATE_FILL_WITH_WATER, ///< Heat disinfect, fill with water state - DD_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2, ///< Heat disinfect, disinfect R1 to R2 state - DD_HEAT_DISINFECT_STATE_PREPARE_FOR_HOT_WATER_TRANSITION, ///< Heat disinfect, prepare for hot water transition - DD_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER, ///< Heat disinfect, fill R2 with hot water state - DD_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1, ///< Heat disinfect, disinfect R2 to R1 state - DD_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS, ///< Heat disinfect, cool down heaters state - DD_HEAT_DISINFECT_STATE_MIX_DRAIN_R1, ///< Heat disinfect, mix drain R1 state - DD_HEAT_DISINFECT_STATE_MIX_DRAIN_R2, ///< Heat disinfect, mix drain R2 state - DD_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH, ///< Heat disinfect, cancel mode basic path state - DD_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH, ///< Heat disinfect, cancel mode water path state DD_HEAT_DISINFECT_STATE_COMPLETE, ///< Heat disinfect, complete state -#ifndef _RELEASE_ - DD_NELSON_HEAT_DISINFECT_STATE_FILL_R1_WITH_WATER, -#endif NUM_OF_DD_HEAT_DISINFECT_STATES ///< Number of heat disinfect mode states }; typedef enum DD_Heat_States DD_HEAT_DISINFECT_STATE_T; ///< Type for DD heat disinfect states enumeration @@ -219,14 +171,6 @@ enum DD_Heat_UI_States { HEAT_DISINFECT_UI_STATE_NOT_RUNNING = 0, ///< Heat disinfect UI, not running state - HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT, ///< Heat disinfect UI, flush before disinfect state - HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER, ///< Heat disinfect UI, heat up water state - HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_1, ///< Heat disinfect UI, disinfect reservoir 1 state - HEAT_DISINFECT_UI_STATE_TRANSITION_HOT_WATER, ///< Heat disinfect UI, transition hot water state - HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_2, ///< Heat disinfect UI, disinfect reservoir 2 state - HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE, ///< Heat disinfect UI, cool down device state - HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT, ///< Heat disinfect UI, flush after disinfect state - HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT, ///< Heat disinfect UI, cancel disinfect state HEAT_DISINFECT_UI_STATE_COMPLETE, ///< Heat disinfect UI, complete state NUM_OF_HEAT_DISINFECT_UI_STATES ///< Number of heat disinfect mode UI states }; @@ -240,8 +184,6 @@ U32 overallElapsedTime; ///< Overall elapsed time in heat disinfect mode. U32 stateElapsedTime; ///< Current heat disinfect elapsed time. U32 cancellationMode; ///< Heat disinfect cancellation mode. - F32 R1FillLevel; ///< Reservoir 1 level upon starting the heat disinfect. - F32 R2FillLevel; ///< Reservoir 2 level upon starting the heat disinfect. U32 heatDisinfectUIState; ///< Heat disinfect UI state. } MODE_HEAT_DISINFECT_DATA_T; #endif @@ -260,57 +202,6 @@ /**@}*/ /** - * @addtogroup DDHeatDisinfectActiveCoolMode - * @{ - */ - -/// Enumeration of heat disinfect active cool mode states. -enum DD_Heat_Cool_States -{ - DD_HEAT_DISINFECT_ACTIVE_COOL_STATE_START = 0, ///< Heat disinfect active cool, start mode state. - DD_HEAT_DISINFECT_ACITVE_COOL_MIX_DRAIN_R1_STATE, ///< Heat disinfect active cool, mix drain R1 state. - DD_HEAT_DISINFECT_ACTIVE_COOL_MIX_DRAIN_R2_STATE, ///< Heat disinfect active cool, mix drain R2 state. - DD_HEAT_DISINFECT_ACTIVE_COOL_FILL_R1_STATE, ///< Heat disinfect active cool, fill R1 state. - DD_HEAT_DISINFECT_ACTIVE_COOL_FILL_R2_STATE, ///< Heat disinfect active cool, fill R2 state. - DD_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_FILL_R1_TO_R2_STATE, ///< Heat disinfect active cool, drain R2 fill R1 to R2 state. - DD_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_FILL_R2_TO_R1_STATE, ///< Heat disinfect active cool, drain R1 fill R2 to R1 state. - DD_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_STATE, ///< Heat disinfect active cool, drain R1 state. - DD_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_STATE, ///< Heat disinfect active cool, drain R2 state. - DD_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE, ///< Heat disinfect active cool, cancel water path state. - DD_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_BASIC_PATH_STATE, ///< Heat disinfect active cool, cancel basic path state. - DD_HEAT_DISINFECT_ACTIVE_COOL_STATE_COMPLETE, ///< Heat disinfect active cool, complete state. - NUM_OF_DD_HEAT_DISINFECT_ACTIVE_COOL_STATES ///< Number of heat disinfect mode states. -}; -typedef enum DD_Heat_Cool_States DD_HEAT_DISINFECT_ACTIVE_COOL_STATE_T; ///< Type for DD heat disinfect active cool states enumeration - -/**@}*/ - -/** - * @addtogroup DDROPermeateSampleMode - * @{ - */ - -/// Enumeration of RO permeate mode. -enum DD_RO_Permeate_States -{ - DD_RO_PERM_SAMPLE_STATE_START = 0, ///< RO Permeate Sample, start mode state - DD_RO_PERM_SAMPLE_STATE_DRAIN_R1, ///< RO Permeate Sample, drain reservoir 1 state - DD_RO_PERM_SAMPLE_STATE_DRAIN_R2, ///< RO Permeate Sample, drain reservoir 2 state - DD_RO_PERM_SAMPLE_STATE_FLUSH_DRAIN, ///< RO Permeate Sample, flush drain state - DD_RO_PERM_SAMPLE_STATE_FLUSH_DIALYSATE, ///< RO Permeate Sample, flush dialysate state - DD_RO_PERM_SAMPLE_STATE_FLUSH_CONCENTRATE_STRAWS, ///< RO Permeate Sample, flush concentrate straws state - DD_RO_PERM_SAMPLE_STATE_FLUSH_R2_TO_R1_AND_DRAIN_R1, ///< RO Permeate Sample, flush R2 to R1 and drain R1 state - DD_RO_PERM_SAMPLE_STATE_COLLECT_SAMPLE, ///< RO Permeate Sample, collect sample state - DD_RO_PERM_SAMPLE_STATE_CANCEL_BASIC_PATH, ///< RO Permeate Sample, cancel basic path state - DD_RO_PERM_SAMPLE_STATE_CANCEL_WATER_PATH, ///< RO Permeate Sample, cancel water path state - DD_RO_PERM_SAMPLE_STATE_COMPLETE, ///< RO Permeate Sample, complete mode state - NUM_OF_DD_RO_PERM_STATES ///< Number of RO permeate mode states -}; -typedef enum DD_RO_Permeate_States DD_RO_PERM_STATE_T; ///< Type for DD RO Permeate states enumeration - -/**@}*/ - -/** * @addtogroup DDServiceMode * @{ */ @@ -339,17 +230,6 @@ typedef enum DD_Command DD_COMMAND_T; ///< Type for DD commands enumeration /// Enumeration of sample water command parameters. -enum Sample_Water_Commands -{ - SAMPLE_WATER_CMD_STOP = 0, ///< Stop sample water command - SAMPLE_WATER_CMD_START, ///< Start sample water command - SAMPLE_WATER_CMD_FLUSH, ///< Flush the filter sample water command - SAMPLE_WATER_CMD_END, ///< End sample water command - NUM_OF_SAMPLE_WATER_CMDS ///< Number of sample water command parameters -}; -typedef enum Sample_Water_Commands SAMPLE_WATER_CMD_T; ///< Type for sample water enum. - -/// Enumeration of sample water command parameters. enum DD_General_Commands { DD_CMD_STOP = 0, ///< DD general stop command @@ -371,23 +251,11 @@ 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 + DD_EVENT_D6_LEVL_CHANGE, ///< DD floater level change event + DD_EVENT_D63_LEVL_CHANGE, ///< DD bicarb level change event + DD_EVENT_D46_LEVL_CHANGE, ///< DD spent dialysate air seperation level change event + DD_EVENT_TD_COMMUNICATION_LOSS, ///< DD TD communication loss NUM_OF_DD_EVENT_IDS ///< Total number of DD events }; typedef enum DD_Event_List DD_EVENT_ID_T; ///< Type for DD event list enumeration @@ -403,27 +271,42 @@ typedef enum Heaters_Exec_States { 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_RAMP_TO_TARGET, ///< Heater exec state ramp to target. + HEATER_EXEC_STATE_CONTROL_TO_TARGET, ///< Heater exec state control to 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. } HEATERS_STATE_T; /**@}*/ -#ifndef _RELEASE_ -// Nelson lab disinfect efficacy support -typedef enum Nelson_States +/** + * @addtogroup BalancingChamber + * @{ + */ + +/// Enumeration of balancing chamber exec states. +enum Balancing_Chamber_Exec_States { - NELSON_NONE = 0, // Nelson none. - NELSON_INOCULATE, // Nelson inoculate. - NELSON_HEAT_DISINFECT, // Nelson heat disinfect. - NELSON_POS_CONTROL_HEAT_DISINFECT, // Nelson positive control heat disinfect. - NELSON_DRAIN_SAMPLES, // Nelson drain sample. - NUM_OF_NELSON_SUPPORT // Number of Nelson supports. -} NELSON_SUPPORT_T; -#endif + BAL_CHAMBER_STATE_START = 0, ///< Initial state of balancing chamber + BAL_CHAMBER_STATE1_FILL_START, ///< Balancing chamber state 1 fill start state + BAL_CHAMBER_STATE1_BICARB_ACID_DOSING_CNTRL, ///< Balancing Chamber state 1 Bicarb and acid dosing control state + BAL_CHAMBER_STATE1_FILL_END, ///< Balancing Chamber state 1 fill end state + BAL_CHAMBER_STATE2_FILL_START, ///< Balancing chamber state 2 fill start state + BAL_CHAMBER_STATE2_BICARB_ACID_DOSING_CNTRL, ///< Balancing Chamber state 2 Bicarb and acid dosing control state + BAL_CHAMBER_STATE2_FILL_END, ///< Balancing Chamber state 2 fill end state + NUM_OF_BAL_CHAMBER_EXEC_STATES ///< Number of balancing chamber states +}; +typedef enum Balancing_Chamber_Exec_States BAL_CHAMBER_EXEC_STATE_T; ///< Type for balancing chamber exec state enumeration +/// Enumeration of balancing chamber states. +enum Balancing_Chamber_Switching_States +{ + BAL_CHAMBER_SW_STATE1 = 0, ///< Balancing chamber switching state 1 (V2,V5 and V3, V8 open, rest closed) + BAL_CHAMBER_SW_STATE2, ///< Balancing chamber switching state 2 ( V1,V6 and V4, V7 open, rest closed) + NUM_OF_BAL_CHAMBER_SW ///< Number of balancing chamber states +}; +typedef enum Balancing_Chamber_Switching_States BAL_CHAMBER_SW_STATE_T; ///< Type for balancing chamber Switching state enumeration + +/**@}*/ + #endif