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

crypto-aes
Hierophect 3 years ago
commit ee1559b921
  1. 3
      ports/atmel-samd/common-hal/microcontroller/Pin.h
  2. 3
      ports/nrf/common-hal/microcontroller/Pin.h
  3. 4
      shared-bindings/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;

@ -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;

@ -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;

Loading…
Cancel
Save