Index: firmware/App/HDCommon.h
===================================================================
diff -u -rc84daa1f07003427fc5cdde8f5651434478f7313 -r07718e7c87cd6f4fb135379a6bd60eb785294c49
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision c84daa1f07003427fc5cdde8f5651434478f7313)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 07718e7c87cd6f4fb135379a6bd60eb785294c49)
@@ -31,7 +31,7 @@
 
 #ifndef _RELEASE_
 #define UF_TEST_ENABLED                     1           // ultrafiltration test build (hard codes treatment params, re-purposes off/stop buttons)
-//#define UF_TEST_WITH_DG                     1           // ultrafiltration test build (sets up DG in standby mode)
+#define UF_TEST_WITH_DG                     1           // ultrafiltration test build (sets up DG in standby mode)
 #ifndef _VECTORCAST_
 //    #define RM46_EVAL_BOARD_TARGET          1           // limited build runs on RM46 eval board
 //    #define BREADBOARD_TARGET               1           // old breadboard system build - no longer used?
@@ -51,7 +51,7 @@
 //    #define RAW_FLOW_SENSOR_DATA            1           // test build will not filter flow sensor data
 //    #define READ_FPGA_ASYNC_DATA            1           // test build reads non-priority register page every other time
 //    #define FLOW_DEBUG                      1           // test build sends flow, signal strength, and occlusion readings to debug UART
-    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
+//    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
     #define ALARMS_DEBUG                    1           // triggered alarms sent to debug UART
 
     #include <stdio.h>
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rcd2ba56ddf9443fc624c21764e6478766b7fd6ed -r07718e7c87cd6f4fb135379a6bd60eb785294c49
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision cd2ba56ddf9443fc624c21764e6478766b7fd6ed)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 07718e7c87cd6f4fb135379a6bd60eb785294c49)
@@ -178,6 +178,10 @@
     SW_FAULT_ID_FPGA_UART_FRAME_ERROR,                                  // 65
     SW_FAULT_ID_FPGA_UART_OVERRUN_ERROR,
     SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR,
+    SW_FAULT_ID_ACCEL_INVALID_STATE,
+    SW_FAULT_ID_ACCEL_GET_INVALID_AXIS,
+    SW_FAULT_ID_ACCEL_GET_MAX_INVALID_AXIS,                             // 70
+    SW_FAULT_ID_ACCEL_INVALID_SELF_TEST_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -rcd2ba56ddf9443fc624c21764e6478766b7fd6ed -r07718e7c87cd6f4fb135379a6bd60eb785294c49
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision cd2ba56ddf9443fc624c21764e6478766b7fd6ed)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 07718e7c87cd6f4fb135379a6bd60eb785294c49)
@@ -76,7 +76,7 @@
 {
     if ( buffer < NUM_OF_COMM_BUFFERS )
     {
-        S32 d,i;
+        S32 d;
 
         // thread protection for queue operations
         _disable_IRQ();