Index: DGDefs.h =================================================================== diff -u -r0ba9faa505a5051d05941d709465d1624f48c775 -ra3423542cf15d36156ff66d5b18a3e36ae8088c4 --- DGDefs.h (.../DGDefs.h) (revision 0ba9faa505a5051d05941d709465d1624f48c775) +++ DGDefs.h (.../DGDefs.h) (revision a3423542cf15d36156ff66d5b18a3e36ae8088c4) @@ -60,16 +60,15 @@ 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_LOAD_CELL, ///< Load cells POST state DG_POST_STATE_TEMPERATURE_SENSORS, ///< Temperature Sensors POST state - DG_POST_STATE_HEATERS, ///< Heaters POST state DG_POST_STATE_ACCELEROMETER, ///< Accelerometer POST state DG_POST_STATE_PRESSURES, ///< Pressure sensors 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_DRAIN_PUMP, ///< Drain pump POST state DG_POST_STATE_WATCHDOG, ///< Watchdog 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 @@ -192,23 +191,49 @@ /// Enumeration of flush mode states. enum DG_Flush_States { - DG_FLUSH_STATE_START = 0, ///< Flush, start mode state - DG_FLUSH_STATE_DRAIN_R1, ///< Flush, drain reservoir 1 state - DG_FLUSH_STATE_DRAIN_R2, ///< Flush, drain reservoir 2 state - DG_FLUSH_STATE_FLUSH_DRAIN, ///< Flush, flush drain state - DG_FLUSH_STATE_FLUSH_DIALYSATE, ///< Flush, flush dialysate state - DG_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS, ///< Flush, flush concentrate straws state - DG_FLUSH_STATE_FLUSH_R1_TO_R2, ///< Flush, flush reservoir 1 to reservoir 2 state - DG_FLUSH_STATE_FLUSH_R2_AND_DRAIN_R1, ///< Flush, flush reservoir 2 and drain reservoir 1 state - DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE, ///< Flush, flush circulation drain line state - DG_FLUSH_STATE_FLUSH_CIRCULATION, ///< Flush, flush circulation state - DG_FLUSH_STATE_FLUSH_WITH_FRESH_WATER, ///< Flush, flush with fresh water - DG_FLUSH_STATE_CANCEL_BASIC_PATH, ///< Flush, cancel basic path state - DG_FLUSH_STATE_CANCEL_WATER_PATH, ///< Flush, cancel water path state - DG_FLUSH_STATE_COMPLETE, ///< Flush, complete mode state - NUM_OF_DG_FLUSH_STATES ///< Number of flush mode states + DG_FLUSH_STATE_START = 0, ///< Flush, start mode state + DG_FLUSH_STATE_DRAIN_R1, ///< Flush, drain reservoir 1 state + DG_FLUSH_STATE_DRAIN_R2, ///< Flush, drain reservoir 2 state + DG_FLUSH_STATE_FLUSH_DRAIN, ///< Flush, flush drain state + DG_FLUSH_STATE_FLUSH_DIALYSATE, ///< Flush, flush dialysate state + DG_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS, ///< Flush, flush concentrate straws state + DG_FLUSH_STATE_FLUSH_R1_TO_R2, ///< Flush, flush reservoir 1 to reservoir 2 state + DG_FLUSH_STATE_FLUSH_R2_AND_DRAIN_R1, ///< Flush, flush reservoir 2 and drain reservoir 1 state + DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE, ///< Flush, flush circulation drain line state + DG_FLUSH_STATE_FLUSH_CIRCULATION, ///< Flush, flush circulation state + DG_FLUSH_STATE_FLUSH_WITH_FRESH_WATER, ///< Flush, flush with fresh water + DG_FLUSH_STATE_CANCEL_BASIC_PATH, ///< Flush, cancel basic path state + DG_FLUSH_STATE_CANCEL_WATER_PATH, ///< Flush, cancel water path state + DG_FLUSH_STATE_COMPLETE, ///< Flush, complete mode state + NUM_OF_DG_FLUSH_STATES ///< Number of flush mode states }; -typedef enum DG_Flush_States DG_FLUSH_STATE_T; ///< Type for DG flush mode states enumeration +typedef enum DG_Flush_States DG_FLUSH_STATE_T; ///< Type for DG flush mode states enumeration + +/// Enumeration of flush mode UI states. +enum DG_Flush_UI_States +{ + 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 DG_Flush_UI_States DG_FLUSH_UI_STATE_T; ///< Type for DG flush mode UI states enumeration + +#if defined(_HD_) || defined(_DG_) +/// Flush mode data publish struct +typedef struct +{ + 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 /**@}*/ @@ -250,17 +275,33 @@ /// Enumeration of heat disinfect mode states. enum DG_Heat_UI_States { - HEAT_DISINFECT_UI_STATE_START = 0, ///< Heat disinfect UI, start state + 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_DEVICE, ///< Heat disinfect UI, disinfect device 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 }; typedef enum DG_Heat_UI_States DG_HEAT_DISINFECT_UI_STATE_T; ///< Type for DG heat disinfect UI states enumeration + +#if defined(_HD_) || defined(_DG_) +/// Heat disinfect data publish struct +typedef struct +{ + U32 heatDisinfectState; ///< Heat disinfect state. + 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 /**@}*/ @@ -304,7 +345,7 @@ /// Enumeration of chemical disinfect mode UI states enum DG_Chem_UI_States { - CHEM_DISINFECT_UI_STATE_START = 0, ///< Chemical disinfect UI, start state + CHEM_DISINFECT_UI_STATE_NOT_RUNNING = 0, ///< Chemical disinfect UI, not running state CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT, ///< Chemical disinfect UI, flush before disinfect state CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID, ///< Chemical disinfect UI, mix water and acid state CHEM_DISINFECT_UI_STATE_REMOVE_ACID, ///< Chemical disinfect UI, remove acid state @@ -314,8 +355,24 @@ CHEM_DISINFECT_UI_STATE_COMPLETE, ///< Chemical disinfect UI, complete state NUM_OF_CHEM_DISINFECT_UI_STATES ///< Number of chemical disinfect UI states }; -typedef enum DG_Chem_UI_States DG_CHEM_DISINFECT_UI_STATE_T; ///< Type for DG chemical disinfect UI states enumeration +typedef enum DG_Chem_UI_States DG_CHEM_DISINFECT_UI_STATE_T; ///< Type for DG chemical disinfect UI states enumeration +#if defined(_HD_) || defined(_DG_) +/// 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. + U32 postDisinfectTargetRinseCount; ///< Target post disinfect rinse count. + U32 postDisinfectCurrentRinseCount; ///< Current post disinfect rinse count. + U32 chemDisinfectUIState; ///< Chemical disinfect UI state. +} MODE_CHEMICAL_DISINFECT_DATA_T; +#endif + /**@}*/ /** @@ -351,6 +408,12 @@ DG_CMD_STOP_TRIMMER_HEATER = 7, ///< Command to request DG to stop trimmer heater DG_CMD_VALVE_SETTING = 8, ///< Command to request DG to change valve settings DG_CMD_SAMPLE_WATER = 9, ///< Command to request DG to sample water + DG_CMD_START_FLUSH = 10, ///< Command to request DG to start flush + DG_CMD_STOP_FLUSH = 11, ///< Command to request DG to stop flu + DG_CMD_START_HEAT_DISINFECT = 12, ///< Command to request DG to start heat disinfect + DG_CMD_STOP_HEAT_DISINFECT = 13, ///< Command to request DG to stop heat disinfect + DG_CMD_START_CHEM_DISINFECT = 14, ///< Command to request DG to start chemical disinfect + DG_CMD_STOP_CHEM_DISINFECT = 15, ///< Command to request DG to stop chemical disinfect NUM_OF_DG_COMMANDS ///< Number of DG commands }; typedef enum DG_Command DG_COMMAND_T; ///< Type for DG commands enumeration