同步gitee，fix bug，release 1.0.3

liuhy-2020 · Nov 4, 2021 · 2e80f27 · 2e80f27
1 parent 09cc1f3
commit 2e80f27
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/RealThread_ES32F3.yaml b/RealThread_ES32F3.yaml
@@ -2,7 +2,7 @@
 vendor: RealThread
 dvendor: essemi
 name: ES32F3
-version: 1.0.2
+version: 1.0.3
 yaml_version: 1
 type: Chip_Support_Packages
 family_name: ES32

diff --git a/drivers/rtt/ES/es_conf_info_map.h b/drivers/rtt/ES/es_conf_info_map.h
@@ -343,7 +343,7 @@ static const struct pin_index pins[] =
 #endif
 
 #if  ( defined(CHIP_NAME_ES32F3656LT) || defined(CHIP_NAME_ES32F3656LX) ||\
-       defined(CHIP_NAME_ES32F3696LX) || defined(CHIP_NAME_ES32F3696LX) )
+       defined(CHIP_NAME_ES32F3696LT) || defined(CHIP_NAME_ES32F3696LX) )
 
 #define ES_GPIO_ADC_CH0_GPIO     GPIOC
 #define ES_GPIO_ADC_CH1_GPIO     GPIOC

diff --git a/drivers/rtt/drv_example/uart_dma_sample.c b/drivers/rtt/drv_example/uart_dma_sample.c
@@ -34,8 +34,8 @@ static rt_err_t duart_input(rt_device_t dev, rt_size_t size)
 static void dserial_thread_entry(void *parameter)
 {
     char buf[17];
-    uint32_t len;
-    uint32_t i;
+    rt_uint32_t len;
+    rt_uint32_t i;
     while (1)
     {
         /* 从串口读取一个字节的数据，没有读取到则等待接收信号量 */
@@ -101,7 +101,7 @@ static int duart(int argc, char *argv[])
     {
         rt_kprintf("error open serial\n");
         rt_device_close(dserial);
-        dserial = NULL;
+        dserial = RT_NULL;
         return -1;
     }
 

diff --git a/drivers/rtt/drv_uart.c b/drivers/rtt/drv_uart.c
@@ -246,7 +246,7 @@ struct es32_uart uart2 =
     {UART2},
     &serial2,
     UART2_IRQn,
-#ifdef RT_USING_SERIAL
+#ifdef RT_SERIAL_USING_DMA
     UART2_DMATX_CHANNEL,
     UART2_DMARX_CHANNEL
 #endif /* RT_SERIAL_USING_DMA */