Index: MsgDefs.h =================================================================== diff -u -r22e069cd4dbf1b8de8598fda2c09f2e91fcc609d -rf2d51d7c5e732ad8f9bb36974defccb27679068a --- MsgDefs.h (.../MsgDefs.h) (revision 22e069cd4dbf1b8de8598fda2c09f2e91fcc609d) +++ MsgDefs.h (.../MsgDefs.h) (revision f2d51d7c5e732ad8f9bb36974defccb27679068a) @@ -8,7 +8,7 @@ * @file MsgDefs.h * * @author (last) Sean Nash -* @date (last) 23-Jul-2020 +* @date (last) 05-Aug-2020 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -74,14 +74,23 @@ MSG_ID_SALINE_BOLUS_DATA = 0x30, ///< HD broadcast of saline bolus data 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_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_HD_NEW_TREATMENT_PARAMS_RESPONSE = 0x36, ///< HD response to new treatment parameters set + MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37, ///< DG heat disinfection publish data + MSG_ID_UI_START_TREATMENT = 0x38, ///< UI user request to initiate a treatment + MSG_ID_HD_START_TREATMENT_RESPONSE = 0x39, ///< HD response to user request to initiate a treatment + MSG_ID_HD_VALVES_DATA = 0x3A, ///< HD broadcast of valves #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing #endif // service/test CAN messages MSG_ID_FIRST_TESTER_MESSAGE = 0x8000, ///< First HD test message ID MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE, ///< HD tester log-in - MSG_ID_HD_MESSAGE = 0x8001, ///< HD message. TODO - needed? + MSG_ID_HD_MESSAGE = 0x8001, ///< Obsolete - TODO - remove when all references to this ID are deleted + MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0x8001, ///< Dialysate outlet flow set point override request MSG_ID_OFF_BUTTON_STATE_OVERRIDE = 0x8002, ///< Off button override request MSG_ID_STOP_BUTTON_STATE_OVERRIDE = 0x8003, ///< Stop button override request MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE = 0x8004, ///< Alarm lamp pattern override request @@ -118,7 +127,13 @@ MSG_ID_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE = 0x8023, ///< Dialysate outlet pump measured motor speed override request MSG_ID_DIAL_OUT_PUMP_MEAS_ROTOR_SPEED_OVERRIDE = 0x8024, ///< Dialysate outlet pump measured rotor speed override request MSG_ID_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE = 0x8025, ///< Load cell measured weight override request - MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE = 0x8026, ///< HD safety shutdown override request + MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE = 0x8026, ///< HD safety shutdown override request + MSG_ID_HD_ACCEL_OVERRIDE = 0x8027, ///< HD accelerometer sensor override request + MSG_ID_HD_ACCEL_MAX_OVERRIDE = 0x8028, ///< HD accelerometer sensor max. override request + MSG_ID_HD_ACCEL_SEND_INTERVAL_OVERRIDE = 0x8029, ///< HD accelerometer data broadcast interval override request + MSG_ID_HD_ACCEL_SET_CALIBRATION = 0x802A, ///< HD accelerometer set calibration factors request + MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION = 0x802B, ///< Blood flow set calibration factors request + MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION = 0x802C, ///< Dialysate flow set calibration factors request MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000, ///< First DG test message ID MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE, ///< DG tester log-in @@ -131,7 +146,7 @@ MSG_ID_RO_PUMP_SET_PT_OVERRIDE = 0xA008, ///< RO pump set pt. override request MSG_ID_RO_MEASURED_FLOW_OVERRIDE = 0xA009, ///< RO measured flow rate override request MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00A, ///< RO pump data broadcast interval override request - MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE = 0xA00B, ///< Drain pump set pt. override request + MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE = 0xA00B, ///< Drain pump set RPM override request MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00C, ///< Drain pump data broadcast interval override request MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE = 0xA00D, ///< Load cell data broadcast interval override request MSG_ID_VALVE_STATE_OVERRIDE = 0xA00E, ///< Valve state override request @@ -143,6 +158,21 @@ MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE = 0xA014, ///< DG safety shutdown override request MSG_ID_CONDUCTIVITY_OVERRIDE = 0xA015, ///< Conductivity sensor override request MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE = 0xA016, ///< Conductivity sensors data publish override + MSG_ID_DG_ACCEL_OVERRIDE = 0xA017, ///< DG accelerometer sensor override request + MSG_ID_DG_ACCEL_MAX_OVERRIDE = 0xA018, ///< DG accelerometer sensor max. override request + MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0xA019, ///< DG accelerometer data broadcast interval override request + MSG_ID_DG_ACCEL_SET_CALIBRATION = 0xA01A, ///< DG accelerometer set calibration factors request + MSG_ID_RO_PUMP_SET_PWM = 0xA01B, ///< RO pump set PWM for open loop + MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0xA01C, ///< Drain pump set delta pressure override + MSG_ID_HEAT_DISINFECT_RECIRC_PATH_DURATION_MINS = 0xA01D, ///< Heat disinfection recirculation path duration in minutes + MSG_ID_HEAT_DISINFECT_R1_TO_R2_DURATION_MINS = 0xA01E, ///< Heat disinfection reservoir 1 to reservoir 2 duration in minutes + MSG_ID_HEAT_DISINFECT_R2_TO_R1_DURATION_MINS = 0xA01F, ///< Heat disinfection reservoir 2 to reservoir 1 duration in minutes + MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN = 0xA020, ///< Heat disinfection number of cycles to run + MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0xA021, ///< Heat disinfection data publish interval override request + MSG_ID_HD_VALVES_SEND_INTERVAL_OVERRIDE = 0xA022, ///< HD valves data publish interval override request + MSG_ID_HD_VALVES_HOME = 0xA023, ///< Home an HD Valve + MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0xA024, ///< Set an HD valve to a position in counts + MSG_ID_HD_VALVES_SET_BLOOD_TRAP_VALVE = 0xA025, ///< Set the HD blood trap valve status MSG_ID_HD_DEBUG_EVENT = 0xFFF1, ///< HD debug event text to be logged in event log MSG_ID_DG_DEBUG_EVENT = 0xFFF2, ///< DG debug event text to be logged in event log