Index: firmware/DG.dil
===================================================================
diff -u -r497dc26e76083742903525aab1490a6900e94969 -r4dc57180b04566f05e96ca690e8e89bfd748091b
--- firmware/DG.dil	(.../DG.dil)	(revision 497dc26e76083742903525aab1490a6900e94969)
+++ firmware/DG.dil	(.../DG.dil)	(revision 4dc57180b04566f05e96ca690e8e89bfd748091b)
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-# RM46L852PGE 04/27/21 16:18:17
-=======
 # RM46L852PGE 04/21/21 17:25:51
->>>>>>> DEN-7605-hd_dg_dev-self-tests
 # 
 ARCH=RM46L852PGE
 # 
@@ -315,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=1
+DRIVER.SYSTEM.VAR.HET1_ENABLE.VALUE=0
 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
@@ -927,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=1
+DRIVER.SYSTEM.VAR.HET_ENABLE.VALUE=0
 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
@@ -5961,7 +5957,7 @@
 DRIVER.HET.VAR.HET1_BIT27_PSL.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT19_PSL.VALUE=0x00080000
 DRIVER.HET.VAR.HET2_EDGE6_LVL.VALUE=0x00000000
-DRIVER.HET.VAR.HET1_BIT24_PULL.VALUE=0
+DRIVER.HET.VAR.HET1_BIT24_PULL.VALUE=1
 DRIVER.HET.VAR.HET1_BIT16_PULL.VALUE=1
 DRIVER.HET.VAR.HET1_BIT2_DIR.VALUE=0x00000000
 DRIVER.HET.VAR.HET2_PWM6_DUTY_INTENA.VALUE=0x00000000
@@ -6235,7 +6231,7 @@
 DRIVER.HET.VAR.HET1_PWM3_PERIOD.VALUE=1000.000
 DRIVER.HET.VAR.HET2_PWM5_DUTY_PRESCALER.VALUE=51968
 DRIVER.HET.VAR.HET1_PWM1_PERIOD_PRESCALER.VALUE=103296
-DRIVER.HET.VAR.HET1_BIT10_DIR.VALUE=0x00000000
+DRIVER.HET.VAR.HET1_BIT10_DIR.VALUE=0x00000400
 DRIVER.HET.VAR.HET2_CAP4_POLARITY.VALUE=0
 DRIVER.HET.VAR.HET2_BIT8_XORSHARE.VALUE=0x00000000
 DRIVER.HET.VAR.HET2_BIT4_PULDIS.VALUE=0x00000000
@@ -6265,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=0x00000000
+DRIVER.HET.VAR.HET1_BIT11_DIR.VALUE=0x00000800
 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
@@ -6341,7 +6337,7 @@
 DRIVER.HET.VAR.HET1_LR_ACTUALTIME.VALUE=1238.690
 DRIVER.HET.VAR.HET1_BIT21_DIR.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT13_DIR.VALUE=0x00000000
-DRIVER.HET.VAR.HET1_BIT11_PULL.VALUE=2
+DRIVER.HET.VAR.HET1_BIT11_PULL.VALUE=1
 DRIVER.HET.VAR.HET2_PWM3_DUTY.VALUE=50
 DRIVER.HET.VAR.HET1_PWM7_ENA.VALUE=0
 DRIVER.HET.VAR.HET1_HR_PRESCALE.VALUE=0
@@ -6430,7 +6426,7 @@
 DRIVER.HET.VAR.HET1_EDGE0_EVENT.VALUE=1
 DRIVER.HET.VAR.HET2_BIT10_PULDIS.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_CAP2_PIN_SELECT.VALUE=4
-DRIVER.HET.VAR.HET1_BIT11_PSL.VALUE=0x00000800
+DRIVER.HET.VAR.HET1_BIT11_PSL.VALUE=0x00000000
 DRIVER.HET.VAR.HET2_PWM2_DUTYTIME.VALUE=501.669
 DRIVER.HET.VAR.HET2_PWM0_DUTY_LVL.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT31_DIR.VALUE=0x80000000
@@ -6575,7 +6571,7 @@
 DRIVER.HET.VAR.HET1_PWM7_DUTY_INTENA.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT10_ANDSHARE.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_EDGE7_PIN_SELECT.VALUE=23
-DRIVER.HET.VAR.HET1_BIT24_PDR.VALUE=0x01000000
+DRIVER.HET.VAR.HET1_BIT24_PDR.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT16_PDR.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT5_DOUT.VALUE=0
 DRIVER.HET.VAR.HET2_PWM7_PERIOD_PRESCALER.VALUE=103296
@@ -6626,7 +6622,7 @@
 DRIVER.HET.VAR.HET2_EDGE1_POLARITY.VALUE=0
 DRIVER.HET.VAR.HET1_CAP7_POLARITY.VALUE=0
 DRIVER.HET.VAR.HET1_BIT28_ANDSHARE.VALUE=0x00000000
