Index: MsgDefs.h =================================================================== diff -u -r55415b13e2bce0e050148e0bfa5bf0e3d5c01532 -r8acebdda1885e1e36bb93ad36a034f6fc3dc5d23 --- MsgDefs.h (.../MsgDefs.h) (revision 55415b13e2bce0e050148e0bfa5bf0e3d5c01532) +++ MsgDefs.h (.../MsgDefs.h) (revision 8acebdda1885e1e36bb93ad36a034f6fc3dc5d23) @@ -39,50 +39,50 @@ MSG_ID_UI_CHECK_IN = 0x7, ///< UI check-in with HD MSG_ID_DIALYSATE_FLOW_DATA = 0x8, ///< HD broadcast of dialysate inlet flow/pump data MSG_ID_PRESSURE_OCCLUSION_DATA = 0x9, ///< HD broadcast of pressure/occlusion data - MSG_ID_RTC_EPOCH = 0xA, ///< HD broadcast of current date and time from clock + MSG_ID_RTC_EPOCH_DATA = 0xA, ///< HD broadcast of current date and time from clock MSG_ID_DIALYSATE_OUT_FLOW_DATA = 0xB, ///< HD broadcast of dialysate outlet flow/pump/load cell data - MSG_ID_LOAD_CELL_READINGS = 0xC, ///< DG broadcast of load cell weights - MSG_ID_TREATMENT_TIME = 0xD, ///< HD broadcast of treatment time + MSG_ID_LOAD_CELL_READINGS_DATA = 0xC, ///< DG broadcast of load cell weights + MSG_ID_TREATMENT_TIME_DATA = 0xD, ///< HD broadcast of treatment time MSG_ID_POWER_OFF_WARNING = 0xE, ///< HD broadcast power off warning - system power down is imminent - MSG_ID_TREATMENT_STATE = 0xF, ///< HD broadcast of treatment state + MSG_ID_TREATMENT_STATE_DATA = 0xF, ///< HD broadcast of treatment state MSG_ID_USER_UF_PAUSE_RESUME_REQUEST = 0x10, ///< User request to pause or resume ultrafiltration MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST = 0x11, ///< User request to change ultrafiltration settings MSG_ID_USER_SALINE_BOLUS_REQUEST = 0x12, ///< User request for a saline bolus MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE = 0x13, ///< HD response to user request to change ultrafiltration settings MSG_ID_USER_SALINE_BOLUS_RESPONSE = 0x14, ///< HD response to user saline bolus request - MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE = 0x15, ///< User confirmation of ultrafiltration settings change + MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST = 0x15, ///< User confirmation of ultrafiltration settings change MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST = 0x16, ///< User request to change treatment duration MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST = 0x17, ///< User request to change blood and dialysate rates MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE = 0x18, ///< HD response to user request to change blood and dialysate rates MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS = 0x19, ///< HD provides DG with dialysate temperature set points - MSG_ID_TREATMENT_PARAM_CHANGE_RANGES = 0x1A, ///< HD provides several parameter change ranges as they evolve over treatment duration + MSG_ID_TREATMENT_PARAM_CHANGE_RANGES_DATA = 0x1A, ///< HD provides several parameter change ranges as they evolve over treatment duration MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE = 0x1B, ///< HD response to user request to change treatment duration MSG_ID_REQUEST_FW_VERSIONS = 0x1C, ///< UI request for f/w versions - MSG_ID_HD_VERSION = 0x1D, ///< HD f/w version - MSG_ID_DG_VERSION = 0x1E, ///< DG f/w version + MSG_ID_HD_VERSION_REPONSE = 0x1D, ///< HD f/w version response + MSG_ID_DG_VERSION_REPONSE = 0x1E, ///< DG f/w version response MSG_ID_RO_PUMP_DATA = 0x1F, ///< DG broadcast of RO pump data MSG_ID_DG_PRESSURES_DATA = 0x20, ///< DG broadcast of pressure sensors data MSG_ID_DG_SWITCH_RESERVOIR_CMD = 0x21, ///< HD request to DG to switch reservoirs (A->B or B->A) MSG_ID_DG_FILL_CMD = 0x22, ///< HD request to DG to fill inactive reservoir MSG_ID_DG_DRAIN_CMD = 0x23, ///< HD request to DG to drain inactive reservoir MSG_ID_DRAIN_PUMP_DATA = 0x24, ///< DG broadcast of drain pump data - MSG_ID_HD_OP_MODE = 0x25, ///< HD broadcast current operating mode + MSG_ID_HD_OP_MODE_DATA = 0x25, ///< HD broadcast current operating mode MSG_ID_STARTING_STOPPING_TREATMENT_CMD = 0x26, ///< HD request to DG to move in/out of standby mode due to treatment start/stop - MSG_ID_DG_OP_MODE = 0x27, ///< DG broadcast current operating mode + MSG_ID_DG_OP_MODE_DATA = 0x27, ///< DG broadcast current operating mode MSG_ID_DG_RESERVOIRS_DATA = 0x28, ///< DG broadcast reservoirs data MSG_ID_DG_SAMPLE_WATER_CMD = 0x29, ///< HD request to DG to allow user to get a water sample - MSG_ID_DG_VALVES_STATES = 0x2A, ///< DG broadcast valve states + MSG_ID_DG_VALVES_STATES_DATA = 0x2A, ///< DG broadcast valve states MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD = 0x2B, ///< HD request to DG to start/stop trimmer heater MSG_ID_DG_HEATERS_DATA = 0x2C, ///< DG broadcast of the heaters data MSG_ID_DG_TEMPERATURE_DATA = 0x2D, ///< DG broadcast of the temperature sensors data MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x2E, ///< HD response to user selection of ultrafiltration settings change option selection MSG_ID_SALINE_BOLUS_DATA = 0x2F, ///< HD broadcast of saline bolus data - MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0x30, ///< HD request to start or stop DG heat disinfection + MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD = 0x30, ///< HD request to start or stop DG heat disinfection MSG_ID_DG_CONDUCTIVITY_DATA = 0x31, ///< DG broadcast of the conductivity sensors data - MSG_ID_USER_REQUEST_ALARM_SILENCE = 0x32, ///< UI request alarm silence (or cancel) + MSG_ID_USER_ALARM_SILENCE_REQUEST = 0x32, ///< UI request alarm silence (or cancel) MSG_ID_HD_ACCELEROMETER_DATA = 0x33, ///< HD broadcast of accelerometer data MSG_ID_DG_ACCELEROMETER_DATA = 0x34, ///< DG broadcast of accelerometer data - MSG_ID_UI_NEW_TREATMENT_PARAMS = 0x35, ///< UI request to validate new treatment parameter set + MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST = 0x35, ///< UI request to validate new treatment parameter set MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE = 0x36, ///< HD response to new treatment parameters set MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37, ///< DG heat disinfect publish data MSG_ID_UI_INITIATE_TREATMENT_REQUEST = 0x38, ///< UI user request to initiate a treatment @@ -93,7 +93,7 @@ MSG_ID_HD_START_PRIME_RESPONSE = 0x3D, ///< HD response to user request to start priming MSG_ID_HD_AIR_TRAP_DATA = 0x3E, ///< HD broadcast of air trap data MSG_ID_ALARM_CONDITION_CLEARED = 0x3F, ///< Alarm condition cleared event - MSG_ID_UI_ALARM_USER_ACTION = 0x40, ///< UI user has requested an alarm action + MSG_ID_UI_ALARM_USER_ACTION_REQUEST = 0x40, ///< UI user has requested an alarm action MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE = 0x41, ///< HD response to user request to pause or resume ultrafiltration MSG_ID_DG_CONCENTRATE_PUMP_DATA = 0x42, ///< DG broadcast of concentrate pump data MSG_ID_HD_PRIMING_STATUS_DATA = 0x43, ///< HD priming status during cartridge prime @@ -106,55 +106,55 @@ MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM = 0x4A, ///< UI patient disconnection confirm MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST = 0x4B, ///< UI request to pause/resume Heparin delivery MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE = 0x4C, ///< HD response to pause/resume Heparing delivery request - MSG_ID_HD_HEPARIN_DATA_BROADCAST = 0x4D, ///< HD broadcast of Heparin delivery data + MSG_ID_HD_HEPARIN_DATA = 0x4D, ///< HD broadcast of Heparin delivery data MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD = 0x4E, ///< UI command to set alarm audio volume level - MSG_ID_UI_SET_UF_VOLUME_PARAMETER = 0x4F, ///< UI request to validate new ultrafiltration volume treatment parameter + MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST = 0x4F, ///< UI request to validate new ultrafiltration volume treatment parameter MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE = 0x50, ///< HD response to new treatment parameters set MSG_ID_DG_COMMAND_RESPONSE = 0x51, ///< DG response to command from HD - MSG_ID_UI_RINSEBACK_CMD = 0x52, ///< UI rinseback sub-mode user request + MSG_ID_UI_RINSEBACK_CMD_REQUEST = 0x52, ///< UI rinseback sub-mode user request MSG_ID_HD_RINSEBACK_CMD_RESPONSE = 0x53, ///< HD rinseback sub-mode user request response - MSG_ID_UI_RECIRC_CMD = 0x54, ///< UI re-circ sub-mode user request + MSG_ID_UI_RECIRC_CMD_REQUEST = 0x54, ///< UI re-circ sub-mode user request MSG_ID_HD_RECIRC_CMD_RESPONSE = 0x55, ///< HD re-circ sub-mode request response MSG_ID_HD_RINSEBACK_PROGRESS = 0x56, ///< HD broadcast of rinseback progress - MSG_ID_UI_TX_END_CMD = 0x57, ///< UI end treatment sub-mode user request + MSG_ID_UI_TX_END_CMD_REQUEST = 0x57, ///< UI end treatment sub-mode user request MSG_ID_HD_TX_END_CMD_RESPONSE = 0x58, ///< HD end treatment sub-mode user request response - MSG_ID_HD_BLOOD_PRIME_PROGRESS = 0x59, ///< HD broadcast of blood prime progress - MSG_ID_HD_RECIRC_PROGRESS = 0x5A, ///< HD broadcast of treatment re-circulate progress + MSG_ID_HD_BLOOD_PRIME_PROGRESS_DATA = 0x59, ///< HD broadcast of blood prime progress + MSG_ID_HD_RECIRC_PROGRESS_DATA = 0x5A, ///< HD broadcast of treatment re-circulate progress MSG_ID_DG_CHANGE_VALVE_SETTING_CMD = 0x5B, ///< HD request to DG to change valve setting - MSG_ID_PRE_TREATMENT_STATE = 0x5C, ///< HD broadcast of pre-treatment state - MSG_ID_UI_SAMPLE_WATER_CMD = 0x5D, ///< UI sample water sub-mode user request + MSG_ID_PRE_TREATMENT_STATE_DATA = 0x5C, ///< HD broadcast of pre-treatment state + MSG_ID_UI_SAMPLE_WATER_CMD_REQUEST = 0x5D, ///< UI sample water sub-mode user request MSG_ID_HD_SAMPLE_WATER_CMD_RESPONSE = 0x5E, ///< HD sample water sub-mode request response MSG_ID_UI_SAMPLE_WATER_RESULT = 0x5F, ///< UI sample water result message - MSG_ID_DG_FILTER_FLUSH_PROGRESS = 0x60, ///< DG broadcast of filter flush progress - MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS = 0x61, ///< HD broadcast of no cartridge self-tests progress + MSG_ID_DG_FILTER_FLUSH_PROGRESS_DATA = 0x60, ///< DG broadcast of filter flush progress + MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA = 0x61, ///< HD broadcast of no cartridge self-tests progress MSG_ID_UI_INSTALLATION_CONFIRM = 0x62, ///< UI disposable installation user confirmation - MSG_ID_HD_DRY_SELF_TEST_PROGRESS = 0x63, ///< HD broadcast of dry self-tests progress + MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA = 0x63, ///< HD broadcast of dry self-tests progress MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST = 0x64, ///< UI user has requested to begin patient connection MSG_ID_HD_PATIENT_CONNECTION_BEGIN_RESPONSE = 0x65, ///< HD response to user request to begin patient connection - MSG_ID_UI_PATIENT_CONNECTION_CONFIRM = 0x66, ///< UI user has confirmed patient connection completed + MSG_ID_UI_PATIENT_CONNECTION_CONFIRM_REQUEST = 0x66, ///< UI user has confirmed patient connection completed MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE = 0x67, ///< HD response to user confirmation of patient connection - MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM = 0x68, ///< UI user has confirmed consumable install + MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM_REQUEST = 0x68, ///< UI user has confirmed consumable install MSG_ID_HD_SYRINGE_PUMP_DATA = 0x69, ///< HD broadcast of syringe pump data - MSG_ID_HD_FLUID_LEAK_STATE = 0x6A, ///< HD broadcast of fluid leak state - MSG_ID_DG_FLUID_LEAK_STATE = 0x6B, ///< DG broadcast of fluid leak state + MSG_ID_HD_FLUID_LEAK_STATE_DATA = 0x6A, ///< HD broadcast of fluid leak state + MSG_ID_DG_FLUID_LEAK_STATE_DATA = 0x6B, ///< DG broadcast of fluid leak state MSG_ID_HD_BLOOD_LEAK_DATA = 0x6C, ///< HD broadcast of blood leak data MSG_ID_UI_HD_SET_RTC_REQUEST = 0x6D, ///< UI requests HD to set RTC MSG_ID_HD_UI_SET_RTC_RESPONSE = 0x6E, ///< HD response for RTC set request MSG_ID_UI_DG_SET_RTC_REQUEST = 0x6F, ///< UI requests DG to set RTC MSG_ID_DG_UI_SET_RTC_RESPONSE = 0x70, ///< DG response for RTC set request MSG_ID_UI_START_TREATMENT_REQUEST = 0x71, ///< UI user has requested to start treatment MSG_ID_HD_START_TREATMENT_RESPONSE = 0x72, ///< HD response to user request to start treatment - MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM = 0x73, ///< UI user has confirmed disposable removal + MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST = 0x73, ///< UI user has confirmed disposable removal MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE = 0x74, ///< HD response to user confirmation of disposable removal MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST = 0x75, ///< UI request treatment log data message MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0x76, ///< HD response to UI treatment log data request - MSG_ID_HD_POST_TREATMENT_STATE = 0x77, ///< HD broadcast of post-treatment state + MSG_ID_HD_POST_TREATMENT_STATE_DATA = 0x77, ///< HD broadcast of post-treatment state MSG_ID_DG_START_STOP_CHEM_DISINFECT = 0x78, ///< DG start/stop chemical disinfection - MSG_ID_DG_START_STOP_FLUSH = 0x79, ///< DG start/stop flush mode + MSG_ID_DG_START_STOP_FLUSH_CMD = 0x79, ///< DG start/stop flush mode MSG_ID_DG_FLUSH_DATA = 0x7A, ///< DG flush data publish MSG_ID_HD_VOLTAGES_DATA = 0x7B, ///< HD voltages data publish MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0x7C, ///< HD response to UI set alarm audio volume request - MSG_ID_HD_ALARM_INFORMATION = 0x7D, ///< HD alarm information broadcast message + MSG_ID_HD_ALARM_INFORMATION_DATA = 0x7D, ///< HD alarm information broadcast message MSG_ID_HD_DISINFECT_STANDBY_DATA = 0x7E, ///< HD broadcast of standby disinfect data MSG_ID_UI_DISINFECT_REQUEST = 0x7F, ///< UI disinfection selection MSG_ID_HD_DISINFECT_RESPONSE = 0x80, ///< HD response to disinfection selection @@ -166,7 +166,7 @@ MSG_ID_DG_VOLTAGES_DATA = 0x86, ///< DG voltages data publish MSG_ID_DG_CHEM_DISINFECT_DATA = 0x87, ///< DG chemical disinfect data publish MSG_ID_DG_SERIAL_NUMBER = 0x88, ///< DG serial number - MSG_ID_UI_REQUEST_SERVICE_INFO = 0x89, ///< UI request for service schedule information + MSG_ID_UI_SERVICE_INFO_REQUEST = 0x89, ///< UI request for service schedule information MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0x8A, ///< HD service schedule data MSG_ID_HD_USAGE_DATA = 0x8B, ///< HD usage data MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0x8C, ///< DG service schedule data @@ -182,14 +182,14 @@ MSG_ID_HD_TREATMENT_LOG_EVENT = 0x96, ///< HD treatment log event MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST = 0x97, ///< UI active alarms list request MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0x98, ///< HD active alarms list request response - MSG_ID_HD_SERIAL_NUMBER = 0x99, ///< HD serial number + MSG_ID_HD_SERIAL_NUMBER_RESPONSE = 0x99, ///< HD serial number MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST = 0x9A, ///< HD set standby disinfect submode request MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE = 0x9B, ///< HD set standby disinfect submode response MSG_ID_HD_DG_POST_RESULT_REQUEST = 0x9C, ///< HD request for DG POST final result (reported back on msg 0x91) MSG_ID_HD_TEMPERATURES_DATA = 0x9D, ///< HD temperatures data MSG_ID_HD_UI_VERSION_INFO_REQUEST = 0x9E, ///< HD request for UI version information MSG_ID_HD_UI_VERSION_INFO_RESPONSE = 0x9F, ///< UI response to HD request for version information - MSG_ID_REQUEST_HD_USAGE_INFO = 0xA0, ///< HD request usage information + MSG_ID_HD_USAGE_INFO_REQUEST = 0xA0, ///< HD request usage information MSG_ID_DG_SWITCHES_DATA = 0xA1, ///< DG switches data publish MSG_ID_HD_SWITCHES_DATA = 0xA2, ///< HD switches data publish MSG_ID_HD_FANS_DATA = 0xA3, ///< HD fans data publish