Merge pull request #14 from qiyongshuang/main

V2.2

EVT/EXAM/ADC/ADC_DMA/User/ch32v20x_it.c

@@ -38,6 +38,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/ADC_DMA/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/AnalogWatchdog/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/AnalogWatchdog/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/Auto_Injection/User/ch32v20x_it.c

@@ -36,6 +36,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/Auto_Injection/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/Discontinuous_mode/User/ch32v20x_it.c

@@ -38,6 +38,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/Discontinuous_mode/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/DualADC_AlternateTrigger/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/DualADC_AlternateTrigger/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/DualADC_Combined_RegInjectionSimul/User/ch32v20x_it.c

@@ -38,6 +38,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/DualADC_Combined_RegInjectionSimul/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/DualADC_FastInterleaved/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/DualADC_FastInterleaved/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/DualADC_InjectionSimul/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/DualADC_InjectionSimul/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/DualADC_RegSimul/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/DualADC_RegSimul/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/DualADC_SlowInterleaved/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/DualADC_SlowInterleaved/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/ExtLines_Trigger/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/ExtLines_Trigger/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/Internal_Temperature/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/Internal_Temperature/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/TIM_Trigger/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/TIM_Trigger/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/ADC/Temperature_External_channel/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/ADC/Temperature_External_channel/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/APPLICATION/USBPD/I2C_OP_CH223/User/ch32v20x_it.c

@@ -37,6 +37,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+  NVIC_SystemReset();
   while (1)
   {
   }

EVT/EXAM/APPLICATION/USBPD/I2C_OP_CH223/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/APPLICATION/WS2812_LED/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BKP/BKP/User/ch32v20x_it.c

@@ -38,6 +38,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BKP/BKP/User/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/BLE_UART/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/BLE_UART/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/BLE_USB/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/BLE_USB/APP/ch32v20x_usbfs_device.c

@@ -185,11 +185,29 @@ void USBDeviceInit(void)
  *
  * @return  none
  */
-void USBFS_RCC_Init(void)
+void USBFS_RCC_Init( void )
 {
-    RCC->CFGR2 &= ~RCC_USBFS_CLK_SRC; //usbfs clock selection: 0 = systick, 1 = usb20_phy
+    RCC_ClocksTypeDef RCC_ClocksStatus={0};
-    RCC_USBCLKConfig(RCC_USBCLKSource_PLLCLK_Div2);
+    RCC_GetClocksFreq(&RCC_ClocksStatus);
-    RCC_AHBPeriphClockCmd(RCC_AHBPeriph_USBFS, ENABLE);
+    if( RCC_ClocksStatus.SYSCLK_Frequency == 144000000 )
+    {
+        RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div3 );
+    }
+    else if( RCC_ClocksStatus.SYSCLK_Frequency == 96000000 ) 
+    {
+        RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div2 );
+    }
+    else if( RCC_ClocksStatus.SYSCLK_Frequency == 48000000 ) 
+    {
+        RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div1 );
+    }
+#if defined(CH32V20x_D8W) || defined(CH32V20x_D8)
+    else if ( RCC_ClocksStatus.SYSCLK_Frequency == 240000000 && RCC_USB5PRE_JUDGE() == SET )
+    {
+        RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div5 );
+    }
+#endif
+    RCC_AHBPeriphClockCmd( RCC_AHBPeriph_USBFS, ENABLE );
 }
 
 /*********************************************************************

EVT/EXAM/BLE/BLE_USB/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/BackupUpgrade_IAP/APP/ch32v20x_it.c

@@ -42,6 +42,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/BackupUpgrade_IAP/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/BackupUpgrade_IAP/Ld/Link.ld

@@ -7,7 +7,7 @@ PROVIDE( _stack_size = __stack_size );
 
 MEMORY
 {  
-/* CH32V20x_D6 - CH32V203F6-CH32V203G6-CH32V203K6-CH32V203C6 */
+/* CH32V20x_D6 - CH32V203F6-CH32V203G6-CH32V203C6 */
 /*
 	FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 32K
 	RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 10K

EVT/EXAM/BLE/BackupUpgrade_IAP/Startup/startup_ch32v20x_D8W.S

@@ -93,8 +93,8 @@ _vector_base:
     .word   EXTI15_10_IRQHandler       /* EXTI Line 15..10 */
     .word   RTCAlarm_IRQHandler        /* RTC Alarm through EXTI Line */
     .word   USBWakeUp_IRQHandler       /* USB Wake up from suspend */
