diff options
| author | Hierophect <hierophect@gmail.com> | 2019-11-15 13:00:11 -0500 |
|---|---|---|
| committer | Hierophect <hierophect@gmail.com> | 2019-11-15 13:00:11 -0500 |
| commit | 5f290d091e1889351dfeaec636beaaf63985c246 (patch) | |
| tree | 67e80d286342b367d0dd8433ede0a786286a1cef | |
| parent | 8a58af3e96c7650e33cb0c15d79f025491502e09 (diff) | |
| parent | 2c6781f74d0c8b53c0bdcd7f0b954ac831167937 (diff) | |
Merge branch 'pin-commonhal-additions' into stm32-neopixel
| -rw-r--r-- | ports/atmel-samd/common-hal/microcontroller/Pin.h | 3 | ||||
| -rw-r--r-- | ports/nrf/common-hal/microcontroller/Pin.h | 3 | ||||
| -rw-r--r-- | shared-bindings/microcontroller/Pin.h | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/ports/atmel-samd/common-hal/microcontroller/Pin.h b/ports/atmel-samd/common-hal/microcontroller/Pin.h index 14887207a..090d7a512 100644 --- a/ports/atmel-samd/common-hal/microcontroller/Pin.h +++ b/ports/atmel-samd/common-hal/microcontroller/Pin.h @@ -31,9 +31,6 @@ #include "peripherals/samd/pins.h" -#ifdef MICROPY_HW_NEOPIXEL -extern bool neopixel_in_use; -#endif #ifdef MICROPY_HW_APA102_MOSI extern bool apa102_sck_in_use; extern bool apa102_mosi_in_use; diff --git a/ports/nrf/common-hal/microcontroller/Pin.h b/ports/nrf/common-hal/microcontroller/Pin.h index 735ed90cc..5a1fd3961 100644 --- a/ports/nrf/common-hal/microcontroller/Pin.h +++ b/ports/nrf/common-hal/microcontroller/Pin.h @@ -31,9 +31,6 @@ #include "peripherals/nrf/pins.h" -#ifdef MICROPY_HW_NEOPIXEL -extern bool neopixel_in_use; -#endif #ifdef MICROPY_HW_APA102_MOSI extern bool apa102_sck_in_use; extern bool apa102_mosi_in_use; diff --git a/shared-bindings/microcontroller/Pin.h b/shared-bindings/microcontroller/Pin.h index 2d15dd5c5..8762e4412 100644 --- a/shared-bindings/microcontroller/Pin.h +++ b/shared-bindings/microcontroller/Pin.h @@ -30,6 +30,10 @@ #include "common-hal/microcontroller/Pin.h" #include "py/obj.h" +#ifdef MICROPY_HW_NEOPIXEL +extern bool neopixel_in_use; +#endif + // Type object used in Python. Should be shared between ports. extern const mp_obj_type_t mcu_pin_type; |