caixiang
/
dtu_4g
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: enable stable USB VCOM logging

dev-rebuild
蔡享 1 month ago
parent
25026c869e
commit
334c0b057e
9 changed files with 269 additions and 170 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      .config
  2. 12
      applications/VK_Client.c
  3. 26
      applications/VK_Log.c
  4. 19
      applications/main.c
  5. 5
      board/CubeMX_Config/Src/stm32f1xx_hal_msp.c
  6. 4
      libraries/HAL_Drivers/drivers/drv_usbd.c
  7. 251
      project.uvprojx
  8. 20
      rtconfig.h

32
.config
View File

@ -92,7 +92,7 @@ CONFIG_ARCH_ARM_CORTEX_M3=y
#
CONFIG_RT_USING_COMPONENTS_INIT=y
CONFIG_RT_USING_USER_MAIN=y
CONFIG_RT_MAIN_THREAD_STACK_SIZE=1536
CONFIG_RT_MAIN_THREAD_STACK_SIZE=1024
CONFIG_RT_MAIN_THREAD_PRIORITY=10
# CONFIG_RT_USING_LEGACY is not set
@ -149,8 +149,28 @@ CONFIG_RT_USING_PIN=y
#
# Using USB
#
CONFIG_RT_USING_USB=y
# CONFIG_RT_USING_USB_HOST is not set
# CONFIG_RT_USING_USB_DEVICE is not set
CONFIG_RT_USING_USB_DEVICE=y
CONFIG_RT_USBD_THREAD_STACK_SZ=1024
CONFIG_USB_VENDOR_ID=0x0FFE
CONFIG_USB_PRODUCT_ID=0x0001
# CONFIG_RT_USB_DEVICE_COMPOSITE is not set
# CONFIG__RT_USB_DEVICE_NONE is not set
CONFIG__RT_USB_DEVICE_CDC=y
# CONFIG__RT_USB_DEVICE_MSTORAGE is not set
# CONFIG__RT_USB_DEVICE_HID is not set
# CONFIG__RT_USB_DEVICE_RNDIS is not set
# CONFIG__RT_USB_DEVICE_ECM is not set
# CONFIG__RT_USB_DEVICE_WINUSB is not set
# CONFIG__RT_USB_DEVICE_AUDIO is not set
CONFIG_RT_USB_DEVICE_CDC=y
CONFIG_RT_VCOM_TASK_STK_SIZE=1024
CONFIG_RT_CDC_RX_BUFSIZE=128
# CONFIG_RT_VCOM_TX_USE_DMA is not set
CONFIG_RT_VCOM_SERNO="32021919830108"
CONFIG_RT_VCOM_SER_LEN=14
CONFIG_RT_VCOM_TX_TIMEOUT=1000
# end of Using USB
# end of Device Drivers
@ -229,11 +249,7 @@ CONFIG_ULOG_OUTPUT_LVL=7
CONFIG_ULOG_USING_ISR_LOG=y
CONFIG_ULOG_ASSERT_ENABLE=y
CONFIG_ULOG_LINE_BUF_SIZE=128
CONFIG_ULOG_USING_ASYNC_OUTPUT=y
CONFIG_ULOG_ASYNC_OUTPUT_BUF_SIZE=512
CONFIG_ULOG_ASYNC_OUTPUT_BY_THREAD=y
CONFIG_ULOG_ASYNC_OUTPUT_THREAD_STACK=1024
CONFIG_ULOG_ASYNC_OUTPUT_THREAD_PRIORITY=20
# CONFIG_ULOG_USING_ASYNC_OUTPUT is not set
#
# log format
@ -1290,7 +1306,7 @@ CONFIG_SOC_SERIES_STM32F1=y
# On-chip Peripheral Drivers
#
CONFIG_BSP_USING_GPIO=y
# CONFIG_BSP_USING_USBD is not set
CONFIG_BSP_USING_USBD=y
CONFIG_BSP_USING_UART=y
CONFIG_BSP_USING_UART1=y
# CONFIG_BSP_UART1_RX_USING_DMA is not set

12
applications/VK_Client.c
View File

