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

---vl6180dr

Browse Source
This commit is contained in:
Mysteo91
2023-08-01 17:38:46 +03:00
parent c3fcc98b2e
commit 6aa7f836d3
3 changed files with 25 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
App/app.cpp
View File

@@ -111,7 +111,7 @@ void proximityMessureCompleted (void)
VL6180_RangeData_t VL6180_Range;
uint32_t waitAnswerFromReaderMs = 0;
#define MAX_WAIT_ANSWER_FROM_GM60 10000
#define MAX_WAIT_ANSWER_FROM_GM60 30000
#define DATA_TIMEOUT 500
uint32_t lightStartMs = 0;
@@ -131,7 +131,9 @@ uint8_t uartTask (void) // return 0 if data received , otherwise return 1
}
}
if (!bridge.uart1Buf->is_empty() && (__HAL_UART_GET_FLAG(bridge.getHuart2(), UART_FLAG_TC))) {
if (!bridge.uart1Buf->is_empty() && bridge.getHuart2()->gState == 0x20) {
HAL_UART_Abort(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();
@@ -140,7 +142,7 @@ uint8_t uartTask (void) // return 0 if data received , otherwise return 1
stringView.copy(reinterpret_cast<char *>(uart1Buf), size, 0);
if (stringView.find("FIRMWARE_UPDATE") != std::string::npos)
{
HAL_UART_DeInit(&huart1);
HAL_UART_DeInit(bridge.getHuart1());
BootComInit();
zummerOff();
lightingOff();
@@ -154,12 +156,14 @@ uint8_t uartTask (void) // return 0 if data received , otherwise return 1
zummerOff();
}
else
{
HAL_UART_Transmit_IT(bridge.getHuart2(), (const uint8_t*) uart1Buf, size);
}
}
return 0;
}
if (!bridge.uart2Buf->is_empty() && (__HAL_UART_GET_FLAG(bridge.getHuart1(), UART_FLAG_TC))) {
if (!bridge.uart2Buf->is_empty() && bridge.getHuart1()->gState == 0x20) {
waitAnswerFromReaderMs = 0;
std::string_view stringView{bridge.uart2Buf->dequeue()};
uint32_t size = stringView.size();