From 46b4461fbb0514dd50c096ef896b1752d81079d0 Mon Sep 17 00:00:00 2001
From: Ameer <aj662@drexel.edu>
Date: Sun, 21 Jun 2020 21:50:58 -0400
Subject: shared_ptr for the GC adapter class, constexpr constants

---
 src/input_common/gcadapter/gc_adapter.cpp | 40 +++++++++++++------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

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

diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp
index 498bd0d6e..db72d7633 100644
--- a/src/input_common/gcadapter/gc_adapter.cpp
+++ b/src/input_common/gcadapter/gc_adapter.cpp
@@ -6,7 +6,6 @@
 #include "input_common/gcadapter/gc_adapter.h"
 
 namespace GCAdapter {
-Adapter* Adapter::adapter_instance{nullptr};
 
 Adapter::Adapter() {
     if (usb_adapter_handle != nullptr) {
@@ -20,13 +19,6 @@ Adapter::Adapter() {
     StartScanThread();
 }
 
-Adapter* Adapter::GetInstance() {
-    if (!adapter_instance) {
-        adapter_instance = new Adapter;
-    }
-    return adapter_instance;
-}
-
 GCPadStatus Adapter::CheckStatus(int port, u8 adapter_payload[37]) {
     GCPadStatus pad = {};
     bool get_origin = false;
@@ -151,34 +143,26 @@ void Adapter::Read() {
                 }
 
                 // Accounting for a threshold here because of some controller variance
-                if (pad[port].stick_x >
-                        pad_constants.MAIN_STICK_CENTER_X + pad_constants.THRESHOLD ||
-                    pad[port].stick_x <
-                        pad_constants.MAIN_STICK_CENTER_X - pad_constants.THRESHOLD) {
+                if (pad[port].stick_x > pad[port].MAIN_STICK_CENTER_X + pad[port].THRESHOLD ||
+                    pad[port].stick_x < pad[port].MAIN_STICK_CENTER_X - pad[port].THRESHOLD) {
                     pad[port].axis = GCAdapter::PadAxes::StickX;
                     pad[port].axis_value = pad[port].stick_x;
                     pad_queue[port].Push(pad[port]);
                 }
-                if (pad[port].stick_y >
-                        pad_constants.MAIN_STICK_CENTER_Y + pad_constants.THRESHOLD ||
-                    pad[port].stick_y <
-                        pad_constants.MAIN_STICK_CENTER_Y - pad_constants.THRESHOLD) {
+                if (pad[port].stick_y > pad[port].MAIN_STICK_CENTER_Y + pad[port].THRESHOLD ||
+                    pad[port].stick_y < pad[port].MAIN_STICK_CENTER_Y - pad[port].THRESHOLD) {
                     pad[port].axis = GCAdapter::PadAxes::StickY;
                     pad[port].axis_value = pad[port].stick_y;
                     pad_queue[port].Push(pad[port]);
                 }
-                if (pad[port].substick_x >
-                        pad_constants.C_STICK_CENTER_X + pad_constants.THRESHOLD ||
-                    pad[port].substick_x <
-                        pad_constants.C_STICK_CENTER_X - pad_constants.THRESHOLD) {
+                if (pad[port].substick_x > pad[port].C_STICK_CENTER_X + pad[port].THRESHOLD ||
+                    pad[port].substick_x < pad[port].C_STICK_CENTER_X - pad[port].THRESHOLD) {
                     pad[port].axis = GCAdapter::PadAxes::SubstickX;
                     pad[port].axis_value = pad[port].substick_x;
                     pad_queue[port].Push(pad[port]);
                 }
-                if (pad[port].substick_y >
-                        pad_constants.C_STICK_CENTER_Y + pad_constants.THRESHOLD ||
-                    pad[port].substick_y <
-                        pad_constants.C_STICK_CENTER_Y - pad_constants.THRESHOLD) {
+                if (pad[port].substick_y > pad[port].C_STICK_CENTER_Y + pad[port].THRESHOLD ||
+                    pad[port].substick_y < pad[port].C_STICK_CENTER_Y - pad[port].THRESHOLD) {
                     pad[port].axis = GCAdapter::PadAxes::SubstickY;
                     pad[port].axis_value = pad[port].substick_y;
                     pad_queue[port].Push(pad[port]);
@@ -367,8 +351,16 @@ std::array<Common::SPSCQueue<GCPadStatus>, 4>& Adapter::GetPadQueue() {
     return pad_queue;
 }
 
+const std::array<Common::SPSCQueue<GCPadStatus>, 4>& Adapter::GetPadQueue() const {
+    return pad_queue;
+}
+
 std::array<GCState, 4>& Adapter::GetPadState() {
     return state;
 }
 
+const std::array<GCState, 4>& Adapter::GetPadState() const {
+    return state;
+}
+
 } // end of namespace GCAdapter
-- 
cgit v1.2.3