Browse Source

update

master
zhaohe 2 years ago
parent
commit
75828a64ae
  1. 2
      Core/Src/usart.c
  2. 2
      sdk
  3. 3
      usrc/main.cpp

2
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;

2
sdk

@ -1 +1 @@
Subproject commit 2952161f647a478806fc7ed0c26e8480b2dccf59
Subproject commit 097b32522d663f401836639fe9229f494b45984f

3
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);
}

Loading…
Cancel
Save