Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r9b262ba08e3180f121c3cf19d8d25e565183f87d -r108abddcbf729f7435073116191cd3903261df8f
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 108abddcbf729f7435073116191cd3903261df8f)
@@ -23,72 +23,6 @@
 
 // ********** public definitions **********
 
-typedef enum Msg_IDs
-{   // normal CAN messages
-    MSG_ID_UNUSED = 0,
-    MSG_ID_OFF_BUTTON_PRESS,                    // 1
-    MSG_ID_ALARM_STATUS,                        // 2
-    MSG_ID_ALARM_TRIGGERED,                     // 3
-    MSG_ID_ALARM_CLEARED,                       // 4
-    MSG_ID_BLOOD_FLOW_DATA,                     // 5
-    MSG_ID_DG_CHECK_IN,                         // 6
-    MSG_ID_UI_CHECK_IN,                         // 7
-    MSG_ID_DIALYSATE_FLOW_DATA,                 // 8
-    MSG_ID_PRESSURE_OCCLUSION_DATA,             // 9
-    MSG_ID_RTC_EPOCH,                           // 10
-    MSG_ID_DIALYSATE_OUT_FLOW_DATA,             // 11
-    MSG_ID_LOAD_CELL_READINGS,                  // 12
-    MSG_ID_TREATMENT_TIME,                      // 13
-    MSG_ID_POWER_OFF_WARNING,                   // 14
-#ifdef CAN_TEST
-    MSG_ID_HD_CAN_TEST_1_LARGE_FREQ,
-    MSG_ID_DG_CAN_TEST_1_LARGE_FREQ,
-#endif
-
-    // service/test CAN messages
-
-    MSG_ID_FIRST_TESTER_MESSAGE = 0x8000,                       // 0x8000
-    MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE,
-    MSG_ID_HD_MESSAGE,                                          // 0x8001
-    MSG_ID_OFF_BUTTON_STATE_OVERRIDE,                           // 0x8002
-    MSG_ID_STOP_BUTTON_STATE_OVERRIDE,                          // 0x8003
-    MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE,                         // 0x8004
-    MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE,                      // 0x8005
-    MSG_ID_ALARM_STATE_OVERRIDE,                                // 0x8006
-    MSG_ID_ALARM_TIME_OVERRIDE,                                 // 0x8007
-    MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE,                          // 0x8008
-    MSG_ID_BLOOD_FLOW_MEAS_OVERRIDE,                            // 0x8009
-    MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE,                   // 0x800A
-    MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE,                    // 0x800B
-    MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE,                   // 0x800C
-    MSG_ID_ALARM_STATUS_SEND_INTERVAL_OVERRIDE,                 // 0x800D
-    MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE,                      // 0x800E
-    MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE,                // 0x800F
-    MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE,                        // 0x8010
-    MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE,                          // 0x8011
-    MSG_ID_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE,                 // 0x8012
-    MSG_ID_DIAL_IN_PUMP_MC_MEAS_CURR_OVERRIDE,                  // 0x8013
-    MSG_ID_DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE,                 // 0x8014
-    MSG_ID_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE,                    // 0x8015
-    MSG_ID_DIAL_IN_PUMP_MEAS_ROTOR_SPEED_OVERRIDE,              // 0x8016
-    MSG_ID_PRESSURE_ARTERIAL_OVERRIDE,                          // 0x8017
-    MSG_ID_PRESSURE_VENOUS_OVERRIDE,                            // 0x8018
-    MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE,                       // 0x8019
-    MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE,                     // 0x801A
-    MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE,                    // 0x801B
-    MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE,                    // 0x801C
-    MSG_ID_SET_RTC_DATE_TIME,                                   // 0x801D
-    MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE,                // 0x801E
-    MSG_ID_DIAL_OUT_UF_REF_VOLUME_OVERRIDE,                     // 0x801F
-    MSG_ID_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE,                    // 0x8020
-    MSG_ID_DIAL_OUT_PUMP_MC_MEAS_SPEED_OVERRIDE,                // 0x8021
-    MSG_ID_DIAL_OUT_PUMP_MC_MEAS_CURR_OVERRIDE,                 // 0x8022
-    MSG_ID_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE,                   // 0x8023
-    MSG_ID_DIAL_OUT_PUMP_MEAS_ROTOR_SPEED_OVERRIDE,             // 0x8024
-    MSG_ID_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE,                  // 0x8025
-    END_OF_MSG_IDS
-} MSG_ID_T;
-
 // ********** public function prototypes **********
 
 // ACK MSG
@@ -106,6 +40,9 @@
 // MSG_ID_LOAD_CELL_READINGS
 void handleLoadCellReadingsFromDG( MESSAGE_T *message );
 
+// MSG_ID_USER_UF_PAUSE_RESUME_REQUEST
+void handleUFPauseResumeRequest( MESSAGE_T *message );
+
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
 // MSG_ID_ALARM_TRIGGERED