Index: firmware/App/HDCommon.h
===================================================================
diff -u -r8fdca8ef380555c6c93e30b517258988333ffd89 -rc6f3b01d1b0a5e3fdf480a7ee205ca349e10d6d2
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 8fdca8ef380555c6c93e30b517258988333ffd89)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision c6f3b01d1b0a5e3fdf480a7ee205ca349e10d6d2)
@@ -30,15 +30,15 @@
 // ********** build switches **********
 
 #ifndef _RELEASE_
-#define UF_TEST_ENABLED                     1           // ultrafiltration test build (hard codes treatment params, re-purposes off/stop buttons)
+//#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)
 #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?
 //    #define SIMULATE_UI                     1           // build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes alarm lamp pins for task timing
-//    #define SKIP_POST                       1           // skip POST tests - all pass
-    #define LIMITED_NVDATA_CRC_CHECKS       1           // only perform POST CRC checks on nv-data records that are implemented so far
+    #define SKIP_POST                       1           // skip POST tests - all pass
+//    #define LIMITED_NVDATA_CRC_CHECKS       1           // only perform POST CRC checks on nv-data records that are implemented so far
 //    #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
@@ -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>