-DRIVER.HET.VAR.HET1_BIT24_PULDIS.VALUE=0x01000000
+DRIVER.HET.VAR.HET1_BIT24_PULDIS.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT16_PULDIS.VALUE=0x00000000
 DRIVER.HET.VAR.HET2_BIT16_PULL.VALUE=1
 DRIVER.HET.VAR.HET2_BIT12_DIR.VALUE=0x00000000
@@ -6638,7 +6634,7 @@
 DRIVER.HET.VAR.HET2_EDGE6_PIN_SELECT.VALUE=12
 DRIVER.HET.VAR.HET2_BIT2_PDR.VALUE=0x00000000
 DRIVER.HET.VAR.HET2_DIS_BLACKBOX.VALUE=0
-DRIVER.HET.VAR.HET1_BIT24_PSL.VALUE=0x01000000
+DRIVER.HET.VAR.HET1_BIT24_PSL.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_BIT16_PSL.VALUE=0x00000000
 DRIVER.HET.VAR.HET2_EDGE3_LVL.VALUE=0x00000000
 DRIVER.HET.VAR.HET1_EDGE6_EVENT.VALUE=1
@@ -7282,7 +7278,7 @@
 DRIVER.PINMUX.VAR.DMA_PRITY_1_VALUE.VALUE=0x0001
 DRIVER.PINMUX.VAR.PINMUX11.VALUE=PINMUX_PIN_91_HET1_24
 DRIVER.PINMUX.VAR.DMA_PRITY_12.VALUE=FIXED
-DRIVER.PINMUX.VAR.PINMUX20.VALUE=PINMUX_PIN_130_MIBSPI1NCS_1
+DRIVER.PINMUX.VAR.PINMUX20.VALUE=PINMUX_PIN_130_HET1_17
 DRIVER.PINMUX.VAR.PINMUX12.VALUE="PINMUX_PIN_92_HET1_26 | PINMUX_PIN_96_MIBSPI1NENA | PINMUX_PIN_97_MIBSPI5NENA"
 DRIVER.PINMUX.VAR.DMA_PRITY_13.VALUE=FIXED
 DRIVER.PINMUX.VAR.PINMUX21.VALUE=PINMUX_PIN_133_GIOB_1
@@ -7406,7 +7402,7 @@
 DRIVER.PINMUX.VAR.MUX75_OPTION4.VALUE=0
 DRIVER.PINMUX.VAR.MUX67_OPTION4.VALUE=0
 DRIVER.PINMUX.VAR.MUX59_OPTION4.VALUE=0
-DRIVER.PINMUX.VAR.MUX6_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX6_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.DMA_CHANNEL_29.VALUE=CHANNEL0
 DRIVER.PINMUX.VAR.DMA_FIDXS_7.VALUE=0
 DRIVER.PINMUX.VAR.DMA_AIM_7.VALUE=ENABLED
@@ -7426,7 +7422,7 @@
 DRIVER.PINMUX.VAR.MUX6_OPTION3.VALUE=0
 DRIVER.PINMUX.VAR.MUX60_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX52_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX44_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX44_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX36_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX28_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX6_OPTION4.VALUE=0
@@ -7502,7 +7498,7 @@
 DRIVER.PINMUX.VAR.DMA_CP0_IDADDR_16.VALUE=0
 DRIVER.PINMUX.VAR.DMA_STADD_2.VALUE=0
 DRIVER.PINMUX.VAR.MUX21_OPTION0.VALUE=1
-DRIVER.PINMUX.VAR.MUX13_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX13_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.DMA_TTYPE_25.VALUE=FRAME_TRANSFER
 DRIVER.PINMUX.VAR.DMA_CP0_IDADDR_25.VALUE=0
 DRIVER.PINMUX.VAR.DMA_TTYPE_17.VALUE=FRAME_TRANSFER
@@ -7523,7 +7519,7 @@
 DRIVER.PINMUX.VAR.PIN_MUX_71_SELECT.VALUE=0
 DRIVER.PINMUX.VAR.PIN_MUX_63_SELECT.VALUE=0
 DRIVER.PINMUX.VAR.PIN_MUX_55_SELECT.VALUE=0
-DRIVER.PINMUX.VAR.PIN_MUX_47_SELECT.VALUE=0
+DRIVER.PINMUX.VAR.PIN_MUX_47_SELECT.VALUE=1
 DRIVER.PINMUX.VAR.PIN_MUX_39_SELECT.VALUE=0
 DRIVER.PINMUX.VAR.DMA_TTYPE_27.VALUE=FRAME_TRANSFER
 DRIVER.PINMUX.VAR.DMA_CP0_IDADDR_27.VALUE=0
@@ -7672,7 +7668,7 @@
 DRIVER.PINMUX.VAR.DMA_ADDMW_6.VALUE=CONSTANT
 DRIVER.PINMUX.VAR.DMA_INTFTCEN_2.VALUE=1
 DRIVER.PINMUX.VAR.MUX51_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX43_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX43_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX35_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX27_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX19_OPTION0.VALUE=0
