Index: MsgDefs.h =================================================================== diff -u -r3512b70a8727c57ba908fdbaf4c5935dabf099c8 -ref62b5ce09f51b88048f2212a379ed69545b9182 --- MsgDefs.h (.../MsgDefs.h) (revision 3512b70a8727c57ba908fdbaf4c5935dabf099c8) +++ MsgDefs.h (.../MsgDefs.h) (revision ef62b5ce09f51b88048f2212a379ed69545b9182) @@ -30,8 +30,8 @@ enum Msg_IDs { // normal CAN messages MSG_ID_UNUSED = 0x0, ///< Zero is an undefined (un-used) message ID) - MSG_ID_OFF_BUTTON_PRESS = 0x1, ///< HD/UI off button interactions - MSG_ID_ALARM_STATUS = 0x2, ///< HD broadcast of system alarm state information + MSG_ID_OFF_BUTTON_PRESS_REQUEST = 0x1, ///< UI to HD off button request + MSG_ID_ALARM_STATUS_DATA = 0x2, ///< HD broadcast of system alarm state information MSG_ID_ALARM_TRIGGERED = 0x3, ///< Alarm triggered event MSG_ID_ALARM_CLEARED = 0x4, ///< Alarm cleared event MSG_ID_BLOOD_FLOW_DATA = 0x5, ///< HD broadcast of blood flow/pump data @@ -57,27 +57,27 @@ MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS = 0x19, ///< HD provides DG with dialysate temperature set points 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_FW_VERSIONS_REQUEST = 0x1C, ///< UI request for f/w versions 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_DG_SWITCH_RESERVOIR_CMD_REQUEST = 0x21, ///< HD request to DG to switch reservoirs (A->B or B->A) + MSG_ID_DG_FILL_CMD_REQUEST = 0x22, ///< HD request to DG to fill inactive reservoir + MSG_ID_DG_DRAIN_CMD_REQUEST = 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_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_STARTING_STOPPING_TREATMENT_CMD_REQUEST = 0x26, ///< HD request to DG to move in/out of standby mode due to treatment start/stop 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_SAMPLE_WATER_CMD_REQUEST = 0x29, ///< HD request to DG to allow user to get a water sample 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_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST = 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_CMD = 0x30, ///< HD request to start or stop DG heat disinfection + MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST = 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_ALARM_SILENCE_REQUEST = 0x32, ///< UI request alarm silence (or cancel) MSG_ID_HD_ACCELEROMETER_DATA = 0x33, ///< HD broadcast of accelerometer data @@ -88,7 +88,7 @@ MSG_ID_UI_INITIATE_TREATMENT_REQUEST = 0x38, ///< UI user request to initiate a treatment MSG_ID_HD_INITIATE_TREATMENT_RESPONSE = 0x39, ///< HD response to user request to initiate a treatment MSG_ID_HD_VALVES_DATA = 0x3A, ///< HD broadcast of valves data - MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B, ///< UI user confirmation of treatment parameters + MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS_REQUEST = 0x3B, ///< UI user confirmation of treatment parameters MSG_ID_UI_START_PRIME_REQUEST = 0x3C, ///< UI user has requested to start priming 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 @@ -107,7 +107,7 @@ 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 = 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_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST = 0x4E, ///< UI command to set alarm audio volume level 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 @@ -120,7 +120,7 @@ MSG_ID_HD_TX_END_CMD_RESPONSE = 0x58, ///< HD end treatment sub-mode user request response 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_DG_CHANGE_VALVE_SETTING_CMD_REQUEST = 0x5B, ///< HD request to DG to change valve setting 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 @@ -150,7 +150,7 @@ MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0x76, ///< HD response to UI treatment log data request 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_CMD = 0x79, ///< DG start/stop flush mode + MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST = 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 @@ -165,7 +165,7 @@ MSG_ID_DG_CHEM_DISINFECT_TIME_DATA = 0x85, ///< DG broadcast of chemical disinfection mode time data 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_DG_SERIAL_NUMBER_RESPONSE = 0x88, ///< DG serial number 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 @@ -187,38 +187,38 @@ 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_UI_VERSION_INFO_REQUEST = 0x9E, ///< HD request for UI version information + MSG_ID_HD_UI_VERSION_INFO_REQUEST = 0x9E, ///< HD request for UI version information MSG_ID_UI_VERSION_INFO_RESPONSE = 0x9F, ///< UI response to HD request for version 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 MSG_ID_HD_EVENT = 0xA4, ///< HD general event MSG_ID_DG_EVENT = 0xA5, ///< DG general event - MSG_ID_HD_SET_SERVICE_TIME = 0xA6, ///< HD set service time - MSG_ID_DG_ALARM_INFO = 0xA7, ///< DG alarm information data publish + MSG_ID_HD_SET_SERVICE_TIME_REQUEST = 0xA6, ///< HD set service time + MSG_ID_DG_ALARM_INFO_DATA = 0xA7, ///< DG alarm information data publish MSG_ID_HD_RESERVOIRS_DATA = 0xA8, ///< HD reservoirs data publish - MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS = 0xA9, ///< HD request DG concentrate ratios + MSG_ID_HD_DG_CONCENTRATE_MIXING_RATIOS_REQUEST = 0xA9, ///< HD request DG concentrate ratios MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA = 0xAA, ///< DG concentrate mixing ratios data MSG_ID_DG_SCHEDULED_RUNS_DATA = 0xAB, ///< DG scheduled runs data - MSG_ID_DG_SET_SERVICE_TIME = 0xAC, ///< DG set service time + MSG_ID_DG_SET_SERVICE_TIME_REQUEST = 0xAC, ///< DG set service time MSG_ID_UI_INSTALLATION_CONFIRM_RESPONSE = 0xAD, ///< HD Confirm installation response MSG_ID_DG_FILL_MODE_DATA = 0xAE, ///< DG broadcast of fill mode data such as used acid & bicarb volume MSG_ID_DG_GEN_IDLE_DATA = 0xAF, ///< DG broadcast of Gen idle mode sub-state - MSG_ID_UI_REQUEST_SERVICE_MODE = 0xB0, ///< UI request to HD to go to service mode + MSG_ID_UI_SERVICE_MODE_REQUEST = 0xB0, ///< UI request to HD to go to service mode MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST = 0xB1, ///< HD response to UI request to go to service mode MSG_ID_HD_REQUEST_UI_FINAL_POST_RESULT = 0xB2, ///< HD request to UI for final POST result MSG_ID_DG_FLOW_SENSORS_DATA = 0xB3, ///< DG flow sensors data publish MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST = 0xB4, ///< DG response to HD request to go to service mode - MSG_ID_HD_REQUEST_DG_ALARMS = 0xB5, ///< HD request for DG to re-send trigger messages for each active alarm - MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6, ///< HD request for DG to to go to service mode - MSG_ID_DG_RTC_EPOCH = 0xB7, ///< DG RTC epoch broadcast message - MSG_ID_HD_REQUEST_DG_USAGE_INFO = 0xB8, ///< HD request DG usage info - MSG_ID_HD_REQUEST_DG_SERVICE_RECORD = 0xB9, ///< HD request DG service record - MSG_ID_HD_REQUEST_UI_CONFIRMATION = 0xBA, ///< HD request UI confirmation - MSG_ID_UI_CONFIRMATION_RESULT = 0xBB, ///< UI confirmation result response - MSG_ID_REQUEST_CPLD_STATUS = 0xBC, ///< Dialin request for CPLD Status - MSG_ID_DG_CPLD_STATUS = 0xBD, ///< DG CPLD Status + MSG_ID_HD_DG_ALARMS_REQUEST = 0xB5, ///< HD request for DG to re-send trigger messages for each active alarm + MSG_ID_HD_DG_SERVICE_MODE_REQUEST = 0xB6, ///< HD request for DG to to go to service mode + MSG_ID_DG_RTC_EPOCH_DATA = 0xB7, ///< DG RTC epoch broadcast message + MSG_ID_HD_DG_USAGE_INFO_REQUEST = 0xB8, ///< HD request DG usage info + MSG_ID_HD_DG_SERVICE_RECORD_REQUEST = 0xB9, ///< HD request DG service record + MSG_ID_HD_UI_CONFIRMATION_REQUEST = 0xBA, ///< HD request UI confirmation + MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xBB, ///< UI confirmation result response + MSG_ID_CPLD_STATUS_REQUEST = 0xBC, ///< Dialin request for CPLD Status + MSG_ID_DG_CPLD_STATUS_DATA = 0xBD, ///< DG CPLD Status MSG_ID_HD_BATTERY_MANAGEMENT_DATA = 0xBE, ///< HD battery management logging data MSG_ID_HD_BATTERY_STATUS_DATA = 0xBF, ///< HD battery status logging data MSG_ID_DG_CHEM_DISINFECT_FLUSH_DATA = 0xC0, ///< DG chemical disinfect flush logging data