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

--some updates

Browse Source
This commit is contained in:
Mysteo
2023-07-26 17:38:26 +03:00
parent d5989a496b
commit bfa9d67eb9
13 changed files with 222 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,9 +16,9 @@ public:
Circular_Buffer<uint8_t> *uart1Buf;
Circular_Buffer<uint8_t> *uart2Buf;
bool isTurnOn() const;
void setIsTurnOn(bool isTurnOn);
static volatile uint8_t dataFromUart1;
static volatile uint8_t dataFromUart2;
void setTurnOn(bool isTurnOn);
volatile uint8_t dataFromUart1;
volatile uint8_t dataFromUart2;
void init(void);
private:

0
main_prog/Core/Startup/startup_stm32g070cbtx.s → main_prog/Core/Src/startup_stm32g070cbtx.s
View File

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

@@ -11,26 +11,7 @@ UartBridge* bridgePnt;
uint8_t data[2];
extern "C" void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart){
if (huart == bridgePnt->getHuart1())
{
if (!bridgePnt->uart1Buf->is_empty() && (__HAL_UART_GET_FLAG(bridgePnt->getHuart2(), UART_FLAG_TC)))
{
data[1] = bridgePnt->uart1Buf->dequeue();
HAL_UART_Transmit_IT(bridgePnt->getHuart2(), &data[1], 1);
}
}
else if (huart == bridgePnt->getHuart2())
{
if (!bridgePnt->uart2Buf->is_empty() && (__HAL_UART_GET_FLAG(bridgePnt->getHuart1(), UART_FLAG_TC)))
{
data[2] = bridgePnt->uart2Buf->dequeue();
HAL_UART_Transmit_IT(bridgePnt->getHuart1(), &data[2], 1);
}
}
}
extern "C" void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart){
@@ -75,7 +56,7 @@ bool UartBridge::isTurnOn() const {
return turnOn;
}
void UartBridge::setIsTurnOn(bool isTurnOn) {
void UartBridge::setTurnOn(bool isTurnOn) {
UartBridge::turnOn = isTurnOn;
}
@@ -130,7 +111,7 @@ extern "C" void USART1_IRQHandler(void)
/**
* @brief This function handles USART2 global interrupt / USART2 wake-up interrupt through EXTI line 26.
*/
void USART2_IRQHandler(void)
extern "C" void USART2_IRQHandler(void)
{
/* USER CODE BEGIN USART2_IRQn 0 */