From 66c6774dd944f87c3809f1f93a1777df4e721a15 Mon Sep 17 00:00:00 2001 From: chenyingchun0312 Date: Tue, 10 Aug 2021 10:54:58 +0800 Subject: [bsp/stm32l496-st-nucleo] add usb device cdc configration --- bsp/stm32/stm32l496-st-nucleo/README_zh.md | 4 + .../stm32l496-st-nucleo/applications/SConscript | 8 +- .../stm32l496-st-nucleo/applications/uart_sample.c | 101 +++++++++++++++++++++ bsp/stm32/stm32l496-st-nucleo/board/Kconfig | 5 + 4 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 bsp/stm32/stm32l496-st-nucleo/applications/uart_sample.c diff --git a/bsp/stm32/stm32l496-st-nucleo/README_zh.md b/bsp/stm32/stm32l496-st-nucleo/README_zh.md index d07e0e83c8..90a2f03160 100644 --- a/bsp/stm32/stm32l496-st-nucleo/README_zh.md +++ b/bsp/stm32/stm32l496-st-nucleo/README_zh.md @@ -96,6 +96,10 @@ msh > 本章节更多详细的介绍请参考 [STM32 系列 BSP 外设驱动使用教程](../docs/STM32系列BSP外设驱动使用教程.md)。 + + +5. USBD CDC使用，参考文章[STM32L496 USB CDC适配](https://club.rt-thread.org/ask/article/2959.html) + ## 注意事项 - 开机时如果不能打印 RT-Thread 版本信息，请重新选择 PC 端串口调试软件的串口号或将 BSP 中串口的 GPIO 速率调低 diff --git a/bsp/stm32/stm32l496-st-nucleo/applications/SConscript b/bsp/stm32/stm32l496-st-nucleo/applications/SConscript index f45bd21bc2..27ddfc3b47 100644 --- a/bsp/stm32/stm32l496-st-nucleo/applications/SConscript +++ b/bsp/stm32/stm32l496-st-nucleo/applications/SConscript @@ -6,11 +6,9 @@ src = Split(''' main.c ''') -if GetDepend(['BSP_USING_SPI_LCD']): - src += ['lcd_sample.c'] - -if GetDepend(['PKG_USING_NRF24L01']): - src += ['nrf24l01_init.c'] +if GetDepend(['BSP_USING_USBD']): + if GetDepend(['RT_USB_DEVICE_CDC']): + src += ['uart_sample.c'] CPPPATH = [str(Dir('#')), cwd] diff --git a/bsp/stm32/stm32l496-st-nucleo/applications/uart_sample.c b/bsp/stm32/stm32l496-st-nucleo/applications/uart_sample.c new file mode 100644 index 0000000000..e87079e74e --- /dev/null +++ b/bsp/stm32/stm32l496-st-nucleo/applications/uart_sample.c @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2006-2018, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2018-08-15 misonyo first implementation. + */ +/* + * 程序清单：这是一个 串口 设备使用例程 + * 例程导出了 uart_sample 命令到控制终端 + * 命令调用格式：uart_sample uart2 + * 命令解释：命令第二个参数是要使用的串口设备名称，为空则使用默认的串口设备 + * 程序功能：通过串口输出字符串"hello RT-Thread!"，然后错位输出输入的字符 +*/ + +#include + +#define SAMPLE_UART_NAME "vcom" /* 串口设备名称 */ + +/* 用于接收消息的信号量 */ +static struct rt_semaphore rx_sem; +static rt_device_t serial; + +/* 接收数据回调函数 */ +static rt_err_t uart_input(rt_device_t dev, rt_size_t size) +{ + /* 串口接收到数据后产生中断，调用此回调函数，然后发送接收信号量 */ + rt_sem_release(&rx_sem); + + return RT_EOK; +} + +static void serial_thread_entry(void *parameter) +{ + char ch; + + while (1) + { + /* 从串口读取一个字节的数据，没有读取到则等待接收信号量 */ + while (rt_device_read(serial, -1, &ch, 1) != 1) + { + /* 阻塞等待接收信号量，等到信号量后再次读取数据 */ + rt_sem_take(&rx_sem, RT_WAITING_FOREVER); + } + /* 读取到的数据通过串口错位输出 */ + ch = ch + 1; + rt_device_write(serial, 0, &ch, 1); + } +} + +static int uart_sample(int argc, char *argv[]) +{ + rt_err_t ret = RT_EOK; + char uart_name[RT_NAME_MAX]; + char str[] = "hello RT-Thread!\r\n"; + + if (argc == 2) + { + rt_strncpy(uart_name, argv[1], RT_NAME_MAX); + } + else + { + rt_strncpy(uart_name, SAMPLE_UART_NAME, RT_NAME_MAX); + } + + /* 查找串口设备 */ + serial = rt_device_find(uart_name); + if (!serial) + { + rt_kprintf("find %s failed!\n", uart_name); + return RT_ERROR; + } + + /* 初始化信号量 */ + rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO); + /* 以中断接收及轮询发送方式打开串口设备 */ + rt_device_open(serial, RT_DEVICE_FLAG_INT_RX); + //rt_device_open(serial, RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX); + /* 设置接收回调函数 */ + rt_device_set_rx_indicate(serial, uart_input); + /* 发送字符串 */ + rt_device_write(serial, 0, str, (sizeof(str) - 1)); + + /* 创建 serial 线程 */ + rt_thread_t thread = rt_thread_create("serial", serial_thread_entry, RT_NULL, 1024, 25, 10); + /* 创建成功则启动线程 */ + if (thread != RT_NULL) + { + rt_thread_startup(thread); + } + else + { + ret = RT_ERROR; + } + + return ret; +} +/* 导出到 msh 命令列表中 */ +MSH_CMD_EXPORT(uart_sample, uart device sample); diff --git a/bsp/stm32/stm32l496-st-nucleo/board/Kconfig b/bsp/stm32/stm32l496-st-nucleo/board/Kconfig index 10594671ea..6a2a2c0b4c 100644 --- a/bsp/stm32/stm32l496-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l496-st-nucleo/board/Kconfig @@ -60,6 +60,11 @@ menu "On-chip Peripheral Drivers" config BSP_USING_ON_CHIP_FLASH bool "Enable on-chip FLASH" default n + + config BSP_USING_USBD + bool "Enable OTGFS as USB device" + select RT_USING_USB_DEVICE + default n source "../libraries/HAL_Drivers/Kconfig" -- cgit v1.3.1 From 7f8e4ee108e4f1a5212356dce68d7f186f3deb42 Mon Sep 17 00:00:00 2001 From: chenyingchun0312 Date: Wed, 11 Aug 2021 09:27:12 +0800 Subject: [bsp/stm32l496-st-nucleo] update SConscript && remove uart_sample.c --- .../stm32l496-st-nucleo/applications/SConscript | 4 - .../stm32l496-st-nucleo/applications/uart_sample.c | 101 --------------------- 2 files changed, 105 deletions(-) delete mode 100644 bsp/stm32/stm32l496-st-nucleo/applications/uart_sample.c diff --git a/bsp/stm32/stm32l496-st-nucleo/applications/SConscript b/bsp/stm32/stm32l496-st-nucleo/applications/SConscript index 27ddfc3b47..a868c92232 100644 --- a/bsp/stm32/stm32l496-st-nucleo/applications/SConscript +++ b/bsp/stm32/stm32l496-st-nucleo/applications/SConscript @@ -6,10 +6,6 @@ src = Split(''' main.c ''') -if GetDepend(['BSP_USING_USBD']): - if GetDepend(['RT_USB_DEVICE_CDC']): - src += ['uart_sample.c'] - CPPPATH = [str(Dir('#')), cwd] group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/stm32/stm32l496-st-nucleo/applications/uart_sample.c b/bsp/stm32/stm32l496-st-nucleo/applications/uart_sample.c deleted file mode 100644 index e87079e74e..0000000000 --- a/bsp/stm32/stm32l496-st-nucleo/applications/uart_sample.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2006-2018, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2018-08-15 misonyo first implementation. - */ -/* - * 程序清单：这是一个 串口 设备使用例程 - * 例程导出了 uart_sample 命令到控制终端 - * 命令调用格式：uart_sample uart2 - * 命令解释：命令第二个参数是要使用的串口设备名称，为空则使用默认的串口设备 - * 程序功能：通过串口输出字符串"hello RT-Thread!"，然后错位输出输入的字符 -*/ - -#include - -#define SAMPLE_UART_NAME "vcom" /* 串口设备名称 */ - -/* 用于接收消息的信号量 */ -static struct rt_semaphore rx_sem; -static rt_device_t serial; - -/* 接收数据回调函数 */ -static rt_err_t uart_input(rt_device_t dev, rt_size_t size) -{ - /* 串口接收到数据后产生中断，调用此回调函数，然后发送接收信号量 */ - rt_sem_release(&rx_sem); - - return RT_EOK; -} - -static void serial_thread_entry(void *parameter) -{ - char ch; - - while (1) - { - /* 从串口读取一个字节的数据，没有读取到则等待接收信号量 */ - while (rt_device_read(serial, -1, &ch, 1) != 1) - { - /* 阻塞等待接收信号量，等到信号量后再次读取数据 */ - rt_sem_take(&rx_sem, RT_WAITING_FOREVER); - } - /* 读取到的数据通过串口错位输出 */ - ch = ch + 1; - rt_device_write(serial, 0, &ch, 1); - } -} - -static int uart_sample(int argc, char *argv[]) -{ - rt_err_t ret = RT_EOK; - char uart_name[RT_NAME_MAX]; - char str[] = "hello RT-Thread!\r\n"; - - if (argc == 2) - { - rt_strncpy(uart_name, argv[1], RT_NAME_MAX); - } - else - { - rt_strncpy(uart_name, SAMPLE_UART_NAME, RT_NAME_MAX); - } - - /* 查找串口设备 */ - serial = rt_device_find(uart_name); - if (!serial) - { - rt_kprintf("find %s failed!\n", uart_name); - return RT_ERROR; - } - - /* 初始化信号量 */ - rt_sem_init(&rx_sem, "rx_sem", 0, RT_IPC_FLAG_FIFO); - /* 以中断接收及轮询发送方式打开串口设备 */ - rt_device_open(serial, RT_DEVICE_FLAG_INT_RX); - //rt_device_open(serial, RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX); - /* 设置接收回调函数 */ - rt_device_set_rx_indicate(serial, uart_input); - /* 发送字符串 */ - rt_device_write(serial, 0, str, (sizeof(str) - 1)); - - /* 创建 serial 线程 */ - rt_thread_t thread = rt_thread_create("serial", serial_thread_entry, RT_NULL, 1024, 25, 10); - /* 创建成功则启动线程 */ - if (thread != RT_NULL) - { - rt_thread_startup(thread); - } - else - { - ret = RT_ERROR; - } - - return ret; -} -/* 导出到 msh 命令列表中 */ -MSH_CMD_EXPORT(uart_sample, uart device sample); -- cgit v1.3.1