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

25
App/app.cpp
View File

@@ -39,7 +39,7 @@ extern "C" {
#include "tim.h"
UartBridge bridge(true, USART1, USART2, 9600, 9600);
uint8_t timerCounter = 0;
uint8_t flagTransmitCompleted = 1;
void zummerOff(void);
void zummerOn(void);
@@ -119,7 +119,7 @@ uint32_t waitAnswerFromReaderMs = 0;
uint32_t lightStartMs = 0;
uint8_t uart1Buf[1024];
uint8_t uart2Buf[1024];
uint32_t msms ;
uint8_t uartTask(void) // return 0 if data received , otherwise return 1
{
@@ -133,8 +133,6 @@ uint8_t uartTask(void) // return 0 if data received , otherwise return 1
}
if (!bridge.uart1Buf->is_empty() && bridge.getHuart2()->gState == 0x20) {
HAL_UART_AbortReceive_IT(bridge.getHuart1());
HAL_UARTEx_ReceiveToIdle_IT(bridge.getHuart1(), (uint8_t *) bridge.dataFromUart1, BUF_SIZE);
waitAnswerFromReaderMs = HAL_GetTick();
std::string_view stringView{bridge.uart1Buf->dequeue()};
uint32_t size = stringView.size();
@@ -156,12 +154,11 @@ uint8_t uartTask(void) // return 0 if data received , otherwise return 1
}
if (!bridge.uart2Buf->is_empty() && bridge.getHuart1()->gState == 0x20) {
HAL_TIM_Base_Stop(&htimSecTimer);
msms = HAL_GetTick();
__HAL_TIM_CLEAR_FLAG(&htimSecTimer, TIM_FLAG_UPDATE);
HAL_TIM_Base_Start_IT(&htimSecTimer);
timerCounter = 0;
flagTransmitCompleted = 0;
waitAnswerFromReaderMs = 0;
HAL_UART_AbortReceive_IT(bridge.getHuart2());
HAL_UARTEx_ReceiveToIdle_IT(bridge.getHuart2(), (uint8_t *) bridge.dataFromUart2, BUF_SIZE);
std::string_view stringView{bridge.uart2Buf->dequeue()};
uint32_t size = stringView.size();
stringView.copy(reinterpret_cast<char *>(uart2Buf), size, 0);
@@ -178,10 +175,7 @@ void AppTask(void) {
lightStartMs = 0;
lightingOff();
}
if (timerCounter == 1) {
timerCounter = 0;
if (vl6180_is_ready() >= 0)
vl6180_single_shot();
if (flagTransmitCompleted == 1) {
if (proximityCompleteMessure == 1) {
proximityCompleteMessure = 0;
if (getRange(&VL6180_Range) == 0) {
@@ -191,7 +185,11 @@ void AppTask(void) {
}
}
}
if (vl6180_is_ready() >= 0)
vl6180_single_shot();
}
} else {
BootComCheckActivationRequest();
}
@@ -202,7 +200,8 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
if (htim->Instance == htimSecTimer.Instance)
{
HAL_TIM_Base_Stop_IT(htim);
timerCounter = 1;
msms = HAL_GetTick() - msms;
flagTransmitCompleted = 1;
}
}