-    .word   USBHD_IRQHandler           /* USBHD Break */
+    .word   USBFS_IRQHandler           /* USBFS Break */
-    .word   USBHDWakeUp_IRQHandler     /* USBHD Wake up from suspend */
+    .word   USBFSWakeUp_IRQHandler     /* USBFS Wake up from suspend */
     .word   ETH_IRQHandler             /* ETH global */
     .word   ETHWakeUp_IRQHandler       /* ETH Wake up */
     .word   BB_IRQHandler              /* BLE BB */
@@ -158,8 +158,8 @@ _vector_base:
     .weak   EXTI15_10_IRQHandler       /* EXTI Line 15..10 */
     .weak   RTCAlarm_IRQHandler        /* RTC Alarm through EXTI Line */
     .weak   USBWakeUp_IRQHandler       /* USB Wakeup from suspend */
-    .weak   USBHD_IRQHandler           /* USBHD */
+    .weak   USBFS_IRQHandler           /* USBFS */
-    .weak   USBHDWakeUp_IRQHandler     /* USBHD Wake Up */
+    .weak   USBFSWakeUp_IRQHandler     /* USBFS Wake Up */
     .weak   ETH_IRQHandler             /* ETH global */
     .weak   ETHWakeUp_IRQHandler       /* ETHWakeUp */
     .weak   BB_IRQHandler              /* BB */
@@ -220,8 +220,8 @@ USART3_IRQHandler:  1:  j 1b
 EXTI15_10_IRQHandler:  1:  j 1b
 RTCAlarm_IRQHandler:  1:  j 1b
 USBWakeUp_IRQHandler:  1:  j 1b
-USBHD_IRQHandler:  1:  j 1b
+USBFS_IRQHandler:  1:  j 1b
-USBHDWakeUp_IRQHandler:  1:  j 1b
+USBFSWakeUp_IRQHandler:  1:  j 1b
 ETH_IRQHandler:  1:  j 1b
 ETHWakeUp_IRQHandler:  1:  j 1b
 BB_IRQHandler:  1:  j 1b

EVT/EXAM/BLE/BackupUpgrade_OTA/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/BackupUpgrade_OTA/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/BackupUpgrade_OTA/Ld/Link.ld

@@ -7,7 +7,7 @@ PROVIDE( _stack_size = __stack_size );
 
 MEMORY
 {  
-/* CH32V20x_D6 - CH32V203F6-CH32V203G6-CH32V203K6-CH32V203C6 */
+/* CH32V20x_D6 - CH32V203F6-CH32V203G6-CH32V203C6 */
 /*
 	FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 32K
 	RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 10K

EVT/EXAM/BLE/BackupUpgrade_OTA/Startup/startup_ch32v20x_D8W.S

@@ -93,8 +93,8 @@ _vector_base:
     .word   EXTI15_10_IRQHandler       /* EXTI Line 15..10 */
     .word   RTCAlarm_IRQHandler        /* RTC Alarm through EXTI Line */
     .word   USBWakeUp_IRQHandler       /* USB Wake up from suspend */
-    .word   USBHD_IRQHandler           /* USBHD Break */
+    .word   USBFS_IRQHandler           /* USBFS Break */
-    .word   USBHDWakeUp_IRQHandler     /* USBHD Wake up from suspend */
+    .word   USBFSWakeUp_IRQHandler     /* USBFS Wake up from suspend */
     .word   ETH_IRQHandler             /* ETH global */
     .word   ETHWakeUp_IRQHandler       /* ETH Wake up */
     .word   BB_IRQHandler              /* BLE BB */
@@ -158,8 +158,8 @@ _vector_base:
     .weak   EXTI15_10_IRQHandler       /* EXTI Line 15..10 */
     .weak   RTCAlarm_IRQHandler        /* RTC Alarm through EXTI Line */
     .weak   USBWakeUp_IRQHandler       /* USB Wakeup from suspend */
-    .weak   USBHD_IRQHandler           /* USBHD */
+    .weak   USBFS_IRQHandler           /* USBFS */
-    .weak   USBHDWakeUp_IRQHandler     /* USBHD Wake Up */
+    .weak   USBFSWakeUp_IRQHandler     /* USBFS Wake Up */
     .weak   ETH_IRQHandler             /* ETH global */
     .weak   ETHWakeUp_IRQHandler       /* ETHWakeUp */
     .weak   BB_IRQHandler              /* BB */
@@ -220,8 +220,8 @@ USART3_IRQHandler:  1:  j 1b
 EXTI15_10_IRQHandler:  1:  j 1b
 RTCAlarm_IRQHandler:  1:  j 1b
 USBWakeUp_IRQHandler:  1:  j 1b
-USBHD_IRQHandler:  1:  j 1b
+USBFS_IRQHandler:  1:  j 1b
-USBHDWakeUp_IRQHandler:  1:  j 1b
+USBFSWakeUp_IRQHandler:  1:  j 1b
 ETH_IRQHandler:  1:  j 1b
 ETHWakeUp_IRQHandler:  1:  j 1b
 BB_IRQHandler:  1:  j 1b

EVT/EXAM/BLE/Broadcaster/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/Broadcaster/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/CentPeri/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/CentPeri/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/Central/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/Central/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/CyclingSensor/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/CyclingSensor/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/Direct_Test_Mode/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/Direct_Test_Mode/APP/ch32v20x_usbfs_device.c

@@ -53,18 +53,26 @@ void USBFS_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
  */
 void USBFS_RCC_Init( void )
 {
-    if( SystemCoreClock == 144000000 )
+    RCC_ClocksTypeDef RCC_ClocksStatus={0};
+    RCC_GetClocksFreq(&RCC_ClocksStatus);
+    if( RCC_ClocksStatus.SYSCLK_Frequency == 144000000 )
     {
         RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div3 );
     }
-    else if( SystemCoreClock == 96000000 )
+    else if( RCC_ClocksStatus.SYSCLK_Frequency == 96000000 ) 
     {
         RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div2 );
     }