@ -8,9 +8,21 @@
#include "rtdef.h"
#include "rtthread.h"
#include "rttypes.h"
#if defined(__CC_ARM) && !defined(__clang__)
#define VK_MAVLINK_DO_PRAGMA(x) _Pragma(#x)
#define __pragma(x) VK_MAVLINK_DO_PRAGMA(x)
#pragma anon_unions
#endif
#include "VKFly/mavlink.h"
#include "mavlink_helpers.h"
#if defined(__CC_ARM) && !defined(__clang__)
#undef __pragma
#undef VK_MAVLINK_DO_PRAGMA
#endif
#define DBG_TAG "LINK_LOG"
#define DBG_LVL DBG_INFO
#include "rtdbg.h"

26
applications/VK_Log.c
View File

@ -1,29 +1,37 @@
#include "VK_Log.h"
#include <ulog.h>
static struct ulog_backend dev_backend;
static struct ulog_backend vcom_backend;
static rt_device_t log_dev = RT_NULL;
static void dev_log_output(struct ulog_backend *backend,
static void vcom_log_output(struct ulog_backend *backend,
rt_uint32_t level,
const char *tag,
rt_bool_t is_raw,
const char *log,
size_t len)
{
(void)backend;
(void)level;
(void)tag;
(void)is_raw;
if (log_dev != RT_NULL && len > 0)
{
rt_device_write(log_dev, 0, log, len);
(void)rt_device_write(log_dev, 0, log, len);
}
}
int dev_log_backend_init(rt_device_t dev)
{
if (dev == RT_NULL)
{
return -RT_EINVAL;
}
int dev_log_backend_init(rt_device_t dev){
log_dev = dev;
rt_memset(&dev_backend, 0 , sizeof(dev_backend));
dev_backend.output = dev_log_output;
rt_memset(&vcom_backend, 0, sizeof(vcom_backend));
vcom_backend.output = vcom_log_output;
return ulog_backend_register(&dev_backend, "uart3", RT_FALSE);
return ulog_backend_register(&vcom_backend, "vcom", RT_FALSE);
}

19
applications/main.c
View File

@ -21,7 +21,7 @@
#include "drv_ec800k.h"
#include "VK_Log.h"
static rt_device_t u2, u3;
static rt_device_t u2, u3, vcom;
static void task_let_entry(void *arg) { client_task(); }
@ -29,24 +29,31 @@ static void task_com_entry(void *arg) { com_task(); }
int main(void) {
// rt_device_t vcom = rt_device_find("vcom");
// rt_device_open(vcom, RT_DEVICE_FLAG_RDWR);
// rt_console_set_device("vcom");
/* Bring up diagnostics before UART initialization can fail. */
vcom = rt_device_find("vcom");
if (vcom != RT_NULL &&
rt_device_open(vcom, RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_STREAM) == RT_EOK) {
dev_log_backend_init(vcom);
}
u3 = rt_device_find("uart3");
if (u3 == RT_NULL) {
return -RT_ERROR;
}
rt_device_open(u3, RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_INT_TX |
RT_DEVICE_FLAG_RX_NON_BLOCKING |
RT_DEVICE_FLAG_TX_BLOCKING);
fmu_com_register(u3);
u2 = rt_device_find("uart2");
if (u2 == RT_NULL) {
return -RT_ERROR;
}
rt_device_open(u2, RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_INT_TX |
RT_DEVICE_FLAG_RX_NON_BLOCKING |
RT_DEVICE_FLAG_TX_BLOCKING);
BSP_LET_Register_Com(u2);
//初始化ulog端口
dev_log_backend_init(u3);
/* 创建任务2和任务3，分别从U2和U3收发数据 */
lte_dev.tid1 =
rt_thread_create("lte", task_let_entry, RT_NULL, 2048, 10, 5);

5
board/CubeMX_Config/Src/stm32f1xx_hal_msp.c
View File

@ -245,9 +245,7 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef* hpcd)
/* Peripheral clock enable */
__HAL_RCC_USB_CLK_ENABLE();
/* USB interrupt Init */
HAL_NVIC_SetPriority(USB_HP_CAN1_TX_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(USB_HP_CAN1_TX_IRQn);
HAL_NVIC_SetPriority(USB_LP_CAN1_RX0_IRQn, 0, 0);
HAL_NVIC_SetPriority(USB_LP_CAN1_RX0_IRQn, 2, 0);
HAL_NVIC_EnableIRQ(USB_LP_CAN1_RX0_IRQn);
/* USER CODE BEGIN USB_MspInit 1 */
@ -274,7 +272,6 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef* hpcd)
__HAL_RCC_USB_CLK_DISABLE();
/* USB interrupt DeInit */
HAL_NVIC_DisableIRQ(USB_HP_CAN1_TX_IRQn);
HAL_NVIC_DisableIRQ(USB_LP_CAN1_RX0_IRQn);
/* USER CODE BEGIN USB_MspDeInit 1 */

4
libraries/HAL_Drivers/drivers/drv_usbd.c
View File

@ -112,14 +112,14 @@ void HAL_PCDEx_SetConnectionState(PCD_HandleTypeDef *hpcd, uint8_t state)
{
if (state == 1)
{
#if defined(SOC_SERIES_STM32F1)
#if defined(SOC_SERIES_STM32F1) && (BSP_USB_CONNECT_PIN >= 0)
rt_pin_mode(BSP_USB_CONNECT_PIN,PIN_MODE_OUTPUT);
rt_pin_write(BSP_USB_CONNECT_PIN, BSP_USB_PULL_UP_STATUS);
#endif
}
else
{
#if defined(SOC_SERIES_STM32F1)
#if defined(SOC_SERIES_STM32F1) && (BSP_USB_CONNECT_PIN >= 0)
rt_pin_mode(BSP_USB_CONNECT_PIN,PIN_MODE_OUTPUT);
rt_pin_write(BSP_USB_CONNECT_PIN, !BSP_USB_PULL_UP_STATUS);
#endif

251
project.uvprojx
View File

@ -10,7 +10,7 @@
<TargetName>DTU_4G</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
<uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
@ -186,6 +186,7 @@
<RvdsVP>0</RvdsVP>
<RvdsMve>0</RvdsMve>
<RvdsCdeCp>0</RvdsCdeCp>
<nBranchProt>0</nBranchProt>
<hadIRAM2>0</hadIRAM2>
<hadIROM2>0</hadIROM2>
<StupSel>8</StupSel>
@ -337,9 +338,9 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define>STM32F103xB, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, USE_HAL_DRIVER, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define>
<Define>STM32F103xB, __RTTHREAD__, __STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, RT_USING_ARMLIBC, USE_HAL_DRIVER</Define>
<Undefine></Undefine>
<IncludePath>..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m3;..\libraries\HAL_Drivers\CMSIS\Include;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\..\..\components\libc\compilers\common\include;board;board\ports;..\libraries\HAL_Drivers\drivers;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\finsh;.;..\..\..\components\libc\posix\io\epoll;..\..\..\libcpu\arm\common;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\poll;board\CubeMX_Config\Inc;..\..\..\components\drivers\include;applications;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc</IncludePath>
<IncludePath>libraries\HAL_Drivers;libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\rt-thread\rt-thread-v5.1.0\components\drivers\include;board\CubeMX_Config\Inc;..\rt-thread\rt-thread-v5.1.0\components\utilities\ulog;libraries\HAL_Drivers\CMSIS\Include;lib\mavlink\v2.0;..\rt-thread\rt-thread-v5.1.0\libcpu\arm\common;..\rt-thread\rt-thread-v5.1.0\components\libc\posix\io\eventfd;..\rt-thread\rt-thread-v5.1.0\components\libc\posix\io\poll;..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\common\include;..\rt-thread\rt-thread-v5.1.0\components\drivers\include;..\rt-thread\rt-thread-v5.1.0\components\libc\posix\io\epoll;..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\common\extension;..\rt-thread\rt-thread-v5.1.0\include;libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\rt-thread\rt-thread-v5.1.0\components\libc\posix\ipc;libraries\HAL_Drivers\drivers\config;libraries\HAL_Drivers\drivers;..\rt-thread\rt-thread-v5.1.0\components\drivers\include;applications;board\ports;..\rt-thread\rt-thread-v5.1.0\components\drivers\usb\usbdevice;board;..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\common\extension\fcntl\octal;..\rt-thread\rt-thread-v5.1.0\components\drivers\include;..\rt-thread\rt-thread-v5.1.0\libcpu\arm\cortex-m3;.</IncludePath>
</VariousControls>
</Cads>
<Aads>
@ -383,6 +384,26 @@
<Group>
<GroupName>Applications</GroupName>
<Files>
<File>
<FileName>drv_ec800k.c</FileName>
<FileType>1</FileType>
<FilePath>applications\drv_ec800k.c</FilePath>
</File>
<File>
<FileName>VK_Client.c</FileName>
<FileType>1</FileType>
<FilePath>applications\VK_Client.c</FilePath>
</File>
<File>
<FileName>VK_Com.c</FileName>
<FileType>1</FileType>
<FilePath>applications\VK_Com.c</FilePath>
</File>
<File>
<FileName>VK_Log.c</FileName>
<FileType>1</FileType>
<FilePath>applications\VK_Log.c</FilePath>
</File>
<File>
<FileName>main.c</FileName>
<FileType>1</FileType>
@ -396,42 +417,42 @@
<File>
<FileName>syscall_mem.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\libc\compilers\armlibc\syscall_mem.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\armlibc\syscall_mem.c</FilePath>
</File>
<File>
<FileName>syscalls.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\libc\compilers\armlibc\syscalls.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\armlibc\syscalls.c</FilePath>
</File>
<File>
<FileName>cctype.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\libc\compilers\common\cctype.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\common\cctype.c</FilePath>
</File>
<File>
<FileName>cstdlib.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\libc\compilers\common\cstdlib.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\common\cstdlib.c</FilePath>
</File>
<File>
<FileName>cstring.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\libc\compilers\common\cstring.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\common\cstring.c</FilePath>
</File>
<File>
<FileName>ctime.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\libc\compilers\common\ctime.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\common\ctime.c</FilePath>
</File>
<File>
<FileName>cunistd.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\libc\compilers\common\cunistd.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\common\cunistd.c</FilePath>
</File>
<File>
<FileName>cwchar.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\libc\compilers\common\cwchar.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\libc\compilers\common\cwchar.c</FilePath>
</File>
</Files>
</Group>
@ -441,7 +462,7 @@
<File>
<FileName>device.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\core\device.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\core\device.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -497,7 +518,7 @@
<File>
<FileName>completion.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\ipc\completion.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\ipc\completion.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -553,7 +574,7 @@
<File>
<FileName>condvar.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\ipc\condvar.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\ipc\condvar.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -609,7 +630,7 @@
<File>
<FileName>dataqueue.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\ipc\dataqueue.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\ipc\dataqueue.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -665,7 +686,7 @@
<File>
<FileName>pipe.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\ipc\pipe.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\ipc\pipe.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -721,7 +742,7 @@
<File>
<FileName>ringblk_buf.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\ipc\ringblk_buf.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\ipc\ringblk_buf.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -777,7 +798,7 @@
<File>
<FileName>ringbuffer.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\ipc\ringbuffer.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\ipc\ringbuffer.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -833,7 +854,7 @@
<File>
<FileName>waitqueue.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\ipc\waitqueue.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\ipc\waitqueue.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -889,7 +910,7 @@
<File>
<FileName>workqueue.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\ipc\workqueue.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\ipc\workqueue.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -945,7 +966,7 @@
<File>
<FileName>pin.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\pin\pin.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\pin\pin.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -999,9 +1020,9 @@
</FileOption>
</File>
<File>
<FileName>serial.c</FileName>
<FileName>serial_v2.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\drivers\serial\serial.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\serial\serial_v2.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1059,26 +1080,6 @@
<Group>
<GroupName>Drivers</GroupName>
<Files>
<File>
<FileName>drv_gpio.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\HAL_Drivers\drivers\drv_gpio.c</FilePath>
</File>
<File>
<FileName>drv_usart.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\HAL_Drivers\drivers\drv_usart.c</FilePath>
</File>
<File>
<FileName>drv_common.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\HAL_Drivers\drv_common.c</FilePath>
</File>
<File>
<FileName>startup_stm32f103xb.s</FileName>
<FileType>2</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xb.s</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_msp.c</FileName>
<FileType>1</FileType>
@ -1089,30 +1090,30 @@
<FileType>1</FileType>
<FilePath>board\board.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>Finsh</GroupName>
<Files>
<File>
<FileName>shell.c</FileName>
<FileName>drv_gpio.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\finsh\shell.c</FilePath>
<FilePath>libraries\HAL_Drivers\drivers\drv_gpio.c</FilePath>
</File>
<File>
<FileName>msh.c</FileName>
<FileName>drv_usart_v2.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\finsh\msh.c</FilePath>
<FilePath>libraries\HAL_Drivers\drivers\drv_usart_v2.c</FilePath>
</File>
<File>
<FileName>msh_parse.c</FileName>
<FileName>drv_usbd.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\finsh\msh_parse.c</FilePath>
<FilePath>libraries\HAL_Drivers\drivers\drv_usbd.c</FilePath>
</File>
<File>
<FileName>cmd.c</FileName>
<FileName>drv_common.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\components\finsh\cmd.c</FilePath>
<FilePath>libraries\HAL_Drivers\drv_common.c</FilePath>
</File>
<File>
<FileName>startup_stm32f103xb.s</FileName>
<FileType>2</FileType>
<FilePath>libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xb.s</FilePath>
</File>
</Files>
</Group>
@ -1122,7 +1123,7 @@
<File>
<FileName>clock.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\clock.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\clock.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1178,7 +1179,7 @@
<File>
<FileName>components.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\components.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\components.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1234,7 +1235,7 @@
<File>
<FileName>idle.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\idle.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\idle.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1290,7 +1291,7 @@
<File>
<FileName>ipc.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\ipc.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\ipc.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1346,7 +1347,7 @@
<File>
<FileName>irq.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\irq.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\irq.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1402,7 +1403,7 @@
<File>
<FileName>kstdio.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\klibc\kstdio.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\klibc\kstdio.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1458,7 +1459,7 @@
<File>
<FileName>kstring.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\klibc\kstring.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\klibc\kstring.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1514,7 +1515,7 @@
<File>
<FileName>kservice.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\kservice.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\kservice.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1570,7 +1571,7 @@
<File>
<FileName>mem.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\mem.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\mem.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1626,7 +1627,7 @@
<File>
<FileName>memheap.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\memheap.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\memheap.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1682,7 +1683,7 @@
<File>
<FileName>mempool.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\mempool.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\mempool.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1738,7 +1739,7 @@
<File>
<FileName>object.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\object.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\object.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1794,7 +1795,7 @@
<File>
<FileName>scheduler_comm.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\scheduler_comm.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\scheduler_comm.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1850,7 +1851,7 @@
<File>
<FileName>scheduler_up.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\scheduler_up.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\scheduler_up.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1906,7 +1907,7 @@
<File>
<FileName>thread.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\thread.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\thread.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -1962,7 +1963,7 @@
<File>
<FileName>timer.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\src\timer.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\src\timer.c</FilePath>
<FileOption>
<CommonProperty>
<UseCPPCompiler>2</UseCPPCompiler>
@ -2023,27 +2024,27 @@
<File>
<FileName>atomic_arm.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\libcpu\arm\common\atomic_arm.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\libcpu\arm\common\atomic_arm.c</FilePath>
</File>
<File>
<FileName>div0.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\libcpu\arm\common\div0.c</FilePath>
</File>
<File>
<FileName>showmem.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\libcpu\arm\common\showmem.c</FilePath>
</File>
<File>
<FileName>context_rvds.S</FileName>
<FileType>2</FileType>
<FilePath>..\..\..\libcpu\arm\cortex-m3\context_rvds.S</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\libcpu\arm\cortex-m3\context_rvds.S</FilePath>
</File>
<File>
<FileName>cpuport.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\libcpu\arm\cortex-m3\cpuport.c</FilePath>
<FilePath>..\rt-thread\rt-thread-v5.1.0\libcpu\arm\cortex-m3\cpuport.c</FilePath>
</File>
</Files>
</Group>
@ -2051,69 +2052,119 @@
<GroupName>Libraries</GroupName>
<Files>
<File>
<FileName>stm32f1xx_hal_rcc_ex.c</FileName>
<FileName>stm32f1xx_hal_cortex.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_cortex.c</FileName>
<FileName>stm32f1xx_hal_cec.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_gpio_ex.c</FileName>
<FileName>stm32f1xx_hal_crc.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_rcc.c</FileName>
<FileName>system_stm32f1xx.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_pwr.c</FileName>
<FileName>stm32f1xx_hal_uart.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_dma.c</FileName>
<FileName>stm32f1xx_hal_pcd_ex.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pcd_ex.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_crc.c</FileName>
<FileName>stm32f1xx_hal_dma.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c</FilePath>
</File>
<File>
<FileName>system_stm32f1xx.c</FileName>
<FileName>stm32f1xx_hal_gpio_ex.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_uart.c</FileName>
<FileName>stm32f1xx_hal_rcc_ex.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_cec.c</FileName>
<FileName>stm32f1xx_hal_hcd.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_hcd.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_usart.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_rcc.c</FileName>
<FileType>1</FileType>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_pcd.c</FileName>
<FileType>1</FileType>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pcd.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_ll_usb.c</FileName>
<FileType>1</FileType>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_usb.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_gpio.c</FileName>
<FileType>1</FileType>
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_hal_pwr.c</FileName>
<FileType>1</FileType>
<FilePath>libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>rt_usbd</GroupName>
<Files>
<File>
<FileName>usbdevice.c</FileName>
<FileType>1</FileType>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\usb\usbdevice\core\usbdevice.c</FilePath>
</File>
<File>
<FileName>usbdevice_core.c</FileName>
<FileType>1</FileType>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\usb\usbdevice\core\usbdevice_core.c</FilePath>
</File>
<File>
<FileName>cdc_vcom.c</FileName>
<FileType>1</FileType>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\drivers\usb\usbdevice\class\cdc_vcom.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>Utilities</GroupName>
<Files>
<File>
<FileName>ulog.c</FileName>
<FileType>1</FileType>
<FilePath>..\rt-thread\rt-thread-v5.1.0\components\utilities\ulog\ulog.c</FilePath>
</File>
</Files>
</Group>

20
rtconfig.h
View File

@ -57,7 +57,7 @@
#define RT_USING_COMPONENTS_INIT
#define RT_USING_USER_MAIN
#define RT_MAIN_THREAD_STACK_SIZE 512
#define RT_MAIN_THREAD_STACK_SIZE 1024
#define RT_MAIN_THREAD_PRIORITY 10
/* DFS: device virtual file system */
@ -75,6 +75,18 @@
/* Using USB */
#define RT_USING_USB
#define RT_USING_USB_DEVICE
#define RT_USBD_THREAD_STACK_SZ 1024
#define USB_VENDOR_ID 0x0FFE
#define USB_PRODUCT_ID 0x0001
#define _RT_USB_DEVICE_CDC
#define RT_USB_DEVICE_CDC
#define RT_VCOM_TASK_STK_SIZE 1024
#define RT_CDC_RX_BUFSIZE 128
#define RT_VCOM_SERNO "32021919830108"
#define RT_VCOM_SER_LEN 14
#define RT_VCOM_TX_TIMEOUT 1000
/* end of Using USB */
/* end of Device Drivers */
@ -119,11 +131,6 @@
#define ULOG_USING_ISR_LOG
#define ULOG_ASSERT_ENABLE
#define ULOG_LINE_BUF_SIZE 128
#define ULOG_USING_ASYNC_OUTPUT
#define ULOG_ASYNC_OUTPUT_BUF_SIZE 512
#define ULOG_ASYNC_OUTPUT_BY_THREAD
#define ULOG_ASYNC_OUTPUT_THREAD_STACK 1024
#define ULOG_ASYNC_OUTPUT_THREAD_PRIORITY 20
/* log format */
@ -339,6 +346,7 @@
/* On-chip Peripheral Drivers */
#define BSP_USING_GPIO
#define BSP_USING_USBD
#define BSP_USING_UART
#define BSP_USING_UART1
#define BSP_USING_UART2

Write Preview
Loading…
Cancel
Save