Reorganize, scope, add GPIO

8 files changed, 50 insertions, 61 deletions

diff --git a/include/README b/include/README
index 49819c0..030c5f4 100644
--- a/include/README
+++ b/include/README
@@ -1,37 +1 @@
-
-This directory is intended for project header files.
-
-A header file is a file containing C declarations and macro definitions
-to be shared between several project source files. You request the use of a
-header file in your project source file (C, C++, etc) located in `src` folder
-by including it, with the C preprocessing directive `#include'.
-
-```src/main.c
-
-#include "header.h"
-
-int main (void)
-{
- ...
-}
-```
-
-Including a header file produces the same results as copying the header file
-into each source file that needs it. Such copying would be time-consuming
-and error-prone. With a header file, the related declarations appear
-in only one place. If they need to be changed, they can be changed in one
-place, and programs that include the header file will automatically use the
-new version when next recompiled. The header file eliminates the labor of
-finding and changing all the copies as well as the risk that a failure to
-find one copy will result in inconsistencies within a program.
-
-In C, the convention is to give header files names that end with `.h'.
-
-Read more about using header files in official GCC documentation:
-
-* Include Syntax
-* Include Operation
-* Once-Only Headers
-* Computed Includes
-
-https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
+everything in badge b/c of scoping.
diff --git a/include/badge_config.h.template b/include/badge/config.h.template
index c2d0b42..c2d0b42 100644
--- a/include/badge_config.h.template
+++ b/include/badge/config.h.template
diff --git a/include/display.h b/include/badge/display.h
index e6f47cc..e6f47cc 100644
--- a/include/display.h
+++ b/include/badge/display.h
diff --git a/include/displays.h b/include/badge/displays.h
index f588697..f588697 100644
--- a/include/displays.h
+++ b/include/badge/displays.h
diff --git a/include/badge/gpio.h b/include/badge/gpio.h
new file mode 100644
index 0000000..7259fbe
--- /dev/null
+++ b/include/badge/gpio.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace de::uvok::badge
+{
+    void gpio_init(void);
+    // return ms pressed
+    long gpio_poll(void);
+}
diff --git a/src/display.cpp b/src/display.cpp
index cde438f..54da2db 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -1,11 +1,11 @@
-#include "display.h"
+#include "badge/display.h"
 
 #include <Fonts/FreeMonoBold18pt7b.h>
 #include <Fonts/FreeMonoBold9pt7b.h>
 // #include <GxEPD2_3C.h>
 #include <GxEPD2_BW.h>
 
-#include "badge_config.h"
+#include "badge/config.h"
 
 #if UVOK_EPAP_DISPLAY == DISPLAY_WAVESHARE_219_YBW
 // HINT: Update the library code, set budy timeout to 30 or 60 seconds!
diff --git a/src/gpio.cpp b/src/gpio.cpp
new file mode 100644
index 0000000..d7dcd7b
--- /dev/null
+++ b/src/gpio.cpp
@@ -0,0 +1,35 @@
+#include "badge/gpio.h"
+
+#include  <Arduino.h>
+
+#define BUTTON_PIN 0
+
+static unsigned long pressedTime = 0;
+static unsigned long releasedTime = 0;
+
+void de::uvok::badge::gpio_init(void)
+{
+}
+
+long de::uvok::badge::gpio_poll(void)
+{
+    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;
+    };
+
+    return pressDuration;
+}
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())