Index: firmware/App/DGCommon.h
===================================================================
diff -u -r9cfc69328f6b54a6b8e3737dfa24db607105cdd9 -rc0e9f4abf5810ca49dcf3498e298905a6e0997b6
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 9cfc69328f6b54a6b8e3737dfa24db607105cdd9)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision c0e9f4abf5810ca49dcf3498e298905a6e0997b6)
@@ -23,7 +23,7 @@
 // ********** version **********
 
 #define DG_VERSION_MAJOR        0
-#define DG_VERSION_MINOR        5
+#define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
 #define DG_VERSION_BUILD        15
 
@@ -33,26 +33,25 @@
 #ifndef _VECTORCAST_
 // TODO: Removed debug build flags when release build is ready
 //    #define BOARD_WITH_NO_HARDWARE          1
-    #define DONT_SKIP_NV_POST               1
 //    #define SIMULATE_UI                     1
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes drain pump enable pin for task timing
 //    #define DISABLE_HEATERS_AND_TEMPS       1
 //    #define DISABLE_ACCELS                  1
 //    #define SKIP_POST                       1
-    #define DISABLE_CAL_CHECK               1
+    #define SKIP_CAL_CHECK               1
 //    #define ENABLE_DIP_SWITCHES             1
 //    #define EMC_TEST_BUILD                  1
     #define ALARMS_DEBUG                    1
 //    #define HEATERS_DEBUG                   1
 //    #define PRESSURES_DEBUG                 1
     #define DISABLE_DIALYSATE_CHECK         1
-//    #define IGNORE_DRAIN_PUMP_MONITOR       1
+    #define IGNORE_DRAIN_PUMP_MONITOR       1
 //    #define IGNORE_HEATERS_MONITOR          1
     #define IGNORE_RO_PUMP_MONITOR          1
-//    #define DISABLE_RO_RATIO_CHECK          1
+    #define DISABLE_RO_RATIO_CHECK          1
     #define DISABLE_COND_SENSOR_CHECK       1
     #define DISABLE_MIXING                  1
-    #define DISABLE_WATER_QUALITY_CHECK     1
+//    #define DISABLE_WATER_QUALITY_CHECK     1
     #define DISABLE_RTC_CONFIG              1
     //#define V_2_SYSTEM                      1
     #define THD_USING_TRO_CONNECTOR         1
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r325ad799da3a89391779d28c8b9a7e957ac9ef84 -rc0e9f4abf5810ca49dcf3498e298905a6e0997b6
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 325ad799da3a89391779d28c8b9a7e957ac9ef84)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision c0e9f4abf5810ca49dcf3498e298905a6e0997b6)
@@ -114,7 +114,7 @@
     }
 
     // check to see if watchdog has expired
-    if ( getCPLDWatchdogExpired() == PIN_SIGNAL_LOW )
+    if ( PIN_SIGNAL_LOW == getCPLDWatchdogExpired() )
     {
         // ignore expired watchdog until after watchdog POST
         if ( ( WATCHDOG_SELF_TEST_STATE_COMPLETE == watchdogSelfTestState ) ||
@@ -168,7 +168,7 @@
             {
                 // waiting here for w.d. test period to prevent this task from checking in - watchdog should expire
             }
-            if ( getCPLDWatchdogExpired() == PIN_SIGNAL_LOW )
+            if ( PIN_SIGNAL_LOW == getCPLDWatchdogExpired() )
             {
                 F32 v24 = getIntADCVoltageConverted( INT_ADC_PRIMARY_HEATER_24_VOLTS );
 
@@ -295,7 +295,7 @@
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_TASK, task );
     }
 
     return result;