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 11:24:26 +03:00
parent 0934ae33ff
commit d1bcf7e360
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
App/app.cpp
View File

@@ -75,7 +75,7 @@ void AppInit(void)
uint8_t temp[2]; uint8_t temp[2];
uint32_t controlPinMs = 0; uint32_t controlPinMs = 0;
uint8_t controlPinFlag = 0; uint8_t controlPinFlag = 0;
uint8_t controlPinHighStart = 0; uint32_t controlPinDetectedMs = 0;
uint8_t updateMode = 0; uint8_t updateMode = 0;
void zummerOff (void) void zummerOff (void)
@@ -153,15 +153,15 @@ void AppTask(void)
lightStartMs = 0; lightStartMs = 0;
lightingOff(); lightingOff();
} }
if (HAL_GPIO_ReadPin(CONTROL_PIN_GPIO_Port, CONTROL_PIN_Pin) == GPIO_PIN_SET) { if (HAL_GPIO_ReadPin(CONTROL_PIN_GPIO_Port, CONTROL_PIN_Pin) == GPIO_PIN_RESET && controlPinFlag == 0) {
if (controlPinFlag == 0) controlPinDetectedMs = HAL_GetTick();
{
controlPinHighStart = HAL_GetTick();
controlPinFlag = 1; controlPinFlag = 1;
} } else if (controlPinFlag == 1 && HAL_GPIO_ReadPin(CONTROL_PIN_GPIO_Port, CONTROL_PIN_Pin) == GPIO_PIN_SET ) {
} else if (controlPinFlag == 1) {
controlPinFlag = 0; controlPinFlag = 0;
uint32_t ms = HAL_GetTick() - controlPinHighStart; uint32_t ms = 0;
if (controlPinDetectedMs != 0)
ms = HAL_GetTick() - controlPinDetectedMs;
controlPinDetectedMs = 0;
if (ms >= 5000 && ms < 5200) { if (ms >= 5000 && ms < 5200) {
////////Update mode ////////Update mode
HAL_UART_DeInit(&huart1); HAL_UART_DeInit(&huart1);

2
main_prog/Core/Src/gpio.c
View File

@@ -74,7 +74,7 @@ void MX_GPIO_Init(void)
/*Configure GPIO pin : PtPin */ /*Configure GPIO pin : PtPin */
GPIO_InitStruct.Pin = CONTROL_PIN_Pin; GPIO_InitStruct.Pin = CONTROL_PIN_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_PULLDOWN; GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(CONTROL_PIN_GPIO_Port, &GPIO_InitStruct); HAL_GPIO_Init(CONTROL_PIN_GPIO_Port, &GPIO_InitStruct);
/* EXTI interrupt init*/ /* EXTI interrupt init*/