diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
index e2677877..8554ded7 100644
--- a/cores/arduino/HardwareSerial.cpp
+++ b/cores/arduino/HardwareSerial.cpp
@@ -272,7 +272,7 @@ void HardwareSerial::setHandler(void *handler)
   #endif
 
   #if defined(HAVE_HWSERIAL6)
-    HardwareSerial Serial6(USART6);
+    HardwareSerial Serial6(UART6);
   #endif
 
   #if defined(HAVE_HWSERIAL7)
diff --git a/cores/arduino/HardwareSerial.h b/cores/arduino/HardwareSerial.h
index 0c5edc84..0f28f107 100644
--- a/cores/arduino/HardwareSerial.h
+++ b/cores/arduino/HardwareSerial.h
@@ -173,16 +173,16 @@ class HardwareSerial : public Stream {
 #if defined(UART4) || defined(USART4)
   extern HardwareSerial Serial4;
 #endif
-#if defined(UART5) || defined(USART5)
+#if defined(UART5) 
   extern HardwareSerial Serial5;
 #endif
-#if defined(USART6)
+#if defined(UART6) 
   extern HardwareSerial Serial6;
 #endif
-#if defined(UART7) || defined(USART7)
+#if defined(UART7) 
   extern HardwareSerial Serial7;
 #endif
-#if defined(UART8) || defined(USART8)
+#if defined(UART8) 
   extern HardwareSerial Serial8;
 #endif
 
diff --git a/cores/arduino/HardwareTimer.cpp b/cores/arduino/HardwareTimer.cpp
index 05cfbea4..558aee3d 100644
--- a/cores/arduino/HardwareTimer.cpp
+++ b/cores/arduino/HardwareTimer.cpp
@@ -70,7 +70,12 @@ HardwareTimer::HardwareTimer(TIM_TypeDef *instance)
 #endif
 
 #ifdef TIM2_BASE 
-  NVIC_EnableIRQ(TIM2_IRQn);
+  #if defined(CH32X035)
+    NVIC_EnableIRQ(TIM2_UP_IRQn);
+    NVIC_EnableIRQ(TIM2_CC_IRQn);
+  #else
+    NVIC_EnableIRQ(TIM2_IRQn);
+  #endif
 #endif
 
 #if defined(TIM3_BASE) && !defined(CH32VM00X)  //v006 has no interruption
@@ -1605,6 +1610,30 @@ extern "C" {
 #endif //TIM1_BASE
 
 #if defined(TIM2_BASE)
+
+  #if defined(CH32X035)
+     /**
+    * @brief  TIM1 IRQHandler 
+    * @param  None
+    * @retval None
+    */
+  void TIM2_UP_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
+  void TIM2_UP_IRQHandler(void)
+  {
+    if (HardwareTimer_Handle[TIMER2_INDEX]) {
+      HardwareTimer::updateCallback(&HardwareTimer_Handle[TIMER2_INDEX]->handle);
+    }
+  }
+
+  void TIM2_CC_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
+  void TIM2_CC_IRQHandler(void)
+  {
+    if (HardwareTimer_Handle[TIMER2_INDEX]) {
+      HardwareTimer::captureCompareCallback(&HardwareTimer_Handle[TIMER2_INDEX]->handle);
+    }
+  }
+
+  #else
   /**
     * @brief  TIM2 IRQHandler
     * @param  None
@@ -1615,11 +1644,12 @@ extern "C" {
   {
     if (HardwareTimer_Handle[TIMER2_INDEX]) 
     {
-      // HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER2_INDEX]->handle);
       HardwareTimer::updateCallback(&HardwareTimer_Handle[TIMER2_INDEX]->handle);
       HardwareTimer::captureCompareCallback(&HardwareTimer_Handle[TIMER2_INDEX]->handle);
     }
   }
+  #endif
+
 #endif //TIM2_BASE
 
 #if defined(TIM3_BASE)
@@ -1632,7 +1662,6 @@ extern "C" {
   void TIM3_IRQHandler(void)
   {
     if (HardwareTimer_Handle[TIMER3_INDEX]) {
-      // HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER3_INDEX]->handle);
       HardwareTimer::updateCallback(&HardwareTimer_Handle[TIMER3_INDEX]->handle);
       HardwareTimer::captureCompareCallback(&HardwareTimer_Handle[TIMER3_INDEX]->handle);
     }
@@ -1649,7 +1678,6 @@ extern "C" {
   void TIM4_IRQHandler(void)
   {
     if (HardwareTimer_Handle[TIMER4_INDEX]) {
-      // HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER4_INDEX]->handle);
        HardwareTimer::updateCallback(&HardwareTimer_Handle[TIMER4_INDEX]->handle);
        HardwareTimer::captureCompareCallback(&HardwareTimer_Handle[TIMER4_INDEX]->handle);
     }
@@ -1666,7 +1694,6 @@ extern "C" {
   void TIM5_IRQHandler(void)
   {
     if (HardwareTimer_Handle[TIMER5_INDEX]) {
-      // HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER5_INDEX]->handle);
        HardwareTimer::updateCallback(&HardwareTimer_Handle[TIMER5_INDEX]->handle);
        HardwareTimer::captureCompareCallback(&HardwareTimer_Handle[TIMER5_INDEX]->handle);
     }
@@ -1699,7 +1726,6 @@ extern "C" {
   void TIM7_IRQHandler(void)
   {
     if (HardwareTimer_Handle[TIMER7_INDEX]) {
-      // HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER7_INDEX]->handle);
        HardwareTimer::updateCallback(&HardwareTimer_Handle[TIMER7_INDEX]->handle);
        HardwareTimer::captureCompareCallback(&HardwareTimer_Handle[TIMER7_INDEX]->handle);
     }
@@ -1716,7 +1742,6 @@ extern "C" {
   void TIM8_UP_IRQHandler(void)
   {
     if (HardwareTimer_Handle[TIMER8_INDEX]) {
-      // HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER8_INDEX]->handle);
        HardwareTimer::updateCallback(&HardwareTimer_Handle[TIMER8_INDEX]->handle);
     }
   }
@@ -1724,7 +1749,6 @@ extern "C" {
   void TIM8_CC_IRQHandler(void)
   {
     if (HardwareTimer_Handle[TIMER8_INDEX]) {
-      // HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER8_INDEX]->handle);
       HardwareTimer::captureCompareCallback(&HardwareTimer_Handle[TIMER8_INDEX]->handle);
     }
   }
@@ -1740,7 +1764,6 @@ extern "C" {
   void TIM9_UP_IRQHandler(void)
   {
     if (HardwareTimer_Handle[TIMER9_INDEX]) {
-      // HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER9_INDEX]->handle);
        HardwareTimer::updateCallback(&HardwareTimer_Handle[TIMER9_INDEX]->handle);
     }
   }
@@ -1763,7 +1786,6 @@ extern "C" {
   void TIM10_UP_IRQHandler(void)
   {
     if (HardwareTimer_Handle[TIMER10_INDEX]) {
-      // HAL_TIM_IRQHandler(&HardwareTimer_Handle[TIMER10_INDEX]->handle);
        HardwareTimer::updateCallback(&HardwareTimer_Handle[TIMER10_INDEX]->handle);
     }
   }
diff --git a/cores/arduino/ch32/backup.h b/cores/arduino/ch32/backup.h
index 9ae614a2..8c4cde28 100644
--- a/cores/arduino/ch32/backup.h
+++ b/cores/arduino/ch32/backup.h
@@ -40,7 +40,7 @@ static inline void resetBackupDomain(void)
 #ifdef PWR_MODULE_ENABLED
   PWR_BackupAccessCmd(ENABLE);
 #endif
-#ifndef CH32V00x
+#if !defined(CH32V00x) && !defined(CH32VM00X) && !(CH32X035)
   RCC_BackupResetCmd(ENABLE);
   RCC_BackupResetCmd(DISABLE);
 #endif
diff --git a/cores/arduino/ch32/timer.c b/cores/arduino/ch32/timer.c
index 59a7ef50..5e03e59c 100644
--- a/cores/arduino/ch32/timer.c
+++ b/cores/arduino/ch32/timer.c
@@ -339,8 +339,12 @@ IRQn_Type getTimerUpIrq(TIM_TypeDef *tim)
 #endif
 #if defined(TIM2_BASE)
       case (uint32_t)TIM2_BASE:
-        IRQn = TIM2_IRQn;
-        break;
+        #if defined(CH32X035)
+          IRQn = TIM2_UP_IRQn;
+        #else
+          IRQn = TIM2_IRQn;
+        #endif
+          break;
 #endif
 #if defined(TIM3_BASE) && defined(TIM3_IRQn)
       case (uint32_t)TIM3_BASE:
@@ -409,7 +413,11 @@ IRQn_Type getTimerCCIrq(TIM_TypeDef *tim)
 #endif
 #if defined(TIM2_BASE)
       case (uint32_t)TIM2_BASE:
-        IRQn = TIM2_IRQn;
+        #if defined(CH32X035)
+          IRQn = TIM2_CC_IRQn;
+        #else
+          IRQn = TIM2_IRQn;
+        #endif
         break;
 #endif
 #if defined(TIM3_BASE) && defined(TIM3_IRQn)
diff --git a/variants/CH32L10x/CH32L103C8T6/PeripheralPins.c b/variants/CH32L10x/CH32L103C8T6/PeripheralPins.c
index 098837df..0a1f34a5 100644
--- a/variants/CH32L10x/CH32L103C8T6/PeripheralPins.c
+++ b/variants/CH32L10x/CH32L103C8T6/PeripheralPins.c
@@ -34,7 +34,7 @@ WEAK const PinMap PinMap_ADC[] = {
   {PA_3,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 3)}, // ADC1_IN3
   {PA_4,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 4)}, // ADC1_IN4
   {PA_5,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 5)}, // ADC1_IN5
-  {NC,        NP,   0, 0, 0}
+  {NC,        NP,   0}
 };
 #endif
 
@@ -45,14 +45,14 @@ WEAK const PinMap PinMap_ADC[] = {
 #ifdef I2C_MODULE_ENABLED
 WEAK const PinMap PinMap_I2C_SDA[] = {
   {PB_11, I2C2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
 #ifdef I2C_MODULE_ENABLED
 WEAK const PinMap PinMap_I2C_SCL[] = {
   {PB_10, I2C2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
@@ -83,7 +83,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_13,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 1)}, // TIM1_CH1N
   {PB_14,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 2)}, // TIM1_CH2N
   {PA_15,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 3)}, // TIM1_CH3N
-  {NC,         NP,   0, 0, 0}
+  {NC,         NP,   0}
 };
 #endif
 
@@ -91,28 +91,28 @@ WEAK const PinMap PinMap_TIM[] = {
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_TX[] = {
   {PA_9, USART1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,   NP,     0, 0}
+  {NC,   NP,     0}
 };
 #endif
 
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_RX[] = {
   {PA_10, USART1, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_RTS[] = {
   {NC, USART1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_CTS[] = {
   {NC, USART1, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},  
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
@@ -121,28 +121,28 @@ WEAK const PinMap PinMap_UART_CTS[] = {
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_MOSI[] = {
   {PB_15, SPI2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_MISO[] = {
   {PB_14, SPI2, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_FLOAT, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_SCLK[] = {
   {PB_13, SPI2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_SSEL[] = {
   {PB_12, SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
diff --git a/variants/CH32V00x/CH32V003F4/PeripheralPins.c b/variants/CH32V00x/CH32V003F4/PeripheralPins.c
index 0840b0cd..c100712b 100644
--- a/variants/CH32V00x/CH32V003F4/PeripheralPins.c
+++ b/variants/CH32V00x/CH32V003F4/PeripheralPins.c
@@ -36,7 +36,7 @@ WEAK const PinMap PinMap_ADC[] = {
   {PD_5,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 5)}, // ADC1_IN5
   {PA_6,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 6)}, // ADC1_IN6
   {PA_4,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 7)}, // ADC1_IN7
-  {NC,        NP,   0, 0, 0}
+  {NC,        NP,   0}
 };
 #endif
 
@@ -74,7 +74,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PD_0,       TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 1)}, // TIM1_CH1N
   {PA_2,       TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 2)}, // TIM1_CH2N
   {PD_1,       TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 3)}, // TIM1_CH3N
-  {NC,         NP,   0, 0, 0}
+  {NC,         NP,   0}
 };
 #endif
 
diff --git a/variants/CH32V10x/CH32V103R8T6/PeripheralPins.c b/variants/CH32V10x/CH32V103R8T6/PeripheralPins.c
index 5ad7b1b2..dcde9257 100644
--- a/variants/CH32V10x/CH32V103R8T6/PeripheralPins.c
+++ b/variants/CH32V10x/CH32V103R8T6/PeripheralPins.c
@@ -40,7 +40,7 @@ WEAK const PinMap PinMap_ADC[] = {
   {PA_4_ALT1, ADC2, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 4)}, // ADC2_IN4
   {PA_5,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 5)}, // ADC1_IN5
   {PA_5_ALT1, ADC2, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 5)}, // ADC2_IN5
-  {NC,        NP,   0, 0, 0}
+  {NC,        NP,   0}
 };
 #endif
 
@@ -51,14 +51,14 @@ WEAK const PinMap PinMap_ADC[] = {
 #ifdef I2C_MODULE_ENABLED
 WEAK const PinMap PinMap_I2C_SDA[] = {
   {PB_11, I2C2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
 #ifdef I2C_MODULE_ENABLED
 WEAK const PinMap PinMap_I2C_SCL[] = {
   {PB_10, I2C2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
@@ -89,7 +89,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_13,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 1)}, // TIM1_CH1N
   {PB_14,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 2)}, // TIM1_CH2N
   {PA_15,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 3)}, // TIM1_CH3N
-  {NC,         NP,   0, 0, 0}
+  {NC,         NP,   0}
 };
 #endif
 
@@ -97,28 +97,28 @@ WEAK const PinMap PinMap_TIM[] = {
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_TX[] = {
   {PA_9, USART1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,   NP,     0, 0}
+  {NC,   NP,     0}
 };
 #endif
 
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_RX[] = {
   {PA_10, USART1, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_RTS[] = {
   {NC, USART1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_CTS[] = {
   {NC, USART1, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},  
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
@@ -127,28 +127,28 @@ WEAK const PinMap PinMap_UART_CTS[] = {
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_MOSI[] = {
   {PB_15, SPI2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_MISO[] = {
   {PB_14, SPI2, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_FLOAT, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_SCLK[] = {
   {PB_13, SPI2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_SSEL[] = {
   {PB_12, SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
diff --git a/variants/CH32V10x/CH32V103R8T6/variant_CH32V103R8T6.h b/variants/CH32V10x/CH32V103R8T6/variant_CH32V103R8T6.h
index 498a6f8b..5285fb11 100644
--- a/variants/CH32V10x/CH32V103R8T6/variant_CH32V103R8T6.h
+++ b/variants/CH32V10x/CH32V103R8T6/variant_CH32V103R8T6.h
@@ -106,7 +106,6 @@
   #define PIN_WIRE_SCL          PB10
 
 // Timer Definitions
-// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
 #ifndef TIMER_TONE
   #define TIMER_TONE            TIM3
 #endif
diff --git a/variants/CH32V20x/CH32V203C6/PeripheralPins.c b/variants/CH32V20x/CH32V203C6/PeripheralPins.c
index c8e7e269..71a031d3 100644
--- a/variants/CH32V20x/CH32V203C6/PeripheralPins.c
+++ b/variants/CH32V20x/CH32V203C6/PeripheralPins.c
@@ -99,7 +99,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_13,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 1)}, // TIM1_CH1N
   {PB_14,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 2)}, // TIM1_CH2N
   {PA_15,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 3)}, // TIM1_CH3N
-  {NC,         NP,   0, 0, 0}
+  {NC,         NP,   0}
 };
 #endif
 
diff --git a/variants/CH32V20x/CH32V203C8/PeripheralPins.c b/variants/CH32V20x/CH32V203C8/PeripheralPins.c
index f0e964c9..306ede42 100644
--- a/variants/CH32V20x/CH32V203C8/PeripheralPins.c
+++ b/variants/CH32V20x/CH32V203C8/PeripheralPins.c
@@ -101,7 +101,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_13,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 1)}, // TIM1_CH1N
   {PB_14,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 2)}, // TIM1_CH2N
   {PA_15,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 3)}, // TIM1_CH3N
-  {NC,         NP,   0, 0, 0}
+  {NC,         NP,   0}
 };
 #endif
 
diff --git a/variants/CH32V20x/CH32V203G8/PeripheralPins.c b/variants/CH32V20x/CH32V203G8/PeripheralPins.c
index c15290cc..1771a648 100644
--- a/variants/CH32V20x/CH32V203G8/PeripheralPins.c
+++ b/variants/CH32V20x/CH32V203G8/PeripheralPins.c
@@ -48,7 +48,7 @@ WEAK const PinMap PinMap_ADC[] = {
   {PB_0_ALT1, ADC2, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 8)}, // ADC2_IN8
   {PB_1,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 9)}, // ADC1_IN9
   {PB_1_ALT1, ADC2, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 9)}, // ADC2_IN9
-  {NC,        NP,   0, 0, 0}
+  {NC,        NP,   0}
 };
 #endif
 
@@ -61,7 +61,7 @@ WEAK const PinMap PinMap_ADC[] = {
 WEAK const PinMap PinMap_I2C_SDA[] = {
   {PB_7, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_NONE)},
   {PB_9, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_Remap_I2C1_ENABLE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
@@ -69,7 +69,7 @@ WEAK const PinMap PinMap_I2C_SDA[] = {
 WEAK const PinMap PinMap_I2C_SCL[] = {
   {PB_6, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_NONE)},
   {PB_8, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_Remap_I2C1_ENABLE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
@@ -99,7 +99,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_13,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 1)}, // TIM1_CH1N
   {PB_14,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 2)}, // TIM1_CH2N
   {PA_15,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 3)}, // TIM1_CH3N
-  {NC,         NP,   0, 0, 0}
+  {NC,         NP,   0}
 };
 #endif
 
@@ -113,7 +113,7 @@ WEAK const PinMap PinMap_UART_TX[] = {
   {PC_10,USART3, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_FullRemap_USART3_ENABLE)},
   {PB_0, UART4,  CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
   {PA_5, UART4,  CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_FullRemap_USART4_ENABLE)},  
-  {NC,   NP,     0, 0}
+  {NC,   NP,     0}
 };
 #endif
 
@@ -126,7 +126,7 @@ WEAK const PinMap PinMap_UART_RX[] = {
   {PC_11, USART3, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_FullRemap_USART3_ENABLE)},
   {PB_1,  UART4,  CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},
   {PB_5,  UART4,  CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_FullRemap_USART4_ENABLE)},
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
@@ -136,7 +136,7 @@ WEAK const PinMap PinMap_UART_RTS[] = {
   {PA_1,  USART2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
   {PB_14, USART3, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
   {PB_4,  UART4,  CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},  
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
@@ -146,7 +146,7 @@ WEAK const PinMap PinMap_UART_CTS[] = {
   {PA_0,  USART2, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},
   {PB_13, USART3, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},
   {PB_3,  UART4,  CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},    
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
@@ -155,28 +155,28 @@ WEAK const PinMap PinMap_UART_CTS[] = {
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_MOSI[] = {
   {PA_7, SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_MISO[] = {
   {PA_6, SPI1, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_FLOAT, 0, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_SCLK[] = {
   {PA_5, SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_SSEL[] = {
   {PA_4,  SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
diff --git a/variants/CH32V20x/CH32V203RB/PeripheralPins.c b/variants/CH32V20x/CH32V203RB/PeripheralPins.c
index a2178a6e..8a4b6930 100644
--- a/variants/CH32V20x/CH32V203RB/PeripheralPins.c
+++ b/variants/CH32V20x/CH32V203RB/PeripheralPins.c
@@ -99,7 +99,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_13,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 1)}, // TIM1_CH1N
   {PB_14,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 2)}, // TIM1_CH2N
   {PA_15,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 3)}, // TIM1_CH3N
-  {NC,         NP,   0, 0, 0}
+  {NC,         NP,   0}
 };
 #endif
 
diff --git a/variants/CH32V30x/CH32V307VCT6/PeripheralPins.c b/variants/CH32V30x/CH32V307VCT6/PeripheralPins.c
index 8813d39a..e81892d4 100644
--- a/variants/CH32V30x/CH32V307VCT6/PeripheralPins.c
+++ b/variants/CH32V30x/CH32V307VCT6/PeripheralPins.c
@@ -40,7 +40,7 @@ WEAK const PinMap PinMap_ADC[] = {
   {PA_4_ALT1, ADC2, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 4)}, // ADC2_IN4
   {PA_5,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 5)}, // ADC1_IN5
   {PA_5_ALT1, ADC2, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 5)}, // ADC2_IN5
-  {NC,        NP,   0, 0, 0}
+  {NC,        NP,   0}
 };
 #endif
 
@@ -49,7 +49,7 @@ WEAK const PinMap PinMap_ADC[] = {
 WEAK const PinMap PinMap_DAC[] = {
   {PA_4_ALT2,      DAC, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 1)}, // DAC_Channel1
   {PA_5_ALT2,      DAC, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 2)}, // DAC_Channel2
-  {NC,        NP,   0, 0, 0}
+  {NC,        NP,   0}
 };
 #endif
 
@@ -58,14 +58,14 @@ WEAK const PinMap PinMap_DAC[] = {
 #ifdef I2C_MODULE_ENABLED
 WEAK const PinMap PinMap_I2C_SDA[] = {
   {PB_11, I2C2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
 #ifdef I2C_MODULE_ENABLED
 WEAK const PinMap PinMap_I2C_SCL[] = {
   {PB_10, I2C2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
@@ -96,7 +96,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PB_13,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 1)}, // TIM1_CH1N
   {PB_14,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 2)}, // TIM1_CH2N
   {PA_15,      TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 3)}, // TIM1_CH3N
-  {NC,         NP,   0, 0, 0}
+  {NC,         NP,   0}
 };
 #endif
 
@@ -104,28 +104,28 @@ WEAK const PinMap PinMap_TIM[] = {
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_TX[] = {
   {PA_9, USART1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,   NP,     0, 0}
+  {NC,   NP,     0}
 };
 #endif
 
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_RX[] = {
   {PA_10, USART1, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_RTS[] = {
   {NC, USART1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
 #ifdef UART_MODULE_ENABLED
 WEAK const PinMap PinMap_UART_CTS[] = {
   {NC, USART1, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},  
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
@@ -135,7 +135,7 @@ WEAK const PinMap PinMap_UART_CTS[] = {
 WEAK const PinMap PinMap_SPI_MOSI[] = {
   {PA_7,  SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
   {PB_15, SPI2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
@@ -143,7 +143,7 @@ WEAK const PinMap PinMap_SPI_MOSI[] = {
 WEAK const PinMap PinMap_SPI_MISO[] = {
   {PA_6,  SPI1, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_FLOAT, 0, AFIO_NONE)},
   {PB_14, SPI2, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_FLOAT, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
@@ -151,7 +151,7 @@ WEAK const PinMap PinMap_SPI_MISO[] = {
 WEAK const PinMap PinMap_SPI_SCLK[] = {
   {PA_5,  SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
   {PB_13, SPI2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
@@ -159,7 +159,7 @@ WEAK const PinMap PinMap_SPI_SCLK[] = {
 WEAK const PinMap PinMap_SPI_SSEL[] = {
   {PA_4,  SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
   {PB_12, SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif
 
diff --git a/variants/CH32VM00X/CH32V006K8/PeripheralPins.c b/variants/CH32VM00X/CH32V006K8/PeripheralPins.c
index a75421c0..caf4a150 100644
--- a/variants/CH32VM00X/CH32V006K8/PeripheralPins.c
+++ b/variants/CH32VM00X/CH32V006K8/PeripheralPins.c
@@ -36,7 +36,7 @@ WEAK const PinMap PinMap_ADC[] = {
   {PD_5,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 5)}, // ADC1_IN5
   {PD_6,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 6)}, // ADC1_IN6
   {PD_4,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 7)}, // ADC1_IN7
-  {NC,        NP,   0, 0, 0}
+  {NC,        NP,   0}
 };
 #endif
 
@@ -74,7 +74,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PD_0,       TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 1)}, // TIM1_CH1N
   {PA_2,       TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 2)}, // TIM1_CH2N
   {PD_1,       TIM1, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_Remap_TIM1_DISABLE, 3)}, // TIM1_CH3N
-  {NC,         NP,   0, 0, 0}
+  {NC,         NP,   0}
 };
 #endif
 
diff --git a/variants/CH32X035/CH32X035G8U/PeripheralPins.c b/variants/CH32X035/CH32X035G8U/PeripheralPins.c
index 250b2806..f1c221e6 100644
--- a/variants/CH32X035/CH32X035G8U/PeripheralPins.c
+++ b/variants/CH32X035/CH32X035G8U/PeripheralPins.c
@@ -40,7 +40,7 @@ WEAK const PinMap PinMap_ADC[] = {
   {PB_1,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 9)}, // ADC1_IN9
   {PC_0,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 10)}, // ADC1_IN8
   {PC_3,      ADC1, CH_PIN_DATA_EXT(CH_MODE_INPUT, CH_CNF_INPUT_ANALOG, 0, AFIO_NONE, 13)}, // ADC1_IN9
-  {NC,        NP,   0, 0, 0}
+  {NC,        NP,   0}
 };
 #endif
 
@@ -55,7 +55,7 @@ WEAK const PinMap PinMap_I2C_SDA[] = {
   {PC_18, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_PartialRemap3_I2C1_ENABLE)},
   {PC_16, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_PartialRemap4_I2C1_ENABLE)},
   {PC_19, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_FullRemap_I2C1_ENABLE)},  
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
@@ -65,7 +65,7 @@ WEAK const PinMap PinMap_I2C_SCL[] = {
   {PC_19, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_PartialRemap3_I2C1_ENABLE)},
   {PC_17, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_PartialRemap4_I2C1_ENABLE)},  
   {PC_18, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_FullRemap_I2C1_ENABLE)},  
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
@@ -93,7 +93,7 @@ WEAK const PinMap PinMap_TIM[] = {
   {PA_7,       TIM3, CH_PIN_DATA_EXT(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, NOPULL, AFIO_NONE, 2)}, // TIM2_CH3N_6
 
 
-  {NC,         NP,   0, 0, 0}
+  {NC,         NP,   0}
 };
 #endif
 
@@ -105,7 +105,7 @@ WEAK const PinMap PinMap_UART_TX[] = {
   {PB_3,  USART3, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
   {PB_0,  USART4, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
 
-  {NC,   NP,     0, 0}
+  {NC,   NP,     0}
 };
 #endif
 
@@ -115,7 +115,7 @@ WEAK const PinMap PinMap_UART_RX[] = {
   {PA_3,  USART2, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},
   {PB_4,  USART3, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},
   {PB_1,  USART4, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
@@ -125,7 +125,7 @@ WEAK const PinMap PinMap_UART_RTS[] = {
   {PA_1,  USART2, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
   {PB_7,  USART3, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
   {PA_8,  USART4, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
@@ -135,7 +135,7 @@ WEAK const PinMap PinMap_UART_CTS[] = {
   {PA_0,  USART2, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},  
   {PB_6,  USART3, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},  
   {PB_15, USART4, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_PUPD, PULLUP, AFIO_NONE)},  
-  {NC,    NP,     0, 0}
+  {NC,    NP,     0}
 };
 #endif
 
@@ -144,28 +144,28 @@ WEAK const PinMap PinMap_UART_CTS[] = {
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_MOSI[] = {
   {PA_7, SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_MISO[] = {
   {PA_6, SPI1, CH_PIN_DATA(CH_MODE_INPUT, CH_CNF_INPUT_FLOAT, 0, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_SCLK[] = {
   {PA_5, SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,   NP,   0, 0}
+  {NC,   NP,   0}
 };
 #endif
 
 #ifdef SPI_MODULE_ENABLED
 WEAK const PinMap PinMap_SPI_SSEL[] = {
   {PA_4,  SPI1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFPP, 0, AFIO_NONE)},
-  {NC,    NP,   0, 0}
+  {NC,    NP,   0}
 };
 #endif