summaryrefslogtreecommitdiff
path: root/src/input_common/gcadapter/gc_adapter.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-07-16 11:40:09 -0400
committerGitHub <noreply@github.com>2020-07-16 11:40:09 -0400
commita89dfc9183347be638f49f8d9ca4d0f38ca9de76 (patch)
tree3c01f62ddd0b416ced79f288736e0d1fa9b6a586 /src/input_common/gcadapter/gc_adapter.h
parent2781201bfb507fb47a103843755ee0dc8e2e6d23 (diff)
parent93fe982a0c3a5bfb7fa5df97ebced0a7692ccaf3 (diff)
Merge pull request #4261 from ameerj/gc-calibration
input_common: GC Controller save and compare against analog origin state
Diffstat (limited to 'src/input_common/gcadapter/gc_adapter.h')
-rw-r--r--src/input_common/gcadapter/gc_adapter.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h
index e2cdd6255..3586c8bda 100644
--- a/src/input_common/gcadapter/gc_adapter.h
+++ b/src/input_common/gcadapter/gc_adapter.h
@@ -17,12 +17,6 @@ struct libusb_device_handle;
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,
@@ -109,6 +103,8 @@ public:
std::array<GCState, 4>& GetPadState();
const std::array<GCState, 4>& GetPadState() const;
+ int GetOriginValue(int port, int axis) const;
+
private:
GCPadStatus GetPadStatus(std::size_t port, const std::array<u8, 37>& adapter_payload);
@@ -159,6 +155,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