Extract HID Configuration

sieren · Feb 7, 2021 · 91dbb3a · 91dbb3a
1 parent 0e53cd8
commit 91dbb3a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/main/config/HID_Config.h b/main/config/HID_Config.h
@@ -0,0 +1,10 @@
+#pragma once
+
+// Constants for interacting with the interface
+// Used by Touch- and Buttondriver
+static const unsigned long MSBeforeLongPress = 500; // 1.5s before long press
+static const unsigned long MSBeforeTap = 300; // 0.2s before tap
+static const unsigned long MSBeforeInvalid = 1500; // 2s before invalidate presses
+
+static const int ScreenWidth = 320;
+static const int ScreenHeight = 240;
diff --git a/main/touch/ButtonDriver.cpp b/main/touch/ButtonDriver.cpp
@@ -1,5 +1,6 @@
 #include <touch/ButtonDriver.h>
-#include <config/Config.h>
+
+#include <config/HID_Config.h>
 
 // Specifically for M5Stack which uses Pull-Ups on buttons
 

diff --git a/main/touch/ButtonTypes.h b/main/touch/ButtonTypes.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <config/HID_Config.h>
+
 namespace gfx
 {
   enum class PressState: int

diff --git a/main/touch/TouchDriver.ipp b/main/touch/TouchDriver.ipp
@@ -3,6 +3,7 @@
 
 #include "TouchDriver.h"
 #include "Arduino.h"
+#include <config/HID_Config.h>
 #include <tft/ScreenSaver.hpp>
 
 namespace gfx

diff --git a/main/touch/TouchTypes.hpp b/main/touch/TouchTypes.hpp
@@ -2,13 +2,6 @@
 
 #include "ui/UIPosition.hpp"
 
-static const unsigned long MSBeforeLongPress = 500; // 1.5s before long press
-static const unsigned long MSBeforeTap = 300; // 0.2s before tap
-static const unsigned long MSBeforeInvalid = 1500; // 2s before invalidate presses
-
-static const int ScreenWidth = 320;
-static const int ScreenHeight = 240;
-
 namespace gfx
 {
   enum class TouchState: int