Index: Common.h
===================================================================
diff -u -r3567e5e388ac30a70ccf639b5257bf824d8ee135 -r2085b78963ddd7ea13b38eeb8e8b0370c6ccdb80
--- Common.h	(.../Common.h)	(revision 3567e5e388ac30a70ccf639b5257bf824d8ee135)
+++ Common.h	(.../Common.h)	(revision 2085b78963ddd7ea13b38eeb8e8b0370c6ccdb80)
@@ -296,9 +296,18 @@
     sendEvent( e, dat1, dat2 ); \
 }
 
-// **** Common Broadcast Data ****
+// **** Common Data ****
 
-#pragma pack(push,1)
+#ifndef _RELEASE_
+/// Hardware configuration
+typedef enum Hardware_Configurations
+{
+    HW_CONFIG_BETA = 1,                         ///< Hardware configuration beta
+    HW_CONFIG_DVT,                              ///< Hardware configuration DVT
+    NUM_OF_HW_CONFIGS,                          ///< Number of hardware configurations
+} HARDWARE_CONFIG_T;
+#endif
+
 /// Heaters data structure.
 typedef struct
 {
@@ -312,6 +321,7 @@
     F32 primaryEfficiency;                      ///< Primary heater efficiency
     F32 primaryCalcTargetTemp;                  ///< Primary heater calculated target temperature
     F32 trimmerCalcCurrentTemp;                 ///< Trimmer heater calculated current temperature
+    U32 trimmerUseLastDC;                       ///< Trimmer heater use last duty cycle
 } HEATERS_DATA_T;
 
 /// Temperature sensors data structure.
@@ -356,8 +366,14 @@
     F32 ROFlowRateWithCPsLPM;                   ///< RO flow rate with concentrate pumps in L/min.
     F32 dialysateFlowRateLPM;                   ///< Dialysate flow rate L/min.
 } FLOW_SENSORS_DATA_T;
-#pragma pack(pop)
 
+/// DG switch reservoirs command structure
+typedef struct
+{
+    U32 reservoirID;                            ///< DG reservoir ID.
+    BOOL useLastTrimmerHeaterDC;                ///< Use last trimmer heater duty cycle flag.
+} DG_SWITCH_RSRVRS_CMD_T;
+
 // **** VectorCAST Definitions ****
 
 #ifdef _VECTORCAST_