Index: firmware/App/HDCommon.h
===================================================================
diff -u -r21a4c22f54144a6f581d19f6cec4fdb637efdfec -rf7cdfd3256f195cd8aa06e28009cd5f26b50f08c
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 21a4c22f54144a6f581d19f6cec4fdb637efdfec)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision f7cdfd3256f195cd8aa06e28009cd5f26b50f08c)
@@ -7,8 +7,8 @@
 *
 * @file    HDCommon.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      14-Oct-2021
+* @author  (last)      Sean Nash
+* @date    (last)      12-Nov-2021
 *
 * @author  (original) Sean
 * @date    (original) 27-Feb-2020
@@ -27,7 +27,6 @@
 #define HD_VERSION_MICRO        0
 #define HD_VERSION_BUILD        110
 
-
 // ********** development build switches **********
 
 // TODO - remove build switches before release
@@ -47,7 +46,6 @@
 //    #define DISABLE_ACCELS                  1           // Disable accelerometer POST and monitoring
 //    #define DISABLE_CRC_ERROR               1           // Do not error on bad CRC for CAN messages
     #define DISABLE_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message
-//    #define USE_FMD_FLOW_SENSOR             1           // Use FMD flow sensor (on HD) instead of FMD on DG
 //    #define RUN_BP_OPEN_LOOP                1           // Run blood pump in open loop mode
 //    #define RUN_DPI_OPEN_LOOP               1           // Run dialysate inlet pump in open loop mode
     #define WORN_OUT_CARTRIDGE              1           // Running with an old worn out cartridge (max wear)
@@ -79,7 +77,8 @@
     #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps
     #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
     #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
-    #define DISABLE_UI_COMM_TO_ALARM        1           // Disable UI comm timeouts
+//    #define DISABLE_UI_COMM_TO_ALARM        1           // Disable UI comm timeouts
+    #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
 
     // Skip Pre-Treatment and get to treatment as soon as possible
     #define SKIP_UI_INTERACTION             1           // Skip UI interaction.