Index: MsgDefs.h =================================================================== diff -u -rc654f330ebe8d3c4cc0d868665eb42c6000d39e2 -r017f2f5ab99517d90685d8e46659428dcb822fc3 --- MsgDefs.h (.../MsgDefs.h) (revision c654f330ebe8d3c4cc0d868665eb42c6000d39e2) +++ MsgDefs.h (.../MsgDefs.h) (revision 017f2f5ab99517d90685d8e46659428dcb822fc3) @@ -195,7 +195,7 @@ 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_DG_DIALYSATE_FLOW_METER_DATA = 0xA6, ///< DG dialysate flow meter data (liter/minute) + MSG_ID_DG_DIALYSATE_FLOW_METER_DATA = 0xA6, // TODO remove when DEN-13460 merged ///< 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_MIXING_RATIOS = 0xA9, ///< HD request DG concentrate ratios @@ -208,6 +208,7 @@ MSG_ID_UI_REQUEST_SERVICE_MODE = 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 #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing