Index: MsgDefs.h =================================================================== diff -u -r96dd8f5b3344094e56450a338158c5bb139d5406 -r03e09b921c4876dcd6548179400efdf411ceef63 --- MsgDefs.h (.../MsgDefs.h) (revision 96dd8f5b3344094e56450a338158c5bb139d5406) +++ MsgDefs.h (.../MsgDefs.h) (revision 03e09b921c4876dcd6548179400efdf411ceef63) @@ -123,14 +123,12 @@ MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA = 0x5B, ///< TD treatment paused timer data. MSG_ID_DD_UF_DATA = 0x5C, ///< DD ultrafiltration data MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D, ///< FP Permeate tank broadcast data - MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x5E, ///< FP Inlet Pressure Check broadcast data + MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x5E, ///< DD spent chamber fill broadcast data MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F, ///< UI solution infusion request MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60, ///< TD solution infusion response MSG_ID_DD_BLOOD_LEAK_DATA = 0x61, ///< DD blood leak data + MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x62, ///< FP Inlet Pressure Check broadcast data -#ifdef __PUMPTEST__ - MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0, ///< DD piston pump data -#endif // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE, ///< TD tester log-in @@ -191,6 +189,9 @@ MSG_ID_TD_BLOOD_FLOW_ALPHA_Y_INTERCEPT_OVERRIDE_REQUEST = 0x8037, ///< TD override request for blood flow alpha Y intercept MSG_ID_TD_BLOOD_FLOW_WEAR_A_TERM_OVERRIDE_REQUEST = 0x8038, ///< TD override request for blood flow wear A term MSG_ID_TD_BLOOD_FLOW_WEAR_B_TERM_OVERRIDE_REQUEST = 0x8039, ///< TD override request for blood flow wear B term + MSG_ID_TD_SET_TEST_CONFIGURATION = 0x803A, ///< TD set test configuration + MSG_ID_TD_GET_TEST_CONFIGURATION = 0x803B, ///< TD get test configuration + MSG_ID_TD_RESET_ALL_TEST_CONFIGURATIONS = 0x803C, ///< TD reset all the configurations MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in @@ -257,9 +258,13 @@ MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03D, ///< DD Pre generate dialysate mode data publish interval override request MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E, ///< DD Post generate dialysate mode data publish interval override request MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0xA03F, ///< DD send blood embedded mode response - MSG_ID_DD_AVAILABLE_TO_USE_2 = 0xA040, ///< DD stop pre-gen dialysate mode override request + MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA040, ///< DD stop pre-gen dialysate mode override request MSG_ID_DD_AVAILABLE_TO_USE_4 = 0xA041, ///< DD stop gen dialysate mode override request MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042, ///< DD set/reset safety shutdown override request + MSG_ID_DD_SET_TEST_CONFIGURATION = 0xA043, ///< DD set test configuration + MSG_ID_DD_GET_TEST_CONFIGURATION = 0xA044, ///< DD get test configuration + MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS = 0xA045, ///< DD reset all the configurations + MSG_ID_AVAILABLE_1 = 0xA046, ///< Msg ID not used - available for use. MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA047, ///< DD blood leak data publish interval override request MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST = 0xA048, ///< DD blood leak status override request MSG_ID_DD_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST = 0xA049, ///< DD blood leak set to embedded mode request @@ -268,11 +273,6 @@ MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST = 0xA04C, ///< DD blood leak intensity moving average override request MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D, ///< DD blood leak zeroing interval in milliseconds override request MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E, ///< DD blood leak zero request -#ifdef __PUMPTEST__ - MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00, ///< DD piston pump data publish interval override request - MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01, ///< DD piston pump start/stop override request - MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02, ///< DD piston pump fill after dispense control -#endif MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000, ///< First FP test message ID MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE, ///< FP tester log-in @@ -320,8 +320,11 @@ MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02A, ///< FP Permeate Tank data publish interval override request MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST = 0xB02B, ///< FP Alarm State override request MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST = 0xB02C, ///< FP alarm clear request - MSG_ID_FP_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02D, ///< FP inlet pressure check data publish interval override request - MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST = 0xB02E, ///< FP inlet pressure check time override request + MSG_ID_FP_SET_TEST_CONFIGURATION = 0xB02D, ///< FP set test configuration + MSG_ID_FP_GET_TEST_CONFIGURATION = 0xB02E, ///< FP get test configuration + MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS = 0xB02F, ///< FP reset all the configurations + MSG_ID_FP_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB030, ///< FP inlet pressure check data publish interval override request + MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST = 0xB031, ///< FP inlet pressure check time override request MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log MSG_ID_DD_DEBUG_EVENT = 0xFFF2, ///< DD debug event text to be logged in event log