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

105
App/app.cpp
View File

@@ -37,6 +37,8 @@ extern "C" {
#include <cstring>
#include "uart_bridge.hpp"
#include "tim.h"
#include <vector>
UartBridge bridge(true, USART1, USART2, 9600, 9600);
uint8_t flagTransmitCompleted = 1;
@@ -83,7 +85,8 @@ uint8_t controlPinFlag = 0;
uint32_t controlPinDetectedMs = 0;
uint8_t updateMode = 0;
command_t lastZummerCommand;
command_t sendCommand;
void zummerOff(void) {
HAL_TIM_Base_Stop(&htimZummer);
HAL_TIM_PWM_Stop(&htimZummer, TIM_CHANNEL_2);
@@ -114,8 +117,10 @@ void proximityMessureCompleted(void) {
VL6180_RangeData_t VL6180_Range;
uint32_t waitAnswerFromReaderMs = 0;
#define MAX_WAIT_ANSWER_FROM_GM60 30000
#define DATA_TIMEOUT 500
#define MAX_WAIT_FOR_BOOT_COMMAND 10000
#define DATA_TIMEOUT 500
uint32_t bootStartMs = 0;
uint32_t lightStartMs = 0;
uint8_t uart1Buf[1024];
uint8_t uart2Buf[1024];
@@ -132,20 +137,37 @@ uint8_t uartTask(void) // return 0 if data received , otherwise return 1
}
}
if (!bridge.uart1Buf->is_empty() && bridge.getHuart2()->gState == 0x20) {
if (!bridge.uart1Buf.is_empty() && bridge.getHuart2()->gState == 0x20) {
waitAnswerFromReaderMs = HAL_GetTick();
std::string_view stringView{bridge.uart1Buf->dequeue()};
std::string_view stringView{bridge.uart1Buf.dequeue()};
uint32_t size = stringView.size();
stringView.copy(reinterpret_cast<char *>(uart1Buf), size, 0);
if (stringView.find("FIRMWARE_UPDATE") != std::string::npos) {
HAL_UART_DeInit(bridge.getHuart1());
BootComInit();
zummerOff();
lightingOff();
} else if (stringView.find("ZOOMER_ON") != std::string::npos) {
zummerOn();
} else if (stringView.find("ZOOMER_OFF") != std::string::npos) {
zummerOff();
if (size == sizeof(command_t))
{
uint8_t com = stringView[0];
if (com == ENTER_FIRMWARE_UPDATE) {
HAL_UART_DeInit(bridge.getHuart1());
BootComInit();
zummerOff();
lightingOff();
updateMode = 1;
bootStartMs = HAL_GetTick();
} else if (com == ZUMMER_ON || com == ZUMMER_OFF) {
memcpy(&lastZummerCommand, uart1Buf, sizeof(lastZummerCommand));
}
else if (com == GET_FIRMWARE_VERSION)
{
uint8_t fw_ver[16];
sprintf(reinterpret_cast<char *>(fw_ver),"%s", FW_VERSION);
sendCommand = {
GET_FIRMWARE_VERSION,
*(uint16_t*)&fw_ver[0],
*(uint16_t*)&fw_ver[2],
0x00
};
}
HAL_UART_Transmit_IT(bridge.getHuart1(), (uint8_t*) &sendCommand, sizeof(sendCommand));
} else {
HAL_UART_Transmit_IT(bridge.getHuart2(), (const uint8_t *) uart1Buf, size);
}
@@ -153,13 +175,13 @@ uint8_t uartTask(void) // return 0 if data received , otherwise return 1
return 0;
}
if (!bridge.uart2Buf->is_empty() && bridge.getHuart1()->gState == 0x20) {
if (!bridge.uart2Buf.is_empty() && bridge.getHuart1()->gState == 0x20) {
msms = HAL_GetTick();
__HAL_TIM_CLEAR_FLAG(&htimSecTimer, TIM_FLAG_UPDATE);
HAL_TIM_Base_Start_IT(&htimSecTimer);
flagTransmitCompleted = 0;
waitAnswerFromReaderMs = 0;
std::string_view stringView{bridge.uart2Buf->dequeue()};
std::string_view stringView{bridge.uart2Buf.dequeue()};
uint32_t size = stringView.size();
stringView.copy(reinterpret_cast<char *>(uart2Buf), size, 0);
HAL_UART_Transmit_IT(bridge.getHuart1(), (const uint8_t *) uart2Buf, size);
@@ -167,7 +189,55 @@ uint8_t uartTask(void) // return 0 if data received , otherwise return 1
}
return 1;
}
typedef struct currentlyZummerParam_t {
int32_t beepMs ;
uint32_t zumStartMs ;
int32_t zumPauseMs;
uint8_t beepCount;
uint8_t zumIsPaused ;
};
currentlyZummerParam_t currentlyZummerParam = {0};
void zumHandle (void)
{
if (lastZummerCommand.numOfCommand == ZUMMER_ON && currentlyZummerParam.zumStartMs == 0)
{
zummerOn();
currentlyZummerParam = {
lastZummerCommand.data1,
HAL_GetTick(),
lastZummerCommand.data2,
lastZummerCommand.data3,
0
};
}
else if (currentlyZummerParam.zumStartMs > 0 && currentlyZummerParam.zumIsPaused == 0 && currentlyZummerParam.beepCount >= 1 && currentlyZummerParam.beepMs <= (HAL_GetTick() - currentlyZummerParam.zumStartMs))
{
currentlyZummerParam.beepMs = 0;
if (currentlyZummerParam.beepCount >= 1)
{
currentlyZummerParam.beepCount--;
currentlyZummerParam.zumIsPaused = 1;
currentlyZummerParam.zumStartMs = HAL_GetTick();
currentlyZummerParam.zumPauseMs = lastZummerCommand.data2;
zummerOff();
}
}
else if (currentlyZummerParam.zumIsPaused == 1 && (HAL_GetTick() - currentlyZummerParam.zumStartMs) >= currentlyZummerParam.zumPauseMs )
{
currentlyZummerParam.zumPauseMs = 0;
currentlyZummerParam.beepMs = lastZummerCommand.data1;
currentlyZummerParam.zumIsPaused = 0;
currentlyZummerParam.zumStartMs = HAL_GetTick();
zummerOn();
}
else if (currentlyZummerParam.beepCount == 0 && currentlyZummerParam.zumIsPaused <= 0 )
{
currentlyZummerParam = {0};
zummerOff();
memset((uint8_t*)&lastZummerCommand, 0, sizeof(lastZummerCommand));
}
}
void AppTask(void) {
if (!updateMode) {
uartTask();
@@ -175,6 +245,9 @@ void AppTask(void) {
lightStartMs = 0;
lightingOff();
}
zumHandle();
if (lastZummerCommand.numOfCommand == ZUMMER_ON)
return;
if (flagTransmitCompleted == 1) {
if (proximityCompleteMessure == 1) {
proximityCompleteMessure = 0;
@@ -191,6 +264,8 @@ void AppTask(void) {
}
} else {
if (HAL_GetTick() - bootStartMs > MAX_WAIT_FOR_BOOT_COMMAND)
updateMode = 0;
BootComCheckActivationRequest();
}
}