atmel-samd & esp8266: Make sure pins are not already in use.

This prevents corrupting previous functional objects by stealing their pins
out from under them. It prevents this by ensuring that pins are in default
state before claiming them. It also verifies pins are released correctly and
reset on soft reset.

Fixes #4, instantiating a second class will fail.
Fixes #29, pins are now reset too.

Author: tannewt

atmel-samd/boards/arduino_zero/mpconfigboard.h

@@ -7,6 +7,9 @@
 #define MICROPY_HW_LED_TX   PIN_PA27
 #define MICROPY_HW_LED_RX   PIN_PB03
 
+#define MICROPY_PORT_A        (PORT_PA24 | PORT_PA25 | PORT_PA27)
+#define MICROPY_PORT_B        (PORT_PB03)
+
 #define AUTORESET_DELAY_MS 500
 
 #include "internal_flash.h"

atmel-samd/boards/cplay_m0_flash/mpconfigboard.h

@@ -17,6 +17,9 @@
 #define SPI_FLASH_CS          PIN_PB08
 #define SPI_FLASH_SERCOM      SERCOM4
 
+#define MICROPY_PORT_A        (PORT_PA12 | PORT_PA24 | PORT_PA25)
+#define MICROPY_PORT_B        (PORT_PB08 | PORT_PB10 | PORT_PB11)
+
 #define AUTORESET_DELAY_MS 500
 
 #include "spi_flash.h"

atmel-samd/boards/feather_m0_adalogger/mpconfigboard.h

@@ -1,5 +1,5 @@
 // LEDs
-#define MICROPY_HW_LED_MSC              PIN_PA17 // red
+//#define MICROPY_HW_LED_MSC              PIN_PA17 // red
 // #define UART_REPL
 #define USB_REPL
 
@@ -8,6 +8,9 @@
 
 #define AUTORESET_DELAY_MS 500
 
+#define MICROPY_PORT_A        (PORT_PA24 | PORT_PA25)
+#define MICROPY_PORT_B        (0)
+
 #include "internal_flash.h"
 
 #define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)

atmel-samd/boards/feather_m0_basic/mpconfigboard.h

@@ -1,5 +1,5 @@
 // LEDs
-#define MICROPY_HW_LED_MSC              PIN_PA17 // red
+//#define MICROPY_HW_LED_MSC              PIN_PA17 // red
 // #define UART_REPL
 #define USB_REPL
 
@@ -8,6 +8,9 @@
 
 #define AUTORESET_DELAY_MS 500
 
+#define MICROPY_PORT_A        (PORT_PA24 | PORT_PA25)
+#define MICROPY_PORT_B        (0)
+
 #include "internal_flash.h"
 
 #define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)

atmel-samd/boards/feather_m0_flash/mpconfigboard.h

@@ -18,6 +18,9 @@
 #define SPI_FLASH_CS          PIN_PA13
 #define SPI_FLASH_SERCOM      SERCOM4
 
+#define MICROPY_PORT_A        (PORT_PA12 | PORT_PA13 | PORT_PA14 | PORT_PA24 | PORT_PA25)
+#define MICROPY_PORT_B        (PORT_PB10 | PORT_PB11)
+
 #define AUTORESET_DELAY_MS 500
 
 #include "spi_flash.h"

atmel-samd/boards/gemma_m0/mpconfigboard.h

@@ -3,8 +3,12 @@
 #define MICROPY_HW_BOARD_NAME "Adafruit Gemma M0 (Experimental)"
 #define MICROPY_HW_MCU_NAME "samd21e18"
 
-#define MICROPY_HW_APA102_MOSI &pin_PA04
-#define MICROPY_HW_APA102_SCK  &pin_PA05
+#define MICROPY_HW_APA102_SERCOM SERCOM0
+#define MICROPY_HW_APA102_MOSI   &pin_PA04
+#define MICROPY_HW_APA102_SCK    &pin_PA05
+
+#define MICROPY_PORT_A        (PORT_PA04 | PORT_PA05 | PORT_PA24 | PORT_PA25)
+#define MICROPY_PORT_B        (0)
 
 #define AUTORESET_DELAY_MS 500
 

