Browse Source

update(applications):重新打开usb外设相关驱动,恢复usb打印信息

dev-rebuild
jujihjuji 5 months ago
parent
commit
fcd6002671
  1. 9
      .config
  2. 6
      applications/VK_Client.c
  3. 10
      applications/drv_ec800k.c
  4. 6
      applications/main.c
  5. 6
      rtconfig.h

9
.config

@ -75,7 +75,9 @@ CONFIG_RT_USING_DEVICE=y
# CONFIG_RT_USING_INTERRUPT_INFO is not set
# CONFIG_RT_USING_THREADSAFE_PRINTF is not set
# CONFIG_RT_USING_SCHED_THREAD_CTX is not set
# CONFIG_RT_USING_CONSOLE is not set
CONFIG_RT_USING_CONSOLE=y
CONFIG_RT_CONSOLEBUF_SIZE=128
CONFIG_RT_CONSOLE_DEVICE_NAME="vcom"
CONFIG_RT_VER_NUM=0x50100
# CONFIG_RT_USING_STDC_ATOMIC is not set
CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32
@ -95,6 +97,7 @@ CONFIG_RT_USING_USER_MAIN=y
CONFIG_RT_MAIN_THREAD_STACK_SIZE=1536
CONFIG_RT_MAIN_THREAD_PRIORITY=10
# CONFIG_RT_USING_LEGACY is not set
# CONFIG_RT_USING_MSH is not set
#
# DFS: device virtual file system
@ -152,7 +155,7 @@ CONFIG_RT_USING_PIN=y
CONFIG_RT_USING_USB=y
# CONFIG_RT_USING_USB_HOST is not set
CONFIG_RT_USING_USB_DEVICE=y
CONFIG_RT_USBD_THREAD_STACK_SZ=4096
CONFIG_RT_USBD_THREAD_STACK_SZ=2048
CONFIG_USB_VENDOR_ID=0x0FFE
CONFIG_USB_PRODUCT_ID=0x0001
# CONFIG_RT_USB_DEVICE_COMPOSITE is not set
@ -1278,7 +1281,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

6
applications/VK_Client.c

@ -137,7 +137,7 @@ int16_t client_tcp_connect(Cclient_t *client) {
client->error_cnt = 0;
lte_dev.reset_flag = DTU_CF_NO_NEED_RESET;
// rt_kprintf("%s\r", lte_dev.at_buf);
rt_kprintf("%s\r", lte_dev.at_buf);
#ifdef TRANSPARENT_MODE
// Set_Tansparent_Mode(client);
@ -186,7 +186,7 @@ int16_t client_yield(CLte_dev_t *pLte_dev) {
if (pLte_dev->client1->connect_sta == true) {
rt_err_t ret = rt_sem_take(pLte_dev->com_dev_rx_sem, 1000);
if (rt_tick_get() - last_rx_tick > RT_TICK_PER_SECOND * 10) {
//rt_kprintf("timeout!!! reconnect.\n");
rt_kprintf("timeout!!! reconnect.\n");
hw_printf("timeout!!! reconnect.\n");
pLte_dev->client1->connect_sta = false;
}
@ -208,7 +208,7 @@ int16_t client_yield(CLte_dev_t *pLte_dev) {
}
break;
} else if (strstr((const char *)lte_dev.at_buf, "NO CARRIER")) {
//rt_kprintf("disconnect!!!\n");
rt_kprintf("disconnect!!!\n");
hw_printf("disconnect!!!\n");
pLte_dev->client1->connect_sta = false;
break;

10
applications/drv_ec800k.c

@ -74,7 +74,7 @@ int16_t BSP_LTE_CipSend(uint8_t *pdata, uint32_t length, uint32_t waittime) {
int16_t BSP_LTE_SendCmd(const char *cmd, const char *expect, const char *error,
uint32_t waittime) {
//rt_kprintf("%s\n", cmd);
rt_kprintf("%s\n", cmd);
hw_printf("%s\n", cmd);
BSP_LTE_SendData((uint8_t *)cmd, rt_strlen(cmd));
@ -86,7 +86,7 @@ int16_t BSP_LTE_SendCmd(const char *cmd, const char *expect, const char *error,
rt_device_read(lte_dev.com_dev, 0, lte_dev.at_buf, sizeof(lte_dev.at_buf));
//rt_kprintf("%s\n", lte_dev.at_buf);
rt_kprintf("%s\n", lte_dev.at_buf);
hw_printf("%s\n", lte_dev.at_buf);
/* 清空缓存 */
uint8_t c;
@ -179,7 +179,7 @@ int16_t BSP_LTE_GetCGATT(int16_t retry) {
}
retry--;
} while (retry);
//rt_kprintf("PS detached:[%s]", lte_dev.at_buf);
rt_kprintf("PS detached:[%s]", lte_dev.at_buf);
return -1;
}
@ -293,13 +293,13 @@ void BSP_LTE_Config(void) {
while (0 != BSP_LTE_SendATE(3)) {
rt_thread_mdelay(500);
//rt_kprintf("BSP_LTE_SendATE error\n");
rt_kprintf("BSP_LTE_SendATE error\n");
hw_printf("BSP_LTE_SendATE error\n");
}
/*查询模块信息*/
BSP_LTE_SendCmd(AT_ATI, DEFAULT_EXPECT, DEFAULT_ERROR, LTE_CMD_WAIT_NORMAL);
//rt_kprintf("%s", lte_dev.at_buf);
rt_kprintf("%s", lte_dev.at_buf);
hw_printf("%s", lte_dev.at_buf);
/*查询SIM卡是否存在*/
res = BSP_LTE_SendATCPIN(3);

6
applications/main.c

@ -28,9 +28,9 @@ 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");
rt_device_t vcom = rt_device_find("vcom");
rt_device_open(vcom, RT_DEVICE_FLAG_RDWR);
rt_console_set_device("vcom");
u3 = rt_device_find("uart3");
rt_device_open(u3, RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_INT_TX |

6
rtconfig.h

@ -44,6 +44,9 @@
#define RT_USING_HEAP
/* end of Memory Management */
#define RT_USING_DEVICE
#define RT_USING_CONSOLE
#define RT_CONSOLEBUF_SIZE 128
#define RT_CONSOLE_DEVICE_NAME "vcom"
#define RT_VER_NUM 0x50100
#define RT_BACKTRACE_LEVEL_MAX_NR 32
/* end of RT-Thread Kernel */
@ -77,7 +80,7 @@
#define RT_USING_USB
#define RT_USING_USB_DEVICE
#define RT_USBD_THREAD_STACK_SZ 4096
#define RT_USBD_THREAD_STACK_SZ 2048
#define USB_VENDOR_ID 0x0FFE
#define USB_PRODUCT_ID 0x0001
#define _RT_USB_DEVICE_CDC
@ -336,6 +339,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

Loading…
Cancel
Save