From 48e8b3c3097addc9b9441acfd26c0b674500ca55 Mon Sep 17 00:00:00 2001
From: Dmitry Maylarov <maylarov@yandex.ru>
Date: Thu, 11 Jul 2019 14:29:04 +0300
Subject: [PATCH] better buttons polling

---
 Core/Src/lcd.c  |  8 ++++++--
 Core/Src/main.c | 20 ++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Core/Src/lcd.c b/Core/Src/lcd.c
index 84898e1..e1085a9 100644
--- a/Core/Src/lcd.c
+++ b/Core/Src/lcd.c
@@ -103,11 +103,15 @@ void LCD_Init(LCD_HandleTypeDef *lcd) {
     //http://nerdralph.blogspot.com/2014/07/controlling-hd44780-displays.html
     vTaskDelay(30);
     LCD_SendCommand(lcd, LCD_FUNCTIONSET | LCD_8BITMODE);
-    vTaskDelay(1);
+    vTaskDelay(5);
     LCD_SendCommand(lcd, LCD_FUNCTIONSET | LCD_8BITMODE);
-    vTaskDelay(1);
+    vTaskDelay(5);
     LCD_SendCommand(lcd, LCD_FUNCTIONSET | LCD_4BITMODE);
     vTaskDelay(1);
+    LCD_SendCommand(lcd, LCD_FUNCTIONSET | LCD_4BITMODE | LCD_SINGLELINE | LCD_5x8DOTS); // 0b00110000);
+    vTaskDelay(5);
+    LCD_SendCommand(lcd, LCD_FUNCTIONSET | LCD_4BITMODE | LCD_SINGLELINE | LCD_5x8DOTS); // 0b00110000);
+    vTaskDelay(5);
     LCD_SendCommand(lcd, LCD_FUNCTIONSET | LCD_4BITMODE | LCD_MULTILINE | LCD_5x8DOTS); // 0b00110000);
     vTaskDelay(5);
     // display & cursor home (keep this!)
diff --git a/Core/Src/main.c b/Core/Src/main.c
index ae7437b..6a97b5c 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -455,9 +455,7 @@ static void MX_GPIO_Init(void)
 
 void vTaskPlayerSetup(void *parameter)
 {
-  vTaskDelay(500);
   LCD_Init(&hlcd);
-  vTaskDelay(100);
   LCD_MoveCursor(&hlcd, 0, 0);
   LCD_SendString(&hlcd, "Settings");
   LCD_MoveCursor(&hlcd, 1, 0);
@@ -624,17 +622,15 @@ void vTaskButtonPoll(void *parameter) {
     for(int i = 0; i<BUTTON_COUNT; i++)
     {
       bool state = HAL_GPIO_ReadPin(buttons[i].port, buttons[i].pin);
-      vTaskDelay(1);
-      if (state && !buttons[i].temp)
-        buttons[i].temp = true;
-      else if (state && buttons[i].temp)
-        buttons[i].pressed = true;
-      else if (!state && !buttons[i].temp)
-        buttons[i].pressed = false;
-      else if (!state && buttons[i].pressed)
-        buttons[i].temp = false;
+      if (state != buttons[i].pressed)
+      {
+        vTaskDelay(100);
+        state = HAL_GPIO_ReadPin(buttons[i].port, buttons[i].pin);
+        if (state != buttons[i].pressed)
+          buttons[i].pressed = !buttons[i].pressed;
+      }
+      vTaskDelay(100);
     }
-    vTaskDelay(50);
   }
 }
 /* USER CODE END 4 */