add chips and fix bugs (#107)

1.add ch32v10x and ch32v00X(002/4/5/6/7)
2.fix some bugs

Author: TianpeiLee

boards.txt

@@ -64,16 +64,16 @@ HardwareTimer::HardwareTimer(TIM_TypeDef *instance)
   _timerObj.handle.Instance = nullptr;
   setup(instance);
 
-#ifdef TIM1_BASE
+#if defined(TIM1_BASE) 
   NVIC_EnableIRQ(TIM1_UP_IRQn);
   NVIC_EnableIRQ(TIM1_CC_IRQn);
 #endif
 
-#ifdef TIM2_BASE
+#ifdef TIM2_BASE 
   NVIC_EnableIRQ(TIM2_IRQn);
 #endif
 
-#ifdef TIM3_BASE
+#if defined(TIM3_BASE) && defined(TIM3_IRQn)  //v006 has no interruption
   NVIC_EnableIRQ(TIM3_IRQn);  
 #endif
 
@@ -1503,7 +1503,7 @@ uint32_t HardwareTimer::getTimerClkFreq()
   /* Get clock configuration */
   RCC_GetClocksFreq(&RCC_ClocksStatus);
 
-#if !defined(CH32V00x) && !defined(CH32X035)  
+#if !defined(CH32V00x) && !defined(CH32X035) && !defined(CH32VM00X)
   switch (getTimerClkSrc(_timerObj.handle.Instance)) 
   {
     case 1:

cores/arduino/HardwareTimer.cpp

@@ -10,6 +10,10 @@
 #include "../../../variants/CH32V00x/PinAF_CH32V00x.h"
 #endif
 
+#if defined(CH32VM00X)
+#include "../../../variants/CH32VM00X/PinAF_CH32V00X.h"
+#endif
+
 #if defined(CH32V10x)
 #include "../../../variants/CH32V10x/PinAF_CH32V10x.h"
 #endif
@@ -22,4 +26,8 @@
 #include "../../../variants/CH32V30x/PinAF_CH32V30x.h"
 #endif
 
+#if defined(CH32L10x)
+#include "../../../variants/CH32L10x/PinAF_CH32L10x.h"
+#endif
+
 #endif /* _PINAF_CH32YYXX_H */

cores/arduino/ch32/PinAF_ch32yyxx.h

@@ -62,48 +62,80 @@ GPIO_TypeDef *set_GPIO_Port_Clock(uint32_t port_idx)
   switch (port_idx) {
     case PortA:
       gpioPort = GPIOA;
+      #if defined(CH32L10x) || defined(CH32VM00X)
+      RCC_PB2PeriphClockCmd(RCC_PB2Periph_GPIOA, ENABLE);
+      #else
       RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE);
+      #endif
       break;
 #if defined GPIOB_BASE      
     case PortB:
       gpioPort = GPIOB;
+      #if defined(CH32L10x) || defined(CH32VM00X)
+      RCC_PB2PeriphClockCmd(RCC_PB2Periph_GPIOB, ENABLE);      
+      #else
       RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB, ENABLE);
+      #endif
       break;
 #endif       
 #if defined GPIOC_BASE
     case PortC:
       gpioPort = GPIOC;
+      #if defined(CH32L10x) || defined(CH32VM00X)
+      RCC_PB2PeriphClockCmd(RCC_PB2Periph_GPIOC, ENABLE);
+      #else
       RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC, ENABLE);
+      #endif
       break;
 #endif
 #if defined GPIOD_BASE
     case PortD:
       gpioPort = GPIOD;
+      #if defined(CH32L10x) || defined(CH32VM00X)
+      RCC_PB2PeriphClockCmd(RCC_PB2Periph_GPIOD, ENABLE);          
+      #else
       RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOD, ENABLE);
+      #endif
       break;
 #endif
 #if defined GPIOE_BASE
     case PortE:
       gpioPort = GPIOE;
+      #if defined(CH32L10x) 
+      RCC_PB2PeriphClockCmd(RCC_PB2Periph_GPIOE, ENABLE);
+      #else
       RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOE, ENABLE);
+      #endif      
       break;
 #endif
 #if defined RCC_APB2Periph_GPIOF
     case PortF:
       gpioPort = GPIOF;
+      #if defined(CH32L10x) 
+      RCC_PB2PeriphClockCmd(RCC_PB2Periph_GPIOF, ENABLE);      
+      #else 
       RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOF, ENABLE);
+      #endif    
       break;
 #endif
 #if defined RCC_APB2Periph_GPIOG
     case PortG:
       gpioPort = GPIOG;
