From 7ad423923dddb5e037d54e70cb066b03f8346dec Mon Sep 17 00:00:00 2001
From: Ameer <aj662@drexel.edu>
Date: Mon, 6 Jul 2020 21:58:31 -0400
Subject: Save origin state of GC controller analog features, compare against
 origin for input detection

---
 src/input_common/gcadapter/gc_adapter.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/input_common/gcadapter/gc_adapter.h')

diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h
index 0ea6263eb..8b08d667d 100644
--- a/src/input_common/gcadapter/gc_adapter.h
+++ b/src/input_common/gcadapter/gc_adapter.h
@@ -13,12 +13,6 @@
 
 namespace GCAdapter {
 
-enum {
-    PAD_USE_ORIGIN = 0x0080,
-    PAD_GET_ORIGIN = 0x2000,
-    PAD_ERR_STATUS = 0x8000,
-};
-
 enum class PadButton {
     PAD_BUTTON_LEFT = 0x0001,
     PAD_BUTTON_RIGHT = 0x0002,
@@ -102,6 +96,9 @@ public:
     std::array<GCState, 4>& GetPadState();
     const std::array<GCState, 4>& GetPadState() const;
 
+    int GetOriginValue(int port, int axis);
+    const int GetOriginValue(int port, int axis) const;
+
 private:
     GCPadStatus GetPadStatus(int port, const std::array<u8, 37>& adapter_payload);
 
@@ -155,6 +152,8 @@ private:
 
     std::array<Common::SPSCQueue<GCPadStatus>, 4> pad_queue;
     std::array<GCState, 4> state;
+    std::array<bool, 4> get_origin;
+    std::array<GCPadStatus, 4> origin_status;
 };
 
 } // namespace GCAdapter
-- 
cgit v1.2.3