Index: DGDefs.h =================================================================== diff -u -r51e97b24d0656c51586e7011b2f16416ca447d30 -rfcf38a003df4244ef8acba8374150b34319aed44 --- DGDefs.h (.../DGDefs.h) (revision 51e97b24d0656c51586e7011b2f16416ca447d30) +++ DGDefs.h (.../DGDefs.h) (revision fcf38a003df4244ef8acba8374150b34319aed44) @@ -422,24 +422,24 @@ /// Enumeration of available DG commands. enum DG_Command { - DG_CMD_NONE = 0, ///< Not a command - DG_CMD_SWITCH_RESERVOIR = 1, ///< Command to request DG switch reservoirs - DG_CMD_START_DRAIN = 2, ///< Command to request DG to start drain - DG_CMD_STOP_DRAIN = 3, ///< Command to request DG to stop drain - DG_CMD_START_FILL = 4, ///< Command to request DG to start fill - DG_CMD_STOP_FILL = 5, ///< Command to request DG to stop fill - DG_CMD_START_TRIMMER_HEATER = 6, ///< Command to request DG to start trimmer heater - 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 - DG_CMD_REQUEST_CONC_RATIOS = 16, ///< Command to request DG to send the concentrate pumps mixing ratios - NUM_OF_DG_COMMANDS ///< Number of DG commands + DG_CMD_NONE = 0, ///< Not a command + DG_CMD_SWITCH_RESERVOIR = 1, ///< Command to request DG switch reservoirs + DG_CMD_START_DRAIN = 2, ///< Command to request DG to start drain + DG_CMD_STOP_DRAIN = 3, ///< Command to request DG to stop drain + DG_CMD_START_FILL = 4, ///< Command to request DG to start fill + DG_CMD_STOP_FILL = 5, ///< Command to request DG to stop fill + DG_CMD_START_TRIMMER_HEATER = 6, ///< Command to request DG to start trimmer heater + 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 + DG_CMD_REQUEST_CONC_MIXING_RATIOS = 16, ///< Command to request DG to send the concentrate pumps mixing ratios + NUM_OF_DG_COMMANDS ///< Number of DG commands }; typedef enum DG_Command DG_COMMAND_T; ///< Type for DG commands enumeration Index: MsgDefs.h =================================================================== diff -u -r51e97b24d0656c51586e7011b2f16416ca447d30 -rfcf38a003df4244ef8acba8374150b34319aed44 --- MsgDefs.h (.../MsgDefs.h) (revision 51e97b24d0656c51586e7011b2f16416ca447d30) +++ MsgDefs.h (.../MsgDefs.h) (revision fcf38a003df4244ef8acba8374150b34319aed44) @@ -198,7 +198,7 @@ MSG_ID_DG_DIALYSATE_FLOW_METER_DATA = 0xA6, ///< DG dialysate flow meter data (liter/minute) MSG_ID_DG_ALARM_INFO = 0xA7, ///< DG alarm information data publish MSG_ID_HD_RESERVOIRS_DATA = 0xA8, ///< HD reservoirs data publish - MSG_ID_HD_REQUEST_DG_CONCENTRATE_RATIOS = 0xA9, ///< HD request DG concentrate ratios + MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS = 0xA9, ///< HD request DG concentrate ratios #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing