Index: AlarmDefs.h
===================================================================
diff -u -r50865aeea99de192211d9f5e91ff4bbcadcba7b1 -r1fe68a51b58a177dce67d19c4b4924ae2aee6081
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 50865aeea99de192211d9f5e91ff4bbcadcba7b1)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 1fe68a51b58a177dce67d19c4b4924ae2aee6081)
@@ -64,6 +64,7 @@
     ALARM_ID_TD_VOLTAGE_OUT_OF_RANGE = 33,                                  ///< TD voltage out of range fault
     ALARM_ID_TD_AC_POWER_LOST = 34,                                         ///< TD AC power lost
     ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT = 35,                            ///< TD AC power lost during treatment
+    ALARM_ID_TD_VENOUS_BUBBLE_DETECTED = 36,                                ///< TD venous bubble detected
     NUM_OF_ALARM_IDS                                                        ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                         ///< Type for alarm list enumeration
@@ -233,6 +234,7 @@
     { ALARM_PRIORITY_HIGH,    10,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_VENOUS_SENSOR_TIMEOUT_FAULT                      },
     { ALARM_PRIORITY_LOW ,   852,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_AC_POWER_LOST                                    },
     { ALARM_PRIORITY_HIGH,   100,  FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT                       },
+    { ALARM_PRIORITY_HIGH,    12,  FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , ALARM_ID_TD_VENOUS_BUBBLE_DETECTED,                          },
 };  //   Priority            Rank  Fault DDFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  BlkRB  BlkET  NoBRcr NoDRcr ClrOnly TxLog  ID
 
 /// Table of alarms and their rank.
@@ -254,6 +256,7 @@
     {  10, ALARM_ID_TD_ARTERIAL_SENSOR_TIMEOUT_FAULT },
     {  10, ALARM_ID_TD_VENOUS_SENSOR_TIMEOUT_FAULT },
     {  10, ALARM_ID_TD_VOLTAGE_OUT_OF_RANGE },
+    {  12, ALARM_ID_TD_VENOUS_BUBBLE_DETECTED },
     { 100, ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT },
     { 110, ALARM_ID_DD_CRITICAL_DATA_ERROR },
     { 110, ALARM_ID_DD_WATCHDOG_EXPIRED },
@@ -333,6 +336,7 @@
  { 33  , ALARM_ID_TD_VOLTAGE_OUT_OF_RANGE                              , "TD    | Service Required: Hemodialysis Device   | A problem was detected with the hemodialysis device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair.                                                                                                                                                                                         | HD Fault: Voltage Monitor                | HD monitored voltage is out of range                                                                                                      | If the HD monitored voltages are out of range for a certain period of time.                                                                                                                                                                                                      | "},
  { 34  , ALARM_ID_TD_AC_POWER_LOST                                     , "TD    | Power Loss                              | AC Power has been lost.\n- Check all electrical connections.\n- Press Resume/OK to return to welcome screen.                                                                                                                                                                                                                                                                                                          | Loss of AC Power                         | HD AC power lost alarm                                                                                                                    | The HD Software shall trigger an alarm if an AC power loss is detected while the HD system is in standby, service, or treatment parameters mode.                                                                                                                                 | "},
  { 35  , ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT                        , "TD    | Power Loss                              | Treatment must be terminated due to a power loss.\n- Follow clinic instructions on when to initiate manual rinseback.\n- Check all electrical connections.\n- If power returns within 5 minutes of outage, \n- rinseback will be allowed.                                                                                                                                                                             | Blood Stop: Loss of AC Power             | HD AC power lost alarm                                                                                                                    | The HD Software shall trigger an alarm if an AC power loss is detected while the HD system is in pre-treatment, treatment, or post-treatment mode.                                                                                                                               | "},
+ { 36  , ALARM_ID_TD_VENOUS_BUBBLE_DETECTED                            , "TD    | Venous Air Detected                     | Air detected in the venous air trap.\n- Confirm arterial access placement and confirm\nconnections are secure.\n- Treatment must be terminated without rinseback.                                                                                                                                                                                                                                                     | Blood Stop: Venous Air Bubble            | HD venous air bubble detected alarm                                                                                                       | If bubbles are detected during the treatment.                                                                                                                                                                                                                                    | "},
 };
 
 #endif  // manual alarms
Index: MsgDefs.h
===================================================================
diff -u -r449ca26227996e4b8525cf7d7ed15d9edaff1f83 -r1fe68a51b58a177dce67d19c4b4924ae2aee6081
--- MsgDefs.h	(.../MsgDefs.h)	(revision 449ca26227996e4b8525cf7d7ed15d9edaff1f83)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 1fe68a51b58a177dce67d19c4b4924ae2aee6081)
@@ -66,10 +66,11 @@
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE,       ///< TD tester log-in
     MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001,                          ///< TD reset request
     MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002,                         ///< TD send test configuration to Dialin
-    MSG_ID_TD_VENOUS_BUBBLE_OVERRIDE_REQUEST = 0x8003,                  ///< TD override request for the venous bubble detector
+    MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST = 0x8003,                         ///< TD override request for a given bubble detector
     MSG_ID_TD_VOLTAGE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8004,       ///< TD override request for the TD voltage data broadcast interval
     MSG_ID_TD_VOLTAGE_OVERRIDE_REQUEST = 0x8005,                        ///< TD override request for a given TD voltage
     MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8006,        ///< TD override request for the TD bubble data broadcast interval
+    MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST = 0x8007,                       ///< TD override request for a given TD pressure
 
     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