Reorganize, scope, add GPIO

1 files changed, 4 insertions, 22 deletions

diff --git a/src/main.cpp b/src/main.cpp
index dbb929b..4ac8465 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,8 +7,9 @@
 #include <HTTPUpdateServer.h>
 #include <WebServer.h>
 
-#include "badge_config.h"
-#include "display.h"
+#include "badge/config.h"
+#include "badge/display.h"
+#include "badge/gpio.h"
 
 #if defined(BADGE_SSID_NAME) && defined(BADGE_SSID_PASS)
 #define BADGE_USE_WIFI 1
@@ -18,9 +19,6 @@
 
 NimBLEServer *server;
 
-unsigned long pressedTime = 0;
-unsigned long releasedTime = 0;
-#define BUTTON_PIN 0
 #define PRESS_TIME_DRAW 1000
 #define PRESS_TIME_BLE_ADV 3000
 #define SLEEP_TIME 10000
@@ -70,23 +68,7 @@ void loop()
     httpServer.handleClient();
 #endif
 
-    static int lastState = HIGH;
-    int buttonState = digitalRead(BUTTON_PIN);
-    long pressDuration = 0;
-    if (lastState == HIGH && buttonState == LOW)
-    {
-        Serial.println("``\\__");
-        pressedTime = millis();
-        lastState = LOW;
-    }
-    else if (lastState == LOW && buttonState == HIGH)
-    {
-        lastState = HIGH;
-        Serial.println("__/``");
-        releasedTime = millis();
-
-        pressDuration = releasedTime - pressedTime;
-    };
+    uint16_t pressDuration = de::uvok::badge::gpio_poll();
     if (pressDuration > PRESS_TIME_BLE_ADV)
     {
         if (!pAdvertising->isAdvertising())