Revision 16:3ea3d9714b0c, committed 2017-03-03

Comitter:

valavanisalex

Date:

Fri Mar 03 13:19:19 2017 +0000

Parent:

15:c582b3326d44

Child:

17:cf1e1ffcf773

Commit message:

Move Gamepad events enum into class. Too class-specific to be defined externally.

Changed in this revision

--- a/Gamepad.cpp	Fri Mar 03 13:12:03 2017 +0000
+++ b/Gamepad.cpp	Fri Mar 03 13:19:19 2017 +0000
@@ -220,39 +220,39 @@
 // variable
 void Gamepad::a_isr()
 {
-    _event_state.set(EVENT_A_PRESSED);
+    _event_state.set(A_PRESSED);
 }
 void Gamepad::b_isr()
 {
-    _event_state.set(EVENT_B_PRESSED);
+    _event_state.set(B_PRESSED);
 }
 void Gamepad::x_isr()
 {
-    _event_state.set(EVENT_X_PRESSED);
+    _event_state.set(X_PRESSED);
 }
 void Gamepad::y_isr()
 {
-    _event_state.set(EVENT_Y_PRESSED);
+    _event_state.set(Y_PRESSED);
 }
 void Gamepad::l_isr()
 {
-    _event_state.set(EVENT_L_PRESSED);
+    _event_state.set(L_PRESSED);
 }
 void Gamepad::r_isr()
 {
-    _event_state.set(EVENT_R_PRESSED);
+    _event_state.set(R_PRESSED);
 }
 void Gamepad::back_isr()
 {
-    _event_state.set(EVENT_BACK_PRESSED);
+    _event_state.set(BACK_PRESSED);
 }
 void Gamepad::start_isr()
 {
-    _event_state.set(EVENT_START_PRESSED);
+    _event_state.set(START_PRESSED);
 }
 void Gamepad::joy_isr()
 {
-    _event_state.set(EVENT_JOY_PRESSED);
+    _event_state.set(JOY_PRESSED);
 }
 
 // get raw joystick coordinate in range -1 to 1

--- a/Gamepad.h	Fri Mar 03 13:12:03 2017 +0000
+++ b/Gamepad.h	Fri Mar 03 13:19:19 2017 +0000
@@ -42,23 +42,6 @@
     float angle; /**< float for angle (in degrees) */
 };
 
-
-/** Gamepad events 
- * @brief List of events that can be registered on the gamepad
- */
-enum GamepadEvent {
-    EVENT_A_PRESSED,     ///< Button A has been pressed
-    EVENT_B_PRESSED,     ///< Button B has been pressed
-    EVENT_X_PRESSED,     ///< Button X has been pressed
-    EVENT_Y_PRESSED,     ///< Button Y has been pressed
-    EVENT_L_PRESSED,     ///< Button L has been pressed
-    EVENT_R_PRESSED,     ///< Button R has been pressed
-    EVENT_BACK_PRESSED,  ///< Button "Back" has been pressed
-    EVENT_START_PRESSED, ///< Button "Start" has been pressed
-    EVENT_JOY_PRESSED,   ///< Joystick button has been pressed
-    N_EVENTS             ///< A dummy flag that marks the end of the list
-};
-
 /** Gamepad Class
 @brief Library for interfacing with ELEC2645 Gamepad PCB, University of Leeds
 @author Dr Craig A. Evans
@@ -66,6 +49,22 @@
 */
 class Gamepad
 {
+    public:
+    /** Gamepad events 
+ * @brief List of events that can be registered on the gamepad
+ */
+enum GamepadEvent {
+    A_PRESSED,     ///< Button A has been pressed
+    B_PRESSED,     ///< Button B has been pressed
+    X_PRESSED,     ///< Button X has been pressed
+    Y_PRESSED,     ///< Button Y has been pressed
+    L_PRESSED,     ///< Button L has been pressed
+    R_PRESSED,     ///< Button R has been pressed
+    BACK_PRESSED,  ///< Button "Back" has been pressed
+    START_PRESSED, ///< Button "Start" has been pressed
+    JOY_PRESSED,   ///< Joystick button has been pressed
+    N_EVENTS       ///< A dummy flag that marks the end of the list
+};
 private:
     mbed::PwmOut *_led1;
     mbed::PwmOut *_led2;