Index: DGDefs.h =================================================================== diff -u -r37f2d43f442ac79529206795bc2fd598abdd6801 -r246dc9dfcbd5cdc8960c113b4c1f049db73ce3ca --- DGDefs.h (.../DGDefs.h) (revision 37f2d43f442ac79529206795bc2fd598abdd6801) +++ DGDefs.h (.../DGDefs.h) (revision 246dc9dfcbd5cdc8960c113b4c1f049db73ce3ca) @@ -57,6 +57,8 @@ DG_POST_STATE_START = 0, ///< Start initialize & POST mode 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_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 @@ -65,7 +67,6 @@ 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_NVDATAMGMT, ///< Non-volatile data management POST state DG_POST_STATE_WATCHDOG, ///< Watchdog POST test state DG_POST_STATE_COMPLETED, ///< POST completed successfully state DG_POST_STATE_FAILED, ///< POST failed state @@ -153,6 +154,8 @@ { DG_FILL_MODE_STATE_START = 0, ///< Start fill mode state DG_FILL_MODE_STATE_CHECK_INLET_WATER, ///< Check inlet water quality state + DG_FILL_MODE_STATE_BICARB_PUMP_CHECK, ///< Run bicarb concentrate pump and check conductivity range + DG_FILL_MODE_STATE_ACID_PUMP_CHECK, ///< Run acid concentrate pump and check conductivity range DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION, ///< Dialysate production state DG_FILL_MODE_STATE_DELIVER_DIALYSATE, ///< Deliver dialysate state NUM_OF_DG_FILL_MODE_STATES ///< Number of fill mode states @@ -205,24 +208,24 @@ DG_HEAT_DISINFECT_STATE_DRAIN_R2, ///< Heat disinfect, drain R2 state DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN, ///< Heat disinfect, flush drain state DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION, ///< Heat disinfect, flush circulation state - DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2, ///< Heat disinfect, flush R1 and R2 - DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1, ///< Heat disinfect, flush R2 and drain R1 - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2, ///< Heat disinfect, flush drain R2 - DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1, ///< Heat disinfect, flush drain R1 - DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER, ///< Heat disinfect, fill with water - DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2, ///< Heat disinfect, disinfect R1 to R2 - DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER, ///< Heat disinfect, fill R2 with hot water - DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1, ///< Heat disinfect, disinfect R2 to R1 - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1, ///< Heat disinfect, mix drain R1 - DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2, ///< Heat disinfect, mix drain R2 - DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER, ///< Heat disinfect, cool down RO filter - DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2, ///< Heat disinfect, rinse R1 to R2 - DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1, ///< Heat disinfect, rinse R2 to R1 and drain R1 - DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION, ///< Heat disinfect, rinse circulation - DG_HEAT_DISINFECT_STATE_CANCEL_MODE_BASIC_PATH, ///< Heat disinfect, cancel mode basic path - DG_HEAT_DISINFECT_STATE_CANCEL_MODE_COLD_WATER_PATH, ///< Heat disinfect, cancel mode cold water path - DG_HEAT_DISINFECT_STATE_CANCEL_MODE_HOT_WATER_PATH, ///< Heat disinfect, cancel mode hot water path - DG_HEAT_DISINFECT_STATE_COMPLETE, ///< Heat disinfect, complete + DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2, ///< Heat disinfect, flush R1 and R2 state + DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1, ///< Heat disinfect, flush R2 and drain R1 state + DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2, ///< Heat disinfect, flush drain R2 state + DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1, ///< Heat disinfect, flush drain R1 state + DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER, ///< Heat disinfect, fill with water state + DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2, ///< Heat disinfect, disinfect R1 to R2 state + DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER, ///< Heat disinfect, fill R2 with hot water state + DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1, ///< Heat disinfect, disinfect R2 to R1 state + DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS, ///< Heat disinfect, cool down heaters state + DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER, ///< Heat disinfect, cool down RO filter state + DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1, ///< Heat disinfect, mix drain R1 state + DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2, ///< Heat disinfect, mix drain R2 state + DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2, ///< Heat disinfect, rinse R1 to R2 state + DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1, ///< Heat disinfect, rinse R2 to R1 and drain R1 state + DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION, ///< Heat disinfect, rinse circulation state + DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH, ///< Heat disinfect, cancel mode basic path state + DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH, ///< Heat disinfect, cancel mode water path state + DG_HEAT_DISINFECT_STATE_COMPLETE, ///< Heat disinfect, complete state NUM_OF_DG_HEAT_DISINFECT_STATES ///< Number of heat disinfect mode states }; typedef enum DG_Heat_States DG_HEAT_DISINFECT_STATE_T; ///< Type for DG heat disinfect states enumeration @@ -292,6 +295,15 @@ }; typedef enum Sample_Water_Commands SAMPLE_WATER_CMD_T; ///< Type for sample water enum. +/// Enumeration of sample water command parameters. +enum DG_General_Commands +{ + DG_CMD_STOP = 0, ///< DG general stop command + DG_CMD_START = 1, ///< DG general start command + NUM_OF_DG_CMDS ///< Number of DG general commands +}; +typedef enum DG_General_Commands DG_GENERAL_COMMAND_T; ///< Type for DG general command enum. + /**@}*/ /** @@ -304,9 +316,18 @@ { DG_RESERVOIR_1 = 0, ///< Reservoir number 1 DG_RESERVOIR_2, ///< Reservoir number 2 - NUM_OF_DG_RESERVOIRS ///< Number of reservoirs + NUM_OF_DG_RESERVOIRS ///< Number of reservoirs } DG_RESERVOIR_ID_T; +/// Enumeration of DG reservoirs status. +typedef enum DG_Reservoirs_Status +{ + DG_RESERVOIR_BELOW_TARGET = 0, ///< Reservoir below target + DG_RESERVOIR_ABOVE_TARGET, ///< Reservoir above target + DG_RESERVOIR_REACHED_TARGET, ///< Reservoir reached target + NUM_OF_DG_RESERVOIR_STATUS ///< Number of reservoir status +} DG_RESERVOIR_STATUS_T; // Currently is used in mode heat disinfect and mode flush + /// Enumeration of DG valve settings. typedef enum DG_Valve_Setting {