Index: firmware/App/DGCommon.h
===================================================================
diff -u -r95779d454fefe68eeaab37ae581e643de83d9519 -r39fb416e7619db22c26019b09a63b6d6a10d6b02
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 95779d454fefe68eeaab37ae581e643de83d9519)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 39fb416e7619db22c26019b09a63b6d6a10d6b02)
@@ -33,7 +33,7 @@
 #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 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
Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rc0700a4503f28288f16070634bb87f4eccb2568c -r39fb416e7619db22c26019b09a63b6d6a10d6b02
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision c0700a4503f28288f16070634bb87f4eccb2568c)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 39fb416e7619db22c26019b09a63b6d6a10d6b02)
@@ -1600,19 +1600,19 @@
 }
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectRinseCirculationState( void )
 {
-
+    return 0;
 }
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCancelModeBasicPathState( void )
 {
-
+    return 0;
 }
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCancelModeWaterPathState( void )
 {
-
+    return 0;
 }
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCompleteState( void )
 {
-
+    return 0;
 }
 
 /*********************************************************************//**
Index: firmware/DG.dil
===================================================================
diff -u -r4dc57180b04566f05e96ca690e8e89bfd748091b -r39fb416e7619db22c26019b09a63b6d6a10d6b02
--- firmware/DG.dil	(.../DG.dil)	(revision 4dc57180b04566f05e96ca690e8e89bfd748091b)
+++ firmware/DG.dil	(.../DG.dil)	(revision 39fb416e7619db22c26019b09a63b6d6a10d6b02)
@@ -1,4 +1,4 @@
-# RM46L852PGE 04/21/21 17:25:51
+# RM46L852PGE 06/18/21 15:30:49
 # 
 ARCH=RM46L852PGE
 # 
@@ -311,7 +311,7 @@
 DRIVER.SYSTEM.VAR.VIM_CHANNEL_8_INT_ENABLE.VALUE=0
 DRIVER.SYSTEM.VAR.SAFETY_INIT_STC_CPUSELFTEST_ENA.VALUE=0
 DRIVER.SYSTEM.VAR.ETPWM2_ENABLE.VALUE=1
-DRIVER.SYSTEM.VAR.HET1_ENABLE.VALUE=0
+DRIVER.SYSTEM.VAR.HET1_ENABLE.VALUE=1
 DRIVER.SYSTEM.VAR.CLKT_RTI1_PRE_SOURCE.VALUE=PLL1
 DRIVER.SYSTEM.VAR.FLASH_MODE_VALUE.VALUE=1
 DRIVER.SYSTEM.VAR.CORE_MPU_REGION_5_SIZE_VALUE.VALUE=0x19
@@ -923,7 +923,7 @@
 DRIVER.SYSTEM.VAR.VIM_CHANNEL_19_INT_PRAGMA_ENABLE.VALUE=0
 DRIVER.SYSTEM.VAR.SAFETY_INIT_FRAY_RAMPARITYCHECK_ENA.VALUE=0
 DRIVER.SYSTEM.VAR.SAFETY_INIT_DMA_DP_PBISTCHECK_ENA.VALUE=0x00000800
-DRIVER.SYSTEM.VAR.HET_ENABLE.VALUE=0
+DRIVER.SYSTEM.VAR.HET_ENABLE.VALUE=1
 DRIVER.SYSTEM.VAR.PBIST_ALGO_13_14.VALUE=0
 DRIVER.SYSTEM.VAR.RAM_STACK_UNDEF_BASE.VALUE=0x08004800
 DRIVER.SYSTEM.VAR.RAM_STACK_SVC_BASE.VALUE=0x08001000
@@ -6171,7 +6171,7 @@
 DRIVER.HET.VAR.HET2_PWM1_DUTY.VALUE=50
 DRIVER.HET.VAR.HET1_PWM7_POLARITY.VALUE=3
 DRIVER.HET.VAR.HET1_PWM3_ENA.VALUE=0
-DRIVER.HET.VAR.HET1_BIT24_HRSHARE.VALUE=0x00001000
+DRIVER.HET.VAR.HET1_BIT24_HRSHARE.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT16_HRSHARE.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT10_PULDIS.VALUE=0x00000000
 DRIVER.HET.VAR.HET2_PWM5_PIN_SELECT.VALUE=17
@@ -6261,7 +6261,7 @@
 DRIVER.HET.VAR.HET2_EDGE3_PIN_SELECT.VALUE=6
 DRIVER.HET.VAR.HET2_PWM2_ACTUALPERIOD.VALUE=1000.862
 DRIVER.HET.VAR.HET2_BIT18_PSL.VALUE=0x00000000
-DRIVER.HET.VAR.HET1_BIT11_DIR.VALUE=0x00000800
+DRIVER.HET.VAR.HET1_BIT11_DIR.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT10_PULL.VALUE=1
 DRIVER.HET.VAR.HET2_EDGE1_INTENA.VALUE=0x00000000
 DRIVER.HET.VAR.HET2_PWM7_PERIOD_INTENA.VALUE=0x00000000
Index: firmware/DG.hcg
===================================================================
diff -u -r4dc57180b04566f05e96ca690e8e89bfd748091b -r39fb416e7619db22c26019b09a63b6d6a10d6b02
--- firmware/DG.hcg	(.../DG.hcg)	(revision 4dc57180b04566f05e96ca690e8e89bfd748091b)
+++ firmware/DG.hcg	(.../DG.hcg)	(revision 39fb416e7619db22c26019b09a63b6d6a10d6b02)
@@ -292,7 +292,9 @@
       <HDRHTU>
         <NAME>htu.h</NAME>
       </HDRHTU>
-      <SRCHET/>
+      <SRCHET>
+        <NAME>het.c</NAME>
+      </SRCHET>
       <HET2ASMHDR>
         <NAME/>
       </HET2ASMHDR>
@@ -596,7 +598,7 @@
         <PATH>include\htu.h</PATH>
       </HDRHTU>
       <SRCHET>
-        <PATH/>
+        <PATH>source\het.c</PATH>
       </SRCHET>
     </FILENAMES>
   </HET>
Index: firmware/include/het.h
===================================================================
diff -u -rc48569a478d727afa7cd69aadb396814248c83f9 -r39fb416e7619db22c26019b09a63b6d6a10d6b02
--- firmware/include/het.h	(.../het.h)	(revision c48569a478d727afa7cd69aadb396814248c83f9)
+++ firmware/include/het.h	(.../het.h)	(revision 39fb416e7619db22c26019b09a63b6d6a10d6b02)
@@ -353,13 +353,13 @@
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
+								| (uint32)0x00000400U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
-								| (uint32)0x00000000U \
 								| (uint32)0x00000008U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000002U \
@@ -372,10 +372,10 @@
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
-                                | (uint32)0x01000000U \
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
+                                | (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
@@ -405,10 +405,10 @@
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
-                                | (uint32)0x01000000U \
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
+                                | (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
@@ -438,10 +438,10 @@
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
-                                | (uint32)0x01000000U \
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
                                 | (uint32)0x00000000U \
+                                | (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00080000U \
 								| (uint32)0x00000000U \
@@ -451,7 +451,6 @@
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
-								| (uint32)0x00000800U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
@@ -462,12 +461,12 @@
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
+								| (uint32)0x00000000U \
 								| (uint32)0x00000000U)								
 								
 #define HET1_HRSH_CONFIGVALUE    ((uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
-								| (uint32)0x00001000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
@@ -476,6 +475,7 @@
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
 								| (uint32)0x00000000U \
+								| (uint32)0x00000000U \
 								| (uint32)0x00000008U \
 								| (uint32)0x00000004U \
 								| (uint32)0x00000000U \
Index: firmware/source/het.c
===================================================================
diff -u -rc48569a478d727afa7cd69aadb396814248c83f9 -r39fb416e7619db22c26019b09a63b6d6a10d6b02
--- firmware/source/het.c	(.../het.c)	(revision c48569a478d727afa7cd69aadb396814248c83f9)
+++ firmware/source/het.c	(.../het.c)	(revision 39fb416e7619db22c26019b09a63b6d6a10d6b02)
@@ -1132,13 +1132,13 @@
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
+                 | (uint32) 0x00000400U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
-                 | (uint32) 0x00000000U
                  | (uint32) 0x00000008U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000002U
@@ -1152,7 +1152,6 @@
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
-                 | (uint32) 0x01000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
@@ -1176,6 +1175,7 @@
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
+                 | (uint32) 0x00000000U
                  | (uint32) 0x00000000U;
 
     /** - Set HET pins pullup/down enable */
