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:
Mysteo91
2023-08-11 16:04:03 +03:00
parent e40a82a218
commit c6211b1db1
7 changed files with 134 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
main_prog/Core/Inc/reader_communication.h Normal file
View File

@@ -0,0 +1,25 @@
//
// Created by Professional on 8/9/2023.
//
#ifndef MYPROJECT_READER_COMMUNICATION_H
#define MYPROJECT_READER_COMMUNICATION_H
#include "stdint-gcc.h"
typedef enum command_enum{
LIGHT_ON = 0xF0,
LIGHT_OFF,
ZUMMER_ON,
ZUMMER_OFF,
ENTER_FIRMWARE_UPDATE,
EXIT_FIRMWARE_UPDATE,
GET_FIRMWARE_VERSION
};
typedef struct command_t {
uint8_t numOfCommand;
uint16_t data1; //data1
uint16_t data2; //data2
uint8_t data3; //data3
} ;
#endif //MYPROJECT_READER_COMMUNICATION_H

6
main_prog/Core/Inc/uart_bridge.hpp
View File

@@ -6,7 +6,7 @@
#define READER_MAIN_PROG_UART_BRIDGE_HPP
#include "circular_buffer.hpp"
#include "usart.h"
#include "reader_communication.h"
#define BUF_SIZE 1024U
#define MAX_QUEUE 16
@@ -15,8 +15,8 @@ class UartBridge{
public:
UartBridge(bool isOn, USART_TypeDef *uart1, USART_TypeDef *uart2, uint16_t baudRate1,
uint16_t baudRate2);
Circular_Buffer<std::string_view> *uart1Buf;
Circular_Buffer<std::string_view> *uart2Buf;
Circular_Buffer<std::string_view> uart1Buf;
Circular_Buffer<std::string_view> uart2Buf;
bool isTurnOn() const;
void setTurnOn(bool isTurnOn);
volatile uint8_t dataFromUart1[BUF_SIZE];

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

@@ -20,14 +20,14 @@ extern "C" void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t S
if (Size < 4)
return;
std::string_view stringView{(const char *) bridgePnt->dataFromUart1, Size};
bridgePnt->uart1Buf->enqueue(stringView);
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);
bridgePnt->uart2Buf.enqueue(stringView);
}
@@ -36,10 +36,10 @@ extern "C" void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t S
UartBridge::UartBridge(bool isOn, USART_TypeDef *uart1, USART_TypeDef *uart2, uint16_t baudRate1,
uint16_t baudRate2) : turnOn(isOn),
uart1(uart1),
uart2(uart2) {
uart2(uart2),
uart1Buf(Circular_Buffer<std::string_view>(MAX_QUEUE)),
uart2Buf(Circular_Buffer<std::string_view>(MAX_QUEUE)){
bridgePnt = this;
UartBridge::uart1Buf = new Circular_Buffer<std::string_view>(MAX_QUEUE);
UartBridge::uart2Buf = new Circular_Buffer<std::string_view>(MAX_QUEUE);
uart1Handle.Instance = uart1;
uart1Handle.Init.BaudRate = baudRate1;
uart1Handle.Init.WordLength = UART_WORDLENGTH_8B;