9 files changed, 207 insertions, 0 deletions
diff --git a/shared-module/bitbangio/I2C.c b/shared-module/bitbangio/I2C.c
index 0f017fc18..7eeda0e00 100644
--- a/shared-module/bitbangio/I2C.c
+++ b/shared-module/bitbangio/I2C.c
@@ -162,7 +162,15 @@ void shared_module_bitbangio_i2c_construct(bitbangio_i2c_obj_t *self,
     stop(self);
 }
 
+bool shared_module_bitbangio_i2c_deinited(bitbangio_i2c_obj_t *self) {
+    // If one is deinited, both will be.
+    return common_hal_digitalio_digitalinout_deinited(&self->scl);
+}
+
 void shared_module_bitbangio_i2c_deinit(bitbangio_i2c_obj_t *self) {
+    if (shared_module_bitbangio_i2c_deinited(self)) {
+        return;
+    }
     common_hal_digitalio_digitalinout_deinit(&self->scl);
     common_hal_digitalio_digitalinout_deinit(&self->sda);
 }
diff --git a/shared-module/bitbangio/OneWire.c b/shared-module/bitbangio/OneWire.c
index 46c0c406c..e77bdb3b2 100644
--- a/shared-module/bitbangio/OneWire.c
+++ b/shared-module/bitbangio/OneWire.c
@@ -38,7 +38,14 @@ void shared_module_bitbangio_onewire_construct(bitbangio_onewire_obj_t* self,
     common_hal_digitalio_digitalinout_construct(&self->pin, pin);
 }
 
+bool shared_module_bitbangio_onewire_deinited(bitbangio_onewire_obj_t* self) {
+    return common_hal_digitalio_digitalinout_deinited(&self->pin);
+}
+
 void shared_module_bitbangio_onewire_deinit(bitbangio_onewire_obj_t* self) {
+    if (shared_module_bitbangio_onewire_deinited(self)) {
+        return;
+    }
     common_hal_digitalio_digitalinout_deinit(&self->pin);
 }
 
diff --git a/shared-module/bitbangio/SPI.c b/shared-module/bitbangio/SPI.c
index a3c70dde9..0576a6e56 100644
--- a/shared-module/bitbangio/SPI.c
+++ b/shared-module/bitbangio/SPI.c
@@ -70,7 +70,14 @@ void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self,
     self->phase = 0;
 }
 
+bool shared_module_bitbangio_spi_deinited(bitbangio_spi_obj_t *self) {
+    return common_hal_digitalio_digitalinout_deinited(&self->clock);
+}
+
 void shared_module_bitbangio_spi_deinit(bitbangio_spi_obj_t *self) {
+    if (shared_module_bitbangio_spi_deinited(self)) {
+        return;
+    }
     common_hal_digitalio_digitalinout_deinit(&self->clock);
     if (self->has_mosi) {
         common_hal_digitalio_digitalinout_deinit(&self->mosi);
diff --git a/shared-module/busio/I2C.c b/shared-module/busio/I2C.c
index f8f154e7f..68d6ea22a 100644
--- a/shared-module/busio/I2C.c
+++ b/shared-module/busio/I2C.c
@@ -34,6 +34,10 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     shared_module_bitbangio_i2c_construct(&self->bitbang, scl, sda, freq);
 }
 
+bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self) {
+    return shared_module_bitbangio_i2c_deinited(&self->bitbang);
+}
+
 void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
     shared_module_bitbangio_i2c_deinit(&self->bitbang);
 }
diff --git a/shared-module/busio/OneWire.c b/shared-module/busio/OneWire.c
index 73d3d29d7..6bb7dedcd 100644
--- a/shared-module/busio/OneWire.c
+++ b/shared-module/busio/OneWire.c
@@ -34,7 +34,14 @@ void common_hal_busio_onewire_construct(busio_onewire_obj_t* self,
     shared_module_bitbangio_onewire_construct(&self->bitbang, pin);
 }
 
+bool common_hal_busio_onewire_deinited(busio_onewire_obj_t* self) {
+    return shared_module_bitbangio_onewire_deinited(&self->bitbang);
+}
+
 void common_hal_busio_onewire_deinit(busio_onewire_obj_t* self) {
+    if (common_hal_busio_onewire_deinited(self)) {
+        return;
+    }
     shared_module_bitbangio_onewire_deinit(&self->bitbang);
 }
 
diff --git a/shared-module/gamepad/GamePad.c b/shared-module/gamepad/GamePad.c
new file mode 100644
index 000000000..3a2b8a3fe
--- /dev/null
+++ b/shared-module/gamepad/GamePad.c
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Radomir Dopieralski for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdbool.h>
+
+#include "__init__.h"
+#include "GamePad.h"
+
+#include "shared-bindings/digitalio/Pull.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+
+
+void gamepad_init(size_t n_pins, const mp_obj_t* pins) {
+    for (size_t i=0; i<8; ++i) {
+        gamepad_singleton->pins[i] = NULL;
+    }
+    for (size_t i=0; i<n_pins; ++i) {
+        digitalio_digitalinout_obj_t *pin = MP_OBJ_TO_PTR(pins[i]);
+        gamepad_singleton->pins[i] = pin;
+        common_hal_digitalio_digitalinout_switch_to_input(pin, PULL_UP);
+    }
+    gamepad_singleton->last = 0;
+}
diff --git a/shared-module/gamepad/GamePad.h b/shared-module/gamepad/GamePad.h
new file mode 100644
index 000000000..e5f709134
--- /dev/null
+++ b/shared-module/gamepad/GamePad.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Radomir Dopieralski for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_GAMEPAD_GAMEPAD_H
+#define MICROPY_INCLUDED_GAMEPAD_GAMEPAD_H
+
+#include <stdint.h>
+
+#include "shared-bindings/digitalio/DigitalInOut.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    digitalio_digitalinout_obj_t* pins[8];
+    volatile uint8_t last;
+    volatile uint8_t pressed;
+} gamepad_obj_t;
+
+extern gamepad_obj_t* gamepad_singleton;
+
+void gamepad_init(size_t n_pins, const mp_obj_t* pins);
+
+#endif  // MICROPY_INCLUDED_GAMEPAD_GAMEPAD_H
diff --git a/shared-module/gamepad/__init__.c b/shared-module/gamepad/__init__.c
new file mode 100644
index 000000000..1aebf611d
--- /dev/null
+++ b/shared-module/gamepad/__init__.c
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Radomir Dopieralski for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdbool.h>
+
+#include "__init__.h"
+#include "GamePad.h"
+
+#include "shared-bindings/digitalio/DigitalInOut.h"
+
+
+void gamepad_tick(void) {
+    if (!gamepad_singleton) {
+        return;
+    }
+    uint8_t gamepad_current = 0;
+    for (int i=0; i<8; ++i) {
+        digitalio_digitalinout_obj_t* pin = gamepad_singleton->pins[i];
+        if (!pin) {
+            break;
+        }
+        if (!common_hal_digitalio_digitalinout_get_value(pin)) {
+            gamepad_current |= 1<<i;
+        }
+    }
+    gamepad_singleton->pressed |= gamepad_singleton->last & gamepad_current;
+    gamepad_singleton->last = gamepad_current;
+}
diff --git a/shared-module/gamepad/__init__.h b/shared-module/gamepad/__init__.h
new file mode 100644
index 000000000..eacd72366
--- /dev/null
+++ b/shared-module/gamepad/__init__.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_GAMEPAD_H
+#define MICROPY_INCLUDED_GAMEPAD_H
+
+void gamepad_tick(void);
+
+#endif  // MICROPY_INCLUDED_GAMEPAD_H