@@ -7741,7 +7737,7 @@
 DRIVER.PINMUX.VAR.DMA_INTMP_2_VALUE.VALUE=0x0001
 DRIVER.PINMUX.VAR.DMA_INTEN_16.VALUE=1
 DRIVER.PINMUX.VAR.MUX20_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX12_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX12_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX20_OPTION1.VALUE=1
 DRIVER.PINMUX.VAR.MUX12_OPTION1.VALUE=0
 DRIVER.PINMUX.VAR.MUX20_OPTION2.VALUE=0
@@ -7876,7 +7872,7 @@
 DRIVER.PINMUX.VAR.MUX73_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX65_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX57_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX49_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX49_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.DMA_FIDXS_25.VALUE=0
 DRIVER.PINMUX.VAR.DMA_AIM_25.VALUE=ENABLED
 DRIVER.PINMUX.VAR.DMA_FIDXS_17.VALUE=0
@@ -7947,7 +7943,7 @@
 DRIVER.PINMUX.VAR.DMA_BYP_12.VALUE=1
 DRIVER.PINMUX.VAR.DMA_INTBTCEN_2.VALUE=1
 DRIVER.PINMUX.VAR.MUX50_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX42_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX42_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX34_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX26_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX18_OPTION0.VALUE=0
@@ -8187,8 +8183,8 @@
 DRIVER.PINMUX.VAR.DMA_ADDMR_12.VALUE=CONSTANT
 DRIVER.PINMUX.VAR.DMA_INTEN_6.VALUE=1
 DRIVER.PINMUX.VAR.EMIF.VALUE=0
-DRIVER.PINMUX.VAR.MUX41_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX33_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX41_OPTION0.VALUE=1
+DRIVER.PINMUX.VAR.MUX33_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX25_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX17_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX3_OPTION4.VALUE=0
@@ -8384,7 +8380,7 @@
 DRIVER.PINMUX.VAR.MUX94_OPTION4.VALUE=0
 DRIVER.PINMUX.VAR.MUX86_OPTION4.VALUE=0
 DRIVER.PINMUX.VAR.MUX78_OPTION4.VALUE=0
-DRIVER.PINMUX.VAR.MUX9_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX9_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX9_OPTION1.VALUE=0
 DRIVER.PINMUX.VAR.DMA_EIDXD_0.VALUE=0
 DRIVER.PINMUX.VAR.DMA_CHPR_10.VALUE=HIGH
@@ -8411,7 +8407,7 @@
 DRIVER.PINMUX.VAR.MUX71_OPTION1.VALUE=0
 DRIVER.PINMUX.VAR.MUX63_OPTION1.VALUE=0
 DRIVER.PINMUX.VAR.MUX55_OPTION1.VALUE=0
-DRIVER.PINMUX.VAR.MUX47_OPTION1.VALUE=0
+DRIVER.PINMUX.VAR.MUX47_OPTION1.VALUE=1
 DRIVER.PINMUX.VAR.MUX39_OPTION1.VALUE=0
 DRIVER.PINMUX.VAR.MUX9_OPTION5.VALUE=0
 DRIVER.PINMUX.VAR.DMA_ADDMW_10.VALUE=CONSTANT
@@ -8490,7 +8486,7 @@
 DRIVER.PINMUX.VAR.DMA_IET_COUNT_6.VALUE=0
 DRIVER.PINMUX.VAR.DMA_TRIG_12.VALUE=HARDWARE_TRIGGER
 DRIVER.PINMUX.VAR.MUX40_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX32_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX32_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX24_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX16_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX2_OPTION4.VALUE=0
@@ -8695,7 +8691,7 @@
 DRIVER.PINMUX.VAR.MUX70_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX62_OPTION0.VALUE=0
 DRIVER.PINMUX.VAR.MUX54_OPTION0.VALUE=0
-DRIVER.PINMUX.VAR.MUX46_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX46_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX38_OPTION0.VALUE=1
 DRIVER.PINMUX.VAR.MUX8_OPTION4.VALUE=0
 DRIVER.PINMUX.VAR.MUX70_OPTION1.VALUE=0
Index: firmware/DG.hcg
===================================================================
diff -u -rc48569a478d727afa7cd69aadb396814248c83f9 -r4dc57180b04566f05e96ca690e8e89bfd748091b
--- firmware/DG.hcg	(.../DG.hcg)	(revision c48569a478d727afa7cd69aadb396814248c83f9)
+++ firmware/DG.hcg	(.../DG.hcg)	(revision 4dc57180b04566f05e96ca690e8e89bfd748091b)
@@ -292,9 +292,7 @@
       <HDRHTU>
         <NAME>htu.h</NAME>
       </HDRHTU>
-      <SRCHET>
-        <NAME>het.c</NAME>
-      </SRCHET>
+      <SRCHET/>
       <HET2ASMHDR>
         <NAME/>
       </HET2ASMHDR>
@@ -598,7 +596,7 @@
         <PATH>include\htu.h</PATH>
       </HDRHTU>
       <SRCHET>
-        <PATH>source\het.c</PATH>
+        <PATH/>
       </SRCHET>
     </FILENAMES>
   </HET>