atmel-samd/boards/metro_m0_flash/mpconfigboard.h

@@ -32,6 +32,9 @@
 #define SPI_FLASH_CS          PIN_PA13
 #define SPI_FLASH_SERCOM      SERCOM4
 
+#define MICROPY_PORT_A        (PORT_PA12 | PORT_PA13 |PORT_PA24 | PORT_PA25 | PORT_PA27 | PORT_PA30)
+#define MICROPY_PORT_B        (PORT_PB03 | PORT_PB10 | PORT_PB11)
+
 #define AUTORESET_DELAY_MS 500
 
 #include "spi_flash.h"

atmel-samd/boards/trinket_m0/mpconfigboard.h

@@ -3,8 +3,12 @@
 #define MICROPY_HW_BOARD_NAME "Adafruit Trinket M0 (Experimental)"
 #define MICROPY_HW_MCU_NAME "samd21e18"
 
-#define MICROPY_HW_APA102_MOSI &pin_PA04
-#define MICROPY_HW_APA102_SCK  &pin_PA05
+#define MICROPY_HW_APA102_SERCOM SERCOM0
+#define MICROPY_HW_APA102_MOSI   &pin_PA04
+#define MICROPY_HW_APA102_SCK    &pin_PA05
+
+#define MICROPY_PORT_A        (PORT_PA04 | PORT_PA05 | PORT_PA24 | PORT_PA25)
+#define MICROPY_PORT_B        (0)
 
 #define AUTORESET_DELAY_MS 500
 

atmel-samd/common-hal/microcontroller/Pin.c

@@ -1 +1,36 @@
-// Pins have no behavior.
+/*
+ * 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.
+ */
+
+#include "shared-bindings/microcontroller/Pin.h"
+
+bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t* pin) {
+    PortGroup *const port = system_pinmux_get_group_from_gpio_pin(pin->pin);
+    uint32_t pin_index = (pin->pin);
+    PORT_PINCFG_Type state = port->PINCFG[pin_index];
+
+    return state.bit.PMUXEN == 0 && state.bit.INEN == 0 &&
+           state.bit.PULLEN == 0 && (port->DIR.reg & (1 << pin_index)) == 0;
+}

atmel-samd/common-hal/nativeio/AnalogIn.c

@@ -33,6 +33,7 @@
 #include "shared-bindings/nativeio/AnalogIn.h"
 
 #include "asf/sam0/drivers/adc/adc.h"
