nunchuck and gamecube fixes

Author: arpruss

src/GameControllers.h

@@ -21,13 +21,12 @@
 
 typedef struct {
     gpio_dev* device;
-    volatile uint32_t* port;
     uint32_t mask;
     uint32_t pinNumber;
 } PortData;
 
 typedef struct {
-  uint8_t buttons;
+  uint16_t buttons;
   uint8_t joystickX;
   uint8_t joystickY;
   uint8_t cX;
@@ -38,7 +37,7 @@ typedef struct {
 
 typedef struct {
   uint8_t device;
-  uint8_t buttons;
+  uint16_t buttons;
   uint16_t joystickX; // 10 bit range for analog values
   uint16_t joystickY;
   uint16_t cX;
@@ -51,12 +50,10 @@ class GameController {
     protected:
         void setPortData(PortData *p, unsigned pin) {
             if (pin == INPUT_NOT_IMPLEMENTED) {
-                p->port = NULL;
                 p->device = NULL;
             }
             else {
                 p->device = digitalPinToPort(pin);
-                p->port = portOutputRegister(p->device);
                 p->mask = digitalPinToBitMask(pin);
                 p->pinNumber = PIN_MAP[pin].gpio_bit;
             }
@@ -72,15 +69,18 @@ class GameController {
 
 class NunchuckController : public GameController {
     private:
-#ifdef NUNCHUCK_SOFT_I2C
-        TwoWire* wire;
-#else    
-        HardWire wire;
-#endif
         static uint16_t rescale(uint8_t value); // 8 to 10 bit
         uint8_t sendBytes(uint8_t location, uint8_t value);
         const uint8_t i2cAddress = 0x52;
         uint8_t buffer[6];
+        unsigned scl;
+        unsigned sda;
+#ifdef NUNCHUCK_SOFT_I2C
+        TwoWire* wire;
+#else
+        HardWire* wire;
+#endif    
+        
 
     public:
         bool begin(void);

src/gamecube.cpp

@@ -8,7 +8,7 @@ static const uint32_t bitReceiveCycles = cyclesPerUS * 4;
 static const uint32_t halfBitReceiveCycles = cyclesPerUS * 2;
 
 GameCubeController::GameCubeController(unsigned p) {
-    setPortData(&port, p );
+    setPortData(&port, p);
 }
 
 bool GameCubeController::begin() {
@@ -25,13 +25,13 @@ void GameCubeController::sendBits(uint32_t data, uint8_t bits) {
   DWT->CYCCNT = 0;
   uint32_t timerEnd = DWT->CYCCNT;
   do {
-    *port.port &= ~port.mask;
+    gpio_write_bit(port.device, port.pinNumber, 0);
     if (0x80000000ul & data)
       timerEnd += quarterBitSendingCycles;
     else
       timerEnd += 3 * quarterBitSendingCycles;
     while (DWT->CYCCNT < timerEnd) ;
-    *port.port |= port.mask;
+    gpio_write_bit(port.device, port.pinNumber, 1);
     if (0x80000000ul & data)
       timerEnd += 3 * quarterBitSendingCycles;
     else
@@ -52,10 +52,12 @@ bool GameCubeController::receiveBits(void* data0, uint32_t bits) {
 
   *data = 0;
   do {
-    if (!(*port.port & port.mask)) {
+      if (!gpio_read_bit(port.device, port.pinNumber)) {
+
       DWT->CYCCNT = 0;
       while (DWT->CYCCNT < halfBitReceiveCycles - 2) ;
-      if (*port.port & port.mask) {
+        if (gpio_read_bit(port.device, port.pinNumber)) {
+
         *data |= bitmap;
       }
       bitmap >>= 1;
@@ -66,7 +68,7 @@ bool GameCubeController::receiveBits(void* data0, uint32_t bits) {
         if (bits)
           *data = 0;
       }
-      while (0 == (*port.port & port.mask) && --timeout) ;
+      while (!gpio_read_bit(port.device, port.pinNumber) && --timeout) ;
       if (timeout == 0) {
         break;
       }
@@ -83,12 +85,12 @@ bool GameCubeController::readWithRumble(GameControllerData_t* data, bool rumble)
     nvic_globalirq_enable();
     delayMicroseconds(400);
     fails = 0;
-  }
+  }
   nvic_globalirq_disable();
   sendBits(rumble ? 0b0100000000000011000000011l : 0b0100000000000011000000001l, 25);
   bool success = receiveBits(&gcData, 64);
   nvic_globalirq_enable();
-  if (success && 0 == (data->buttons & 0x80) && (data->buttons & 0x8000) ) {
+  if (success && 0 == (gcData.buttons & 0x80) && (gcData.buttons & 0x8000) ) {
     data->device = CONTROLLER_GAMECUBE;
     data->buttons = gcData.buttons;
     data->joystickX = rescale(gcData.joystickX);

src/nunchuck.cpp

@@ -1,18 +1,25 @@
 #include "GameControllers.h"
 #include <string.h>
 
-#define SOFT_I2C // currently, HardWire doesn't work well for hotplugging
+#define NUNCHUCK_SOFT_I2C // currently, HardWire doesn't work well for hotplugging
                  // Also, it probably won't well with SPI remap
 
-NunchuckController::NunchuckController(unsigned scl, unsigned sda) {
-#ifdef NUNCHUCK_SOFT_I2C
-    wire = new TwoWire(scl, sda, SOFT_STANDARD);      
-#else
-    wire = new HardWire(1, 0); // I2C_FAST_MODE); 
-#endif    
+NunchuckController::NunchuckController(unsigned _scl, unsigned _sda) {
+    scl = _scl;
+    sda = _sda;
 }
 
 bool NunchuckController::begin() {
+    if (wire == NULL) {
+#ifdef NUNCHUCK_SOFT_I2C
+        wire = new TwoWire(scl, sda, SOFT_STANDARD);
+#else
+#error Hardware I2C has trouble with hotplugging.    
+        wire = new HardWire(1, 0); // I2C_FAST_MODE); 
+#endif    
+        wire->begin();
+    }
+    
 #ifdef MANUAL_DECRYPT
     if (!sendBytes(0x40,0x00)) {
         return false;