ArbinaHQ/qrcode-reader-hardware
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upd

Browse Source
This commit is contained in:
Mysteo
2023-08-02 07:42:27 +03:00
parent 222f758a2b
commit 7732cf6280
4 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main_prog/Core/Src/tim.c
View File

@@ -135,7 +135,7 @@ void MX_TIM16_Init(void)
/* USER CODE END TIM16_Init 1 */
htimSecTimer.Instance = TIM16;
htimSecTimer.Init.Prescaler = 999;
htimSecTimer.Init.Prescaler = 99;
htimSecTimer.Init.CounterMode = TIM_COUNTERMODE_UP;
htimSecTimer.Init.Period = 63999;
htimSecTimer.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;

71
main_prog/Core/Src/uart_bridge.cpp
View File

@@ -2,38 +2,41 @@
// Created by Mysteo on 14.07.2023.
//
extern "C" {
#include "usart.h"
#include "usart.h"
#include "tim.h"
}
#include "uart_bridge.hpp"
UartBridge* bridgePnt;
UartBridge *bridgePnt;
extern "C" void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size) {
extern "C" void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size){
if (huart == bridgePnt->getHuart1())
{
if (huart == bridgePnt->getHuart1()) {
HAL_UARTEx_ReceiveToIdle_IT(bridgePnt->getHuart1(), (uint8_t *) bridgePnt->dataFromUart1, BUF_SIZE);
if (Size < 4)
return;
std::string_view stringView{(const char *) bridgePnt->dataFromUart1, Size};
bridgePnt->uart1Buf->enqueue(stringView);
}
else if (huart == bridgePnt->getHuart2())
{
bridgePnt->uart1Buf->enqueue(stringView);
} else if (huart == bridgePnt->getHuart2()) {
HAL_UARTEx_ReceiveToIdle_IT(bridgePnt->getHuart2(), (uint8_t *) bridgePnt->dataFromUart2, BUF_SIZE);
if (Size < 4)
return;
std::string_view stringView{(const char *) bridgePnt->dataFromUart2, Size};
bridgePnt->uart2Buf->enqueue(stringView);
}
}
UartBridge::UartBridge(bool isOn, USART_TypeDef *uart1, USART_TypeDef *uart2, uint16_t baudRate1,
uint16_t baudRate2) : turnOn(isOn),
uart1(uart1),
uart2(uart2)
{
uart1(uart1),
uart2(uart2) {
bridgePnt = this;
UartBridge::uart1Buf = new Circular_Buffer<std::string_view>(MAX_QUEUE);
UartBridge::uart2Buf = new Circular_Buffer<std::string_view>(MAX_QUEUE);
@@ -62,45 +65,45 @@ void UartBridge::setTurnOn(bool isTurnOn) {
}
void UartBridge::uartInit(UART_HandleTypeDef *huart) {
if (HAL_UART_Init(huart) != HAL_OK)
{
if (HAL_UART_Init(huart) != HAL_OK) {
Error_Handler();
}
if (HAL_UARTEx_SetTxFifoThreshold(huart, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK)
{
if (HAL_UARTEx_SetTxFifoThreshold(huart, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK) {
Error_Handler();
}
if (HAL_UARTEx_SetRxFifoThreshold(huart, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK)
{
if (HAL_UARTEx_SetRxFifoThreshold(huart, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK) {
Error_Handler();
}
if (HAL_UARTEx_DisableFifoMode(huart) != HAL_OK)
{
if (HAL_UARTEx_DisableFifoMode(huart) != HAL_OK) {
Error_Handler();
}
}
UART_HandleTypeDef* UartBridge::getHuart1() {
UART_HandleTypeDef *UartBridge::getHuart1() {
return &uart1Handle;
}
UART_HandleTypeDef* UartBridge::getHuart2() {
UART_HandleTypeDef *UartBridge::getHuart2() {
return &uart2Handle;
}
void UartBridge::init(void) {
uartInit(&uart1Handle);
uartInit(&uart2Handle);
HAL_UARTEx_ReceiveToIdle_IT(&uart1Handle,(uint8_t*)dataFromUart1, BUF_SIZE );
HAL_UARTEx_ReceiveToIdle_IT(&uart2Handle,(uint8_t*)dataFromUart2, BUF_SIZE );
__HAL_UART_CLEAR_FLAG(&uart1Handle, UART_FLAG_TXE);
__HAL_UART_CLEAR_FLAG(&uart1Handle, UART_FLAG_TC);
__HAL_UART_CLEAR_FLAG(&uart1Handle, UART_FLAG_IDLE);
__HAL_UART_CLEAR_FLAG(&uart2Handle, UART_FLAG_TXE);
__HAL_UART_CLEAR_FLAG(&uart2Handle, UART_FLAG_TC);
__HAL_UART_CLEAR_FLAG(&uart2Handle, UART_FLAG_IDLE);
HAL_UARTEx_ReceiveToIdle_IT(&uart1Handle, (uint8_t *) dataFromUart1, BUF_SIZE);
HAL_UARTEx_ReceiveToIdle_IT(&uart2Handle, (uint8_t *) dataFromUart2, BUF_SIZE);
}
extern "C" void USART1_IRQHandler(void)
{
extern "C" void USART1_IRQHandler(void) {
/* USER CODE BEGIN USART1_IRQn 0 */
/* USER CODE END USART1_IRQn 0 */
@@ -113,8 +116,7 @@ extern "C" void USART1_IRQHandler(void)
/**
* @brief This function handles USART2 global interrupt / USART2 wake-up interrupt through EXTI line 26.
*/
extern "C" void USART2_IRQHandler(void)
{
extern "C" void USART2_IRQHandler(void) {
/* USER CODE BEGIN USART2_IRQn 0 */
/* USER CODE END USART2_IRQn 0 */
@@ -124,3 +126,10 @@ extern "C" void USART2_IRQHandler(void)
/* USER CODE END USART2_IRQn 1 */
}
extern "C" void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
if (bridgePnt->getHuart1() == huart) {
HAL_UARTEx_ReceiveToIdle_IT(huart, (uint8_t *) bridgePnt->dataFromUart1, BUF_SIZE);
} else if (bridgePnt->getHuart2() == huart) {
HAL_UARTEx_ReceiveToIdle_IT(huart, (uint8_t *) bridgePnt->dataFromUart2, BUF_SIZE);
}
}