+#include "samd21_pins.h"
 
 void common_hal_nativeio_analogin_construct(nativeio_analogin_obj_t* self,
         const mcu_pin_obj_t *pin) {
@@ -55,6 +56,13 @@ void common_hal_nativeio_analogin_construct(nativeio_analogin_obj_t* self,
     adc_init(&self->adc_instance, ADC, &config_adc);
 }
 
+void common_hal_nativeio_analogin_deinit(nativeio_analogin_obj_t *self) {
+    // TODO(tannewt): Count how many pins are in use and only reset the ADC when
+    // none are used.
+    adc_reset(&self->adc_instance);
+    reset_pin(self->pin->pin);
+}
+
 // TODO(tannewt): Don't turn it all on just for one read. This simplifies
 // handling of reading multiple inputs and surviving sleep though so for now its
 // ok.

atmel-samd/common-hal/nativeio/AnalogOut.c

@@ -32,6 +32,7 @@
 #include "shared-bindings/nativeio/AnalogOut.h"
 
 #include "asf/sam0/drivers/dac/dac.h"
+#include "samd21_pins.h"
 
 void common_hal_nativeio_analogout_construct(nativeio_analogout_obj_t* self,
         const mcu_pin_obj_t *pin) {
@@ -61,6 +62,7 @@ void common_hal_nativeio_analogout_construct(nativeio_analogout_obj_t* self,
 void common_hal_nativeio_analogout_deinit(nativeio_analogout_obj_t *self) {
     dac_disable(&self->dac_instance);
     dac_chan_disable(&self->dac_instance, DAC_CHANNEL_0);
+    reset_pin(PIN_PA02);
 }
 
 void common_hal_nativeio_analogout_set_value(nativeio_analogout_obj_t *self,

atmel-samd/common-hal/nativeio/I2C.c

@@ -77,6 +77,9 @@ void common_hal_nativeio_i2c_construct(nativeio_i2c_obj_t *self,
     config_i2c_master.pinmux_pad1 = scl_pinmux; // SCL
     config_i2c_master.buffer_timeout = 10000;
 
+    self->sda_pin = sda->pin;
+    self->scl_pin = scl->pin;
+
     enum status_code status = i2c_master_init(&self->i2c_master_instance,
         sercom, &config_i2c_master);
     if (status != STATUS_OK) {
@@ -88,6 +91,8 @@ void common_hal_nativeio_i2c_construct(nativeio_i2c_obj_t *self,
 
 void common_hal_nativeio_i2c_deinit(nativeio_i2c_obj_t *self) {
     i2c_master_disable(&self->i2c_master_instance);
+    reset_pin(self->sda_pin);
+    reset_pin(self->scl_pin);
 }
 
 bool common_hal_nativeio_i2c_probe(nativeio_i2c_obj_t *self, uint8_t addr) {

atmel-samd/common-hal/nativeio/PWMOut.c

@@ -88,6 +88,7 @@ extern void common_hal_nativeio_pwmout_deinit(nativeio_pwmout_obj_t* self) {
     } else {
       tcc_disable(&self->tcc_instance);
     }
+    reset_pin(self->pin->pin);
 }
 
 extern void common_hal_nativeio_pwmout_set_duty_cycle(nativeio_pwmout_obj_t* self, uint16_t duty) {

atmel-samd/common-hal/nativeio/SPI.c

@@ -124,11 +124,16 @@ void common_hal_nativeio_spi_construct(nativeio_spi_obj_t *self,
                              &config_spi_master.pinmux_pad2,
                              &config_spi_master.pinmux_pad3};
     *pinmuxes[clock_pad] = clock_pinmux;
+    self->clock_pin = clock->pin;
+    self->MOSI_pin = 0;
     if (!mosi_none) {
         *pinmuxes[mosi_pad] = mosi_pinmux;
+        self->MOSI_pin = mosi->pin;
     }
+    self->MISO_pin = 0;
     if (!miso_none) {
         *pinmuxes[miso_pad] = miso_pinmux;
+        self->MISO_pin = miso->pin;
     }
 
     spi_init(&self->spi_master_instance, sercom, &config_spi_master);
@@ -138,6 +143,9 @@ void common_hal_nativeio_spi_construct(nativeio_spi_obj_t *self,
 
 void common_hal_nativeio_spi_deinit(nativeio_spi_obj_t *self) {
     spi_disable(&self->spi_master_instance);
+    reset_pin(self->clock_pin);
+    reset_pin(self->MOSI_pin);
+    reset_pin(self->MISO_pin);
 }
 
 bool common_hal_nativeio_spi_configure(nativeio_spi_obj_t *self,

atmel-samd/common-hal/nativeio/types.h

@@ -69,12 +69,17 @@ typedef struct {
     mp_obj_base_t base;
     struct i2c_master_module i2c_master_instance;
     bool has_lock;
+    uint8_t scl_pin;
+    uint8_t sda_pin;
 } nativeio_i2c_obj_t;
 
-typedef struct _machine_spi_obj_t {
+typedef struct {
     mp_obj_base_t base;
     struct spi_module spi_master_instance;
     bool has_lock;
+    uint8_t clock_pin;
+    uint8_t MOSI_pin;
+    uint8_t MISO_pin;
 } nativeio_spi_obj_t;
 
 typedef struct {

atmel-samd/main.c

@@ -163,10 +163,22 @@ void reset_samd21(void) {
                 continue;
             }
         #endif
+        #ifdef MICROPY_HW_APA102_SERCOM
+            if (sercom_instances[i] == MICROPY_HW_APA102_SERCOM) {
+                continue;
+            }
+        #endif
         sercom_instances[i]->SPI.CTRLA.bit.SWRST = 1;
     }
 
-    // TODO(tannewt): Reset all of the pins too.
+    struct system_pinmux_config config;
+    system_pinmux_get_config_defaults(&config);
+    config.powersave = true;
+
+    uint32_t pin_mask[2] = PORT_OUT_IMPLEMENTED;
+
+    system_pinmux_group_set_config(&(PORT->Group[0]), pin_mask[0] & ~MICROPY_PORT_A, &config);
+    system_pinmux_group_set_config(&(PORT->Group[1]), pin_mask[1] & ~MICROPY_PORT_B, &config);
 }
 
 bool maybe_run(const char* filename, int* ret) {

atmel-samd/samd21_pins.c

@@ -44,6 +44,13 @@ const mcu_pin_obj_t pin_## p_name = { \
 
 #define NO_ADC_INPUT (0)
 
+void reset_pin(uint8_t pin) {
+    struct system_pinmux_config config;
+    system_pinmux_get_config_defaults(&config);
+    config.powersave = true;
+    system_pinmux_pin_set_config(pin, &config);
+}
+
 // Pins in datasheet order.
 #ifdef PIN_PA00
 PIN(PA00, false, NO_ADC_INPUT, \

atmel-samd/samd21_pins.h

@@ -3,6 +3,8 @@
 
 #include "common-hal/microcontroller/types.h"
 
+void reset_pin(uint8_t pin);
+
 #define MUX_C 2
 #define MUX_D 3
 #define MUX_E 4

esp8266/common-hal/microcontroller/Pin.c

@@ -1 +1,51 @@
-// Pins have no behavior.
+/*
+ * 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.
+ */
+
+#include "common-hal/microcontroller/__init__.h"
+#include "shared-bindings/microcontroller/Pin.h"
+
+#include "eagle_soc.h"
+
+extern volatile bool adc_in_use;
+
+bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t* pin) {
+    return (pin == &pin_TOUT && adc_in_use) ||
+            ((READ_PERI_REG(pin->peripheral) &
+                (PERIPHS_IO_MUX_FUNC<<PERIPHS_IO_MUX_FUNC_S)) == 0 &&
+             (GPIO_REG_READ(GPIO_ENABLE_ADDRESS) & (1 << pin->gpio_number)) == 0 &&
+             (READ_PERI_REG(pin->peripheral) & PERIPHS_IO_MUX_PULLUP) == 0 );
+}
+
+void reset_pins(void) {
+    for (int i = 0; i < 17; i++) {
+        if (i == 0 || (i > 6 && i < 13) || i == 12) {
+            continue;
+        }
+        uint32_t peripheral = PERIPHS_IO_MUX + i * 4;
+        PIN_FUNC_SELECT(peripheral, 0);
+        PIN_PULLUP_DIS(peripheral);
+    }
+}

esp8266/common-hal/microcontroller/Pin.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_ESP8266_COMMON_HAL_MICROCONTROLLER_PIN_H__
+#define __MICROPY_INCLUDED_ESP8266_COMMON_HAL_MICROCONTROLLER_PIN_H__
+
+void reset_pins(void);
+
+#endif  // __MICROPY_INCLUDED_ESP8266_COMMON_HAL_MICROCONTROLLER_PIN_H__