From 75828a64aef7070774ced57a16dc3d93d9dac519 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 1 Aug 2023 21:50:35 +0800 Subject: [PATCH] update --- Core/Src/usart.c | 2 +- sdk | 2 +- usrc/main.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Core/Src/usart.c b/Core/Src/usart.c index b75b189..e0f643e 100644 --- a/Core/Src/usart.c +++ b/Core/Src/usart.c @@ -99,7 +99,7 @@ void MX_USART3_UART_Init(void) /* USER CODE END USART3_Init 1 */ huart3.Instance = USART3; - huart3.Init.BaudRate = 115200; + huart3.Init.BaudRate = 9600; huart3.Init.WordLength = UART_WORDLENGTH_8B; huart3.Init.StopBits = UART_STOPBITS_1; huart3.Init.Parity = UART_PARITY_NONE; diff --git a/sdk b/sdk index 2952161..097b325 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 2952161f647a478806fc7ed0c26e8480b2dccf59 +Subproject commit 097b32522d663f401836639fe9229f494b45984f diff --git a/usrc/main.cpp b/usrc/main.cpp index 450f137..fc6600e 100644 --- a/usrc/main.cpp +++ b/usrc/main.cpp @@ -214,7 +214,8 @@ void Main::run() { * 扫码枪初始化 * *******************************************************************************/ { - m_m3078CodeScanner.initialize(&REACTION_BOX_SWEEP_SENSOR_UART, PC11, false /*trigger pin mirror*/); + m_m3078CodeScanner.initialize(&REACTION_BOX_SWEEP_SENSOR_UART, PC11, true /*trigger pin mirror*/); + // m_m3078CodeScanner.trigger(); m_idCardReaderService.initialize("idCardReaderService", &m_protocolStack, REG_ID_CARD_READER_CTRL_ADD_BASE, &m_m3078CodeScanner); }