Index: firmware/App/DDCommon.h
===================================================================
diff -u -rd741f651b63edc7695b2be2178c9e5c44aaed1f3 -r734bf9d37fee349983baba56e3590600b4606241
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision d741f651b63edc7695b2be2178c9e5c44aaed1f3)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 734bf9d37fee349983baba56e3590600b4606241)
@@ -22,17 +22,45 @@
 
 // ********** version **********
 
-#define DD_VERSION_MAJOR        0
-#define DD_VERSION_MINOR        0
-#define DD_VERSION_MICRO        0
-#define DD_VERSION_BUILD        0
+#define DD_VERSION_MAJOR    0
+#define DD_VERSION_MINOR    0
+#define DD_VERSION_MICRO    0
+#define DD_VERSION_BUILD    9
 
 // ********** development build switches **********
 
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
 
+//Uncomment the below line for new dosing pump testing
+//#define __PUMPTEST__            1
+
+//Uncomment below line for future hardware version
+//#define __ALPHA_AO_VER__        1
+
+//Uncomment below for dialysate pump PI testing
+//#define __PITEST__              1
+
+//Uncomment below if diener concentrate pump used
+//#define __DIENER_CONC_PUMP__      1
+
+//Uncomment below if beta hardware is used
+//#define __BETA_HW_VER__           1
+
+//Uncomment below if barometric pressure sensor reading available
+//#define __BARO_PRES_SENSOR__      1
+
+//Uncomment below if required hardware available ( baro and cond sensor) for testing
+//#define ENABLE_ALARM_1
+
+//Uncomment below once characterization/study completed
+//#define ENABLE_ALARM_2
+
+//Uncomment below to disable heaters debug message
+#define __HEATERS_DEBUG__         1
+
+
     #include <stdio.h>
     #include <strings.h>
 #endif
@@ -49,32 +77,32 @@
 
 #pragma pack(push,1)
 
-/// Payload record structure for an HD versions message.
+/// Payload record structure for an TD versions message.
 typedef struct
 {
-    U08 major;                              ///< HD version major revision.
-    U08 minor;                              ///< HD version minor revision.
-    U08 micro;                              ///< HD version micro revision.
-    U16 build;                              ///< HD build version.
-    U08 fpgaId;                             ///< HD FPGA ID.
-    U08 fpgaMajor;                          ///< HD FPGA major revision.
-    U08 fpgaMinor;                          ///< HD FPGA minor revision.
-    U08 fpgaLab;                            ///< HD FPGA lab revision.
-    U32 compatibilityRev;                   ///< HD compatibility revision.
-} HD_VERSIONS_T;
+    U08 major;                              ///< TD version major revision.
+    U08 minor;                              ///< TD version minor revision.
+    U08 micro;                              ///< TD version micro revision.
+    U16 build;                              ///< TD build version.
+    U08 fpgaId;                             ///< TD FPGA ID.
+    U08 fpgaMajor;                          ///< TD FPGA major revision.
+    U08 fpgaMinor;                          ///< TD FPGA minor revision.
+    U08 fpgaLab;                            ///< TD FPGA lab revision.
+    U32 compatibilityRev;                   ///< TD compatibility revision.
+} TD_VERSIONS_T;
 
 /// DD version struct.
 typedef struct
 {
-    U08 major;                              ///< DG version major revision.
-    U08 minor;                              ///< DG version major revision.
-    U08 micro;                              ///< DG version micro revision.
-    U16 build;                              ///< DG build version.
-    U08 fpgaId;                             ///< DG FPGA ID.
-    U08 fpgaMajor;                          ///< DG FPGA major revision.
-    U08 fpgaMinor;                          ///< DG FPGA minor revision.
-    U08 fpgaLab;                            ///< DG FPGA lab revision.
-    U32 compatibilityRev;                   ///< DG compatibility revision.
+    U08 major;                              ///< DD version major revision.
+    U08 minor;                              ///< DD version major revision.
+    U08 micro;                              ///< DD version micro revision.
+    U16 build;                              ///< DD build version.
+    U08 fpgaId;                             ///< DD FPGA ID.
+    U08 fpgaMajor;                          ///< DD FPGA major revision.
+    U08 fpgaMinor;                          ///< DD FPGA minor revision.
+    U08 fpgaLab;                            ///< DD FPGA lab revision.
+    U32 compatibilityRev;                   ///< DD compatibility revision.
 } DD_VERSIONS_T;
 
 /// Record defining the fields in a UI version request message.