+      #if defined(CH32L10x)      
+      RCC_PB2PeriphClockCmd(RCC_PB2Periph_GPIOG, ENABLE);
+      #else
       RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOG, ENABLE);
+      #endif
       break;
 #endif
 #if defined RCC_APB2Periph_GPIOH
     case PortH:
       gpioPort = GPIOH;
-      RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOH, ENABLE);
+      #if defined(CH32L10x)
+      RCC_PB2PeriphClockCmd(RCC_PB2Periph_GPIOH, ENABLE);
+      #else
+      RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOH, ENABLE);      
+      #endif
       break;
 #endif
     default:

cores/arduino/ch32/PortNames.c

@@ -31,32 +31,86 @@ static int calibration_value = 0;
 /* Private_Defines */
 #if defined(ADC_MODULE_ENABLED) && !defined(ADC_MODULE_ONLY)
 
-#if (defined(CH32V20x) || defined(CH32V30x) || defined(CH32V30x_C) || defined(CH32V10x) )
+#if (defined(CH32V20x) || defined(CH32V30x) || defined(CH32V30x_C) || defined(CH32V10x) || defined(CH32L10x) || defined(CH32VM00X) )
 
 /* Default to use maximum sampling period */
+#if defined(CH32L10x) || defined(CH32VM00X)
+
 #ifndef ADC_SAMPLINGTIME
-#if defined(ADC_SampleTime_239Cycles5)
-#define ADC_SAMPLINGTIME        ADC_SampleTime_239Cycles5;
+#if defined(ADC_SampleTime_CyclesMode7) 
+#define ADC_SAMPLINGTIME        ADC_SampleTime_CyclesMode7
+#elif defined(ADC_SampleTime_CyclesMode6)
+#define ADC_SAMPLINGTIME        ADC_SampleTime_CyclesMode6
+#elif defined(ADC_SampleTime_CyclesMode5)
+#define ADC_SAMPLINGTIME        ADC_SampleTime_CyclesMode5
+#elif defined(ADC_SampleTime_CyclesMode4)
+#define ADC_SAMPLINGTIME        ADC_SampleTime_CyclesMode4
+#elif defined(ADC_SampleTime_CyclesMode3)
+#define ADC_SAMPLINGTIME        ADC_SampleTime_CyclesMode3
+#elif defined(ADC_SampleTime_CyclesMode2)
+#define ADC_SAMPLINGTIME        ADC_SampleTime_CyclesMode2
+#elif defined(ADC_SampleTime_CyclesMode1)
+#define ADC_SAMPLINGTIME        ADC_SampleTime_CyclesMode1
+#elif defined(ADC_SampleTime_CyclesMode0)
+#define ADC_SAMPLINGTIME        ADC_SampleTime_CyclesMode0
+#endif
+#endif /* !ADC_SAMPLINGTIME */
+
+#else
+
+#ifndef ADC_SAMPLINGTIME
+#if defined(ADC_SampleTime_239Cycles5) 
+#define ADC_SAMPLINGTIME        ADC_SampleTime_239Cycles5
 #elif defined(ADC_SampleTime_71Cycles5)
-#define ADC_SAMPLINGTIME        ADC_SampleTime_71Cycles5;
+#define ADC_SAMPLINGTIME        ADC_SampleTime_71Cycles5
 #elif defined(ADC_SampleTime_55Cycles5)
-#define ADC_SAMPLINGTIME        ADC_SampleTime_55Cycles5;
+#define ADC_SAMPLINGTIME        ADC_SampleTime_55Cycles5
 #elif defined(ADC_SampleTime_41Cycles5)
-#define ADC_SAMPLINGTIME        ADC_SampleTime_41Cycles5;
+#define ADC_SAMPLINGTIME        ADC_SampleTime_41Cycles5
 #elif defined(ADC_SampleTime_28Cycles5)
-#define ADC_SAMPLINGTIME        ADC_SampleTime_28Cycles5;
+#define ADC_SAMPLINGTIME        ADC_SampleTime_28Cycles5
 #elif defined(ADC_SampleTime_13Cycles5)
-#define ADC_SAMPLINGTIME        ADC_SampleTime_13Cycles5;
+#define ADC_SAMPLINGTIME        ADC_SampleTime_13Cycles5
 #elif defined(ADC_SampleTime_7Cycles5)