@@ -1186,7 +1186,6 @@
                     | (uint32) 0x00000000U
                     | (uint32) 0x00000000U
                     | (uint32) 0x00000000U
-                    | (uint32) 0x01000000U
                     | (uint32) 0x00000000U
                     | (uint32) 0x00000000U
                     | (uint32) 0x00000000U
@@ -1210,6 +1209,7 @@
                     | (uint32) 0x00000000U
                     | (uint32) 0x00000000U
                     | (uint32) 0x00000000U
+                    | (uint32) 0x00000000U
                     | (uint32) 0x00000000U;
 
     /** - Set HET pins pullup/down select */
@@ -1220,11 +1220,11 @@
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
-                 | (uint32) 0x01000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
+                 | (uint32) 0x00000000U
                  | (uint32) 0x00080000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00020000U
@@ -1233,7 +1233,6 @@
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
-                 | (uint32) 0x00000800U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
@@ -1244,13 +1243,13 @@
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
                  | (uint32) 0x00000000U
+                 | (uint32) 0x00000000U
                  | (uint32) 0x00000000U;
 
     /** - Set HET pins high resolution share */
     hetREG1->HRSH = (uint32) 0x00000000U
                   | (uint32) 0x00000000U
                   | (uint32) 0x00000000U
-                  | (uint32) 0x00001000U
                   | (uint32) 0x00000000U
                   | (uint32) 0x00000000U
                   | (uint32) 0x00000000U
