djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pin-commonhal-additions' into stm32-neopixel

Browse Source
This commit is contained in:
Hierophect 2019-11-15 13:09:59 -05:00
commit ee1559b921
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/atmel-samd/common-hal/microcontroller/Pin.h
View File

@ -31,6 +31,9 @@
#include "peripherals/samd/pins.h" #include "peripherals/samd/pins.h"
#ifdef MICROPY_HW_NEOPIXEL
extern bool neopixel_in_use;
#endif
#ifdef MICROPY_HW_APA102_MOSI #ifdef MICROPY_HW_APA102_MOSI
extern bool apa102_sck_in_use; extern bool apa102_sck_in_use;
extern bool apa102_mosi_in_use; extern bool apa102_mosi_in_use;

3
ports/nrf/common-hal/microcontroller/Pin.h
View File

@ -31,6 +31,9 @@
#include "peripherals/nrf/pins.h" #include "peripherals/nrf/pins.h"
#ifdef MICROPY_HW_NEOPIXEL
extern bool neopixel_in_use;
#endif
#ifdef MICROPY_HW_APA102_MOSI #ifdef MICROPY_HW_APA102_MOSI
extern bool apa102_sck_in_use; extern bool apa102_sck_in_use;
extern bool apa102_mosi_in_use; extern bool apa102_mosi_in_use;

4
shared-bindings/microcontroller/Pin.h
View File

@ -30,10 +30,6 @@
#include "common-hal/microcontroller/Pin.h" #include "common-hal/microcontroller/Pin.h"
#include "py/obj.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. // Type object used in Python. Should be shared between ports.
extern const mp_obj_type_t mcu_pin_type; extern const mp_obj_type_t mcu_pin_type;