foo

Author: arpruss

src/GameControllers.h

@@ -176,9 +176,9 @@ class GameCubeController : public GameController {
 			else
 				return v;
         }
+    public:
         void sendBits(uint32_t data, uint8_t bits);
         bool receiveBits(void* data0, uint32_t bits);
-    public:
         bool begin(void);
         bool read(GameControllerData_t* data);
         bool readWithRumble(GameControllerData_t* data, bool rumble);

src/gamecube.cpp

@@ -172,7 +172,7 @@ bool GameCubeController::readWithRumble(GameCubeData_t* data, bool rumble) {
     nvic_globalirq_disable();
     sendBits(0b000000001l, 9);
     nvic_globalirq_enable();
-    delayMicroseconds(400);
+    delayMicroseconds(410);
     fails = 0;
   }
   nvic_globalirq_disable();
@@ -184,7 +184,7 @@ bool GameCubeController::readWithRumble(GameCubeData_t* data, bool rumble) {
 
 bool GameCubeController::readWithRumble(GameControllerData_t* data, bool rumble) {
   bool success = readWithRumble(&gcData, rumble);
-  if (success && 0 == (gcData.buttons & 0x80) && (gcData.buttons & 0x8000) ) {
+  if (success && 0 == (gcData.buttons & 0x80) /*&& (gcData.buttons & 0x8000)*/ ) {
     data->device = CONTROLLER_GAMECUBE;
     data->buttons = gcData.buttons;
     data->joystickX = rescale(gcData.joystickX);