diff options
| author | Hierophect <hierophect@gmail.com> | 2019-11-15 13:09:59 -0500 |
|---|---|---|
| committer | Hierophect <hierophect@gmail.com> | 2019-11-15 13:09:59 -0500 |
| commit | ee1559b9210cc3595e01d2d054308d1749c0d8b2 (patch) | |
| tree | 8b93ff3237272978a6675955babf914911a56d5d | |
| parent | 5f290d091e1889351dfeaec636beaaf63985c246 (diff) | |
| parent | 81223c76bd0c9be22032c09f034dccd84c7c74f7 (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, 6 insertions, 4 deletions
diff --git a/ports/atmel-samd/common-hal/microcontroller/Pin.h b/ports/atmel-samd/common-hal/microcontroller/Pin.h index 090d7a512..14887207a 100644 --- a/ports/atmel-samd/common-hal/microcontroller/Pin.h +++ b/ports/atmel-samd/common-hal/microcontroller/Pin.h @@ -31,6 +31,9 @@ #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 5a1fd3961..735ed90cc 100644 --- a/ports/nrf/common-hal/microcontroller/Pin.h +++ b/ports/nrf/common-hal/microcontroller/Pin.h @@ -31,6 +31,9 @@ #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 8762e4412..2d15dd5c5 100644 --- a/shared-bindings/microcontroller/Pin.h +++ b/shared-bindings/microcontroller/Pin.h @@ -30,10 +30,6 @@ #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; |