-    else if( SystemCoreClock == 48000000 )
+    else if( RCC_ClocksStatus.SYSCLK_Frequency == 48000000 ) 
     {
         RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div1 );
     }
+#if defined(CH32V20x_D8W) || defined(CH32V20x_D8)
+    else if ( RCC_ClocksStatus.SYSCLK_Frequency == 240000000 && RCC_USB5PRE_JUDGE() == SET )
+    {
+        RCC_USBCLKConfig( RCC_USBCLKSource_PLLCLK_Div5 );
+    }
+#endif
     RCC_AHBPeriphClockCmd( RCC_AHBPeriph_USBFS, ENABLE );
 }
 

EVT/EXAM/BLE/Direct_Test_Mode/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/HAL/Link.ld

@@ -7,7 +7,7 @@ PROVIDE( _stack_size = __stack_size );
 
 MEMORY
 {  
-/* CH32V20x_D6 - CH32V203F6-CH32V203G6-CH32V203K6-CH32V203C6 */
+/* CH32V20x_D6 - CH32V203F6-CH32V203G6-CH32V203C6 */
 /*
 	FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 32K
 	RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 10K

EVT/EXAM/BLE/HID_Consumer/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/HID_Consumer/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/HID_Keyboard/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/HID_Keyboard/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/HID_Mouse/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/HID_Mouse/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/HID_Touch/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/HID_Touch/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/HeartRate/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/HeartRate/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/LWNS/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/LWNS/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/MESH/adv_ali_light/APP/app_main.c

@@ -95,6 +95,7 @@ int main(void)
     USART_Printf_Init( 115200 );
 #endif
     PRINT("%s\n", VER_LIB);
+    PRINT("%s\n", VER_MESH_LIB);
     WCHBLE_Init();
     HAL_Init();
     bt_mesh_lib_init();

EVT/EXAM/BLE/MESH/adv_ali_light/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/MESH/adv_ali_light/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/MESH/adv_ali_light_add_lightness/APP/app_main.c

@@ -95,6 +95,7 @@ int main(void)
     USART_Printf_Init( 115200 );
 #endif
     PRINT("%s\n", VER_LIB);
+    PRINT("%s\n", VER_MESH_LIB);
     WCHBLE_Init();
     HAL_Init();
     bt_mesh_lib_init();

EVT/EXAM/BLE/MESH/adv_ali_light_add_lightness/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/MESH/adv_ali_light_add_lightness/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/MESH/adv_ali_light_add_windspeed/APP/app_main.c

@@ -95,6 +95,7 @@ int main(void)
     USART_Printf_Init( 115200 );
 #endif
     PRINT("%s\n", VER_LIB);
+    PRINT("%s\n", VER_MESH_LIB);
     WCHBLE_Init();
     HAL_Init();
     bt_mesh_lib_init();

EVT/EXAM/BLE/MESH/adv_ali_light_add_windspeed/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/MESH/adv_ali_light_add_windspeed/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/MESH/adv_ali_light_multi_element/APP/app_main.c

@@ -95,6 +95,7 @@ int main(void)
     USART_Printf_Init( 115200 );
 #endif
     PRINT("%s\n", VER_LIB);
+    PRINT("%s\n", VER_MESH_LIB);
     WCHBLE_Init();
     HAL_Init();
     bt_mesh_lib_init();

EVT/EXAM/BLE/MESH/adv_ali_light_multi_element/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/MESH/adv_ali_light_multi_element/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/MESH/adv_ali_light_with_peripheral/APP/app_main.c

@@ -95,6 +95,7 @@ int main(void)
     USART_Printf_Init( 115200 );
 #endif
     PRINT("%s\n", VER_LIB);
+    PRINT("%s\n", VER_MESH_LIB);
     WCHBLE_Init();
     HAL_Init();
     bt_mesh_lib_init();

EVT/EXAM/BLE/MESH/adv_ali_light_with_peripheral/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/MESH/adv_ali_light_with_peripheral/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/MESH/adv_proxy/APP/app_main.c

@@ -97,6 +97,7 @@ int main(void)
     USART_Printf_Init( 115200 );
 #endif
     PRINT("%s\n", VER_LIB);
+    PRINT("%s\n", VER_MESH_LIB);
     WCHBLE_Init();
     HAL_Init();
     bt_mesh_lib_init();

EVT/EXAM/BLE/MESH/adv_proxy/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/MESH/adv_proxy/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/MESH/adv_vendor/APP/app_main.c

@@ -97,6 +97,7 @@ int main(void)
     USART_Printf_Init( 115200 );
 #endif
     PRINT("%s\n", VER_LIB);
+    PRINT("%s\n", VER_MESH_LIB);
     WCHBLE_Init();
     HAL_Init();
     bt_mesh_lib_init();

EVT/EXAM/BLE/MESH/adv_vendor/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/MESH/adv_vendor/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/MESH/adv_vendor_friend/APP/app_main.c

@@ -97,6 +97,7 @@ int main(void)
     USART_Printf_Init( 115200 );
 #endif
     PRINT("%s\n", VER_LIB);
+    PRINT("%s\n", VER_MESH_LIB);
     WCHBLE_Init();
     HAL_Init();
     bt_mesh_lib_init();

EVT/EXAM/BLE/MESH/adv_vendor_friend/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/MESH/adv_vendor_friend/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/MESH/adv_vendor_low_power/APP/app_main.c

@@ -97,6 +97,7 @@ int main(void)
     USART_Printf_Init( 115200 );
 #endif
     PRINT("%s\n", VER_LIB);
+    PRINT("%s\n", VER_MESH_LIB);
     WCHBLE_Init();
     HAL_Init();
     bt_mesh_lib_init();

EVT/EXAM/BLE/MESH/adv_vendor_low_power/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/MESH/adv_vendor_low_power/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }

EVT/EXAM/BLE/MESH/adv_vendor_self_provision/APP/app_main.c

@@ -97,6 +97,7 @@ int main(void)
     USART_Printf_Init( 115200 );
 #endif
     PRINT("%s\n", VER_LIB);
+    PRINT("%s\n", VER_MESH_LIB);
     WCHBLE_Init();
     HAL_Init();
     bt_mesh_lib_init();

EVT/EXAM/BLE/MESH/adv_vendor_self_provision/APP/ch32v20x_it.c

@@ -43,6 +43,7 @@ void NMI_Handler(void)
  */
 void HardFault_Handler(void)
 {
+    NVIC_SystemReset();
     while(1)
     {
     }

EVT/EXAM/BLE/MESH/adv_vendor_self_provision/APP/system_ch32v20x.c

@@ -159,8 +159,8 @@ void SystemCoreClockUpdate (void)
       }
       else
       {
-#if defined (CH32V20x_D8W)
+#if defined (CH32V20x_D8W) || defined (CH32V20x_D8)
-        if((RCC->CFGR0 & (3<<22)) == (3<<22))
+        if(((RCC->CFGR0 & (3<<22)) == (3<<22)) && (RCC_USB5PRE_JUDGE()== SET))
         {
           SystemCoreClock = ((HSE_VALUE>>1)) * pllmull;
         }