-#define ADC_SAMPLINGTIME        ADC_SampleTime_7Cycles5;
+#define ADC_SAMPLINGTIME        ADC_SampleTime_7Cycles5
 #elif defined(ADC_SampleTime_1Cycles5)
 #define ADC_SAMPLINGTIME        ADC_SampleTime_1Cycles5
 #endif
 #endif /* !ADC_SAMPLINGTIME */
 
+#endif /* CH32L10x */
+
+
 /*
  * Default to use maximum sampling period 
  */
+
+#if defined(CH32L10x) || defined(CH32VM00X)
+
+#ifndef ADC_SAMPLINGTIME_INTERNAL
+#if defined(ADC_SampleTime_CyclesMode7)
+#define ADC_SAMPLINGTIME_INTERNAL ADC_SampleTime_CyclesMode7
+#elif defined(ADC_SampleTime_CyclesMode6)
+#define ADC_SAMPLINGTIME_INTERNAL ADC_SampleTime_CyclesMode6
+#elif defined(ADC_SampleTime_CyclesMode5)
+#define ADC_SAMPLINGTIME_INTERNAL ADC_SampleTime_CyclesMode5
+#elif defined(ADC_SampleTime_CyclesMode4)
+#define ADC_SAMPLINGTIME_INTERNAL ADC_SampleTime_CyclesMode4
+#elif defined(ADC_SampleTime_CyclesMode3)
+#define ADC_SAMPLINGTIME_INTERNAL ADC_SampleTime_CyclesMode3
+#elif defined(ADC_SampleTime_CyclesMode2)
+#define ADC_SAMPLINGTIME_INTERNAL ADC_SampleTime_CyclesMode2
+#elif defined(ADC_SampleTime_CyclesMode1)
+#define ADC_SAMPLINGTIME_INTERNAL ADC_SampleTime_CyclesMode1
+#elif defined(ADC_SampleTime_CyclesMode0)
+#define ADC_SAMPLINGTIME_INTERNAL ADC_SampleTime_CyclesMode0
+#else
+#error "ADC sampling time could not be defined for internal channels!"
+#endif
+#endif /* !ADC_SAMPLINGTIME_INTERNAL */
+
+#else
+
 #ifndef ADC_SAMPLINGTIME_INTERNAL
 #if defined(ADC_SampleTime_239Cycles5)
 #define ADC_SAMPLINGTIME_INTERNAL ADC_SampleTime_239Cycles5
@@ -79,6 +133,11 @@ static int calibration_value = 0;
 #endif
 #endif /* !ADC_SAMPLINGTIME_INTERNAL */
 
+
+#endif
+
+
+
 #ifndef ADC_CLOCK_DIV
 #ifdef RCC_PCLK2_Div8
 #define ADC_CLOCK_DIV       RCC_PCLK2_Div8
@@ -264,13 +323,17 @@ uint32_t get_adc_channel(PinName pin)
     case 8:
       channel = ADC_Channel_8;
       break;
+#ifdef ADC_Channel_9  
     case 9:
       channel = ADC_Channel_9;
       break;
+#endif
 #ifdef ADC_Channel_10      
     case 10:
       channel = ADC_Channel_10;
       break;   
+#endif
+#ifdef ADC_Channel_11      
     case 11:
       channel = ADC_Channel_11;
       break;
@@ -423,8 +486,13 @@ void dac_write_value(PinName pin, uint32_t value, uint8_t do_init)
 
   if (do_init == 1) 
   {
+   #if defined(CH32L10x)
+    RCC_PB2PeriphClockCmd(RCC_PB2Periph_GPIOA, ENABLE );
+	  RCC_PB1PeriphClockCmd(RCC_PB1Periph_DAC, ENABLE );   
+   #else
     RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE );
 	  RCC_APB1PeriphClockCmd(RCC_APB1Periph_DAC, ENABLE );
+   #endif
     /*##-1- Configure the DAC peripheral */
     g_current_pin = pin;
 
@@ -503,13 +571,21 @@ void ADC_Clock_EN(ADC_TypeDef *padc)
      #ifdef RCC_APB2Periph_ADC1
       	RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1	, ENABLE );	  //ENABLE ADC1 Clock
      #endif 
+
+     #ifdef RCC_PB2Periph_ADC1
+     RCC_PB2PeriphClockCmd(RCC_PB2Periph_ADC1	, ENABLE );	  //ENABLE ADC1 Clock for CH32L10x
+     #endif
   }
 #ifdef ADC2
   else if(padc == ADC2) 
   {
       #ifdef RCC_APB2Periph_ADC2
-        RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC2  , ENABLE );   //ENABLE ADC2 Clock 
+      RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC2  , ENABLE );   //ENABLE ADC2 Clock 
       #endif 
+
+      #ifdef RCC_PB2Periph_ADC2
+      RCC_PB2PeriphClockCmd(RCC_PB2Periph_ADC2  , ENABLE );   //ENABLE ADC2 Clock for CH32L10x      
+      #endif
   }
 #endif
   /* Configure ADC GPIO pin */
@@ -582,7 +658,7 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
   ADC_InitStructure.ADC_ContinuousConvMode   = DISABLE;
   ADC_InitStructure.ADC_NbrOfChannel         = 1; 
   ADC_InitStructure.ADC_ExternalTrigConv     = ADC_ExternalTrigConv_None;
- #if !defined(CH32V00x) && !defined(CH32V10x) 
+ #if !defined(CH32V00x) && !defined(CH32V10x)  && !defined(CH32VM00X)
   ADC_InitStructure.ADC_OutputBuffer         = ENABLE;
 #endif
   ADC_Init(padc, &ADC_InitStructure);

cores/arduino/ch32/analog.cpp

@@ -49,13 +49,21 @@ static inline void resetBackupDomain(void)
 static inline void enableBackupDomain(void)
 {
 #ifdef PWR_MODULE_ENABLED
+#if defined(CH32L10x)
+  RCC_PB1PeriphClockCmd(RCC_PB1Periph_PWR,ENABLE);
+#else
   RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR,ENABLE);
+#endif
   /* Allow access to Backup domain */
   PWR_BackupAccessCmd(ENABLE);
 #endif
 #ifdef RCC_APB1Periph_BKP
   /* Enable BKP CLK for backup registers */
+  #if defined(CH32L10x)
+  RCC_PB1PeriphClockCmd(RCC_PB1Periph_BKP, ENABLE);  
+  #else
   RCC_APB1PeriphClockCmd(RCC_APB1Periph_BKP, ENABLE);
+  #endif
 #endif
 }
 
@@ -64,11 +72,19 @@ static inline void disableBackupDomain(void)
 #ifdef PWR_MODULE_ENABLED
   /* Forbid access to Backup domain */
   PWR_BackupAccessCmd(DISABLE);
+  #if defined(CH32L10x)  
+  RCC_PB1PeriphClockCmd(RCC_PB1Periph_PWR, DISABLE);
+  #else
   RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, DISABLE);
+  #endif
 #endif
 #ifdef RCC_APB1Periph_BKP
   /* Disable BKP CLK for backup registers */
+  #if defined(CH32L10x)
+  RCC_PB1PeriphClockCmd(RCC_PB1Periph_BKP, DISABLE);
+  #else
   RCC_APB1PeriphClockCmd(RCC_APB1Periph_BKP, DISABLE);
+  #endif
 #endif
 }
 

cores/arduino/ch32/backup.h

@@ -34,6 +34,10 @@
   #include "ch32v00x.h" 
 #elif defined(CH32X035)
 #include "ch32x035.h" 
+#elif defined(CH32L10x)
+#include "ch32l103.h"
+#elif defined(CH32VM00X)
+#include "ch32v00X.h"
 #else 
   #error "CH32YYXX chip series is not defined in boards.txt."
 #endif

cores/arduino/ch32/ch32_def.h

@@ -5,6 +5,8 @@
 
   #if defined(CH32V00x)
      #define  COM_STARTUP_FILE "startup_ch32v00x.S"
+  #elif defined(CH32VM00X)
+     #define  COM_STARTUP_FILE "startup_ch32v00X.S"
   #elif defined(CH32X035)
      #define  COM_STARTUP_FILE "startup_ch32x035.S"
 
@@ -29,6 +31,9 @@
   #elif defined(CH32V30x)
       #define COM_STARTUP_FILE "startup_ch32v30x_D8.S"
       #define CH32V30x_D8
+
+  #elif defined(CH32L10x)  
+      #define  COM_STARTUP_FILE  "startup_ch32l103.S"   
   #else
     #error "Unknow chip!"
   #endif

cores/arduino/ch32/ch32_def_build.h

@@ -49,7 +49,7 @@ uint32_t getCurrentMillis(void)
 
 
 
-#if defined(CH32V20x) || defined(CH32V30x) || defined(CH32V30x_C) || defined(CH32V00x) || defined(CH32X035)
+#if defined(CH32V20x) || defined(CH32V30x) || defined(CH32V30x_C) || defined(CH32V00x) || defined(CH32X035) || defined(CH32L10x) || defined(CH32VM00X)
 
 uint32_t getCurrentMicros(void)
 {