Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed minimum number of joystick axes (#696)

Browse Source
This commit is contained in:
Tyler Veness
2017-10-29 17:21:50 -07:00
committed by Peter Johnson
parent efc7770e9b
commit 595b1df380
3 changed files with 29 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wpilibc/src/main/native/include/Joystick.h
View File

@@ -7,7 +7,7 @@
#pragma once
#include <vector>
#include <array>
#include <support/deprecated.h>
@@ -30,7 +30,6 @@ class Joystick : public GenericHID {
static constexpr int kDefaultZAxis = 2;
static constexpr int kDefaultTwistAxis = 2;
static constexpr int kDefaultThrottleAxis = 3;
static constexpr int kMinNumAxes = 4;
enum AxisType { kXAxis, kYAxis, kZAxis, kTwistAxis, kThrottleAxis };
enum ButtonType { kTriggerButton, kTopButton };
@@ -87,10 +86,10 @@ class Joystick : public GenericHID {
double GetDirectionDegrees() const;
private:
enum class Axis { kX, kY, kZ, kTwist, kThrottle };
enum class Button { kTrigger = 1, kTop = 2 };
enum Axis { kX, kY, kZ, kTwist, kThrottle, kNumAxes };
enum Button { kTrigger = 1, kTop = 2 };
std::vector<int> m_axes;
std::array<int, Axis::kNumAxes> m_axes;
};
} // namespace frc