Index: MsgDefs.h
===================================================================
diff -u -rd837a0536b52ba77ccd9dbb3471232a9fc50d02b -r8b3423d02f58a44bca8aa90dfa0ad42019727416
--- MsgDefs.h	(.../MsgDefs.h)	(revision d837a0536b52ba77ccd9dbb3471232a9fc50d02b)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 8b3423d02f58a44bca8aa90dfa0ad42019727416)
@@ -101,8 +101,8 @@
     MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x46,                    ///< UI request to change pressure limits
     MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47,                   ///< HD response to change pressure limits request
     MSG_ID_DG_FANS_DATA = 0x48,                                         ///< DG broadcast fans data
-    MSG_ID_HD_CALIBRATION_DATA = 0x49,                                  ///< HD broadcast calibration data
-    MSG_ID_DG_CALIBRATION_DATA = 0x4A,                                  ///< DG broadcast calibration data
+    MSG_ID___AVAILABLE_4 = 0x49,                                        ///< This msg ID is available for use
+    MSG_ID___AVAILABLE_5 = 0x4A,                                        ///< This msg ID is available for use
     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
@@ -169,9 +169,9 @@
     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___AVAILABLE_6 = 0x802A,                                      ///< This msg ID is available for use
+    MSG_ID___AVAILABLE_7 = 0x802B,                                      ///< This msg ID is available for use
+    MSG_ID___AVAILABLE_8 = 0x802C,                                      ///< This msg ID is available for use
     MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER = 0x802D,               ///< Set a treatment parameter (will change actual setting, not an override)
     MSG_ID_HD_VALVES_HOME = 0x802E,                                     ///< Home an HD Valve
     MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0x802F,                        ///< Set an HD valve to a position in counts
@@ -186,8 +186,8 @@
     MSG_ID_DIAL_IN_PUMP_HOME_CMD = 0x8038,                              ///< Dialysate inlet pump home command
     MSG_ID_DIAL_OUT_PUMP_HOME_CMD = 0x8039,                             ///< Dialysate outlet pump home command
     MSG_ID_SUPER_CLEAR_ALARMS_CMD = 0x803A,                             ///< Clears all alarms (even if non-recoverable or fault)
-    MSG_ID_HD_REQUEST_CALIBRATION_DATA = 0x803B,                        ///< Requests calibration data from HD                  TODO REMOVE
-    MSG_ID_HD_ERASE_CALIBRATION_DATA = 0x803C,                          ///< Requests calibration data on HD be erased          TODO REMOVE
+    MSG_ID___AVAILABLE_9 = 0x803B,                                      ///< This msg ID is available for use
+    MSG_ID___AVAILABLE_10 = 0x803C,                                     ///< This msg ID is available for use
     MSG_ID_HD_SET_CALIBRATION_RECORD = 0x803D,                          ///< HD set calibration record that is received from Dialin
     MSG_ID_HD_GET_CALIBRATION_RECORD = 0x803E,                          ///< HD get calibration record that is requested from Dialin
     MSG_ID_HD_SEND_CALIBRATION_RECORD = 0x803F,                         ///< HD send calibration record to CAN bus to be received in Dialin (equivalent to publish)