@@ -1259,6 +1258,7 @@
                   | (uint32) 0x00000000U
                   | (uint32) 0x00000000U
                   | (uint32) 0x00000000U
+                  | (uint32) 0x00000000U
                   | (uint32) 0x00000008U
                   | (uint32) 0x00000004U
                   | (uint32) 0x00000000U
Index: firmware/source/pinmux.c
===================================================================
diff -u -rc48569a478d727afa7cd69aadb396814248c83f9 -r39fb416e7619db22c26019b09a63b6d6a10d6b02
--- firmware/source/pinmux.c	(.../pinmux.c)	(revision c48569a478d727afa7cd69aadb396814248c83f9)
+++ firmware/source/pinmux.c	(.../pinmux.c)	(revision 39fb416e7619db22c26019b09a63b6d6a10d6b02)
@@ -208,7 +208,7 @@
     
     pinMuxReg->PINMMR19 =   PINMUX_PIN_127_HET1_30;
     
-    pinMuxReg->PINMMR20 =   PINMUX_PIN_130_MIBSPI1NCS_1;
+    pinMuxReg->PINMMR20 =   PINMUX_PIN_130_HET1_17;
     
     pinMuxReg->PINMMR21 =   PINMUX_PIN_133_GIOB_1;
     
Index: firmware/source/sys_main.c
===================================================================
diff -u -re44aad7a9d5fa48aeaa55c65bd28ad9acde6ce05 -r39fb416e7619db22c26019b09a63b6d6a10d6b02
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision e44aad7a9d5fa48aeaa55c65bd28ad9acde6ce05)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 39fb416e7619db22c26019b09a63b6d6a10d6b02)
@@ -73,6 +73,7 @@
 #include "FluidLeak.h"
 #include "FPGA.h"
 #include "Heaters.h"
+#include "Integrity.h"
 #include "InternalADC.h"
 #include "Interrupts.h"
 #include "LoadCell.h"