From 34b8ac9f0c19820a42433cf9478c0698d5ae4a21 Mon Sep 17 00:00:00 2001 From: Mike Bell Date: Fri, 8 Sep 2023 18:59:25 +0100 Subject: [PATCH] Wrap pio.h includes in NO_QSTR so a fresh Micropython build doesn't fall over. --- drivers/encoder/encoder.cpp | 3 +++ drivers/hub75/hub75.hpp | 3 +++ drivers/hub75_legacy/hub75.hpp | 3 +++ drivers/plasma/apa102.hpp | 2 ++ drivers/plasma/ws2812.hpp | 2 ++ drivers/pwm/pwm_cluster.cpp | 3 +++ drivers/sdcard/pio_spi.h | 2 ++ drivers/st7789/st7789.hpp | 2 ++ examples/pico_explorer_encoder/pico_explorer_encoder.cpp | 4 ++++ libraries/cosmic_unicorn/cosmic_unicorn.cpp | 2 ++ libraries/galactic_unicorn/galactic_unicorn.cpp | 2 ++ libraries/pico_unicorn/pico_unicorn.cpp | 2 ++ libraries/stellar_unicorn/stellar_unicorn.cpp | 2 ++ 13 files changed, 32 insertions(+) diff --git a/drivers/encoder/encoder.cpp b/drivers/encoder/encoder.cpp index 7fca1472..89f1fffd 100644 --- a/drivers/encoder/encoder.cpp +++ b/drivers/encoder/encoder.cpp @@ -4,7 +4,10 @@ #include "hardware/irq.h" #include "hardware/clocks.h" #include "encoder.hpp" + +#ifndef NO_QSTR #include "encoder.pio.h" +#endif #define LAST_STATE(state) ((state) & 0b0011) #define CURR_STATE(state) (((state) & 0b1100) >> 2) diff --git a/drivers/hub75/hub75.hpp b/drivers/hub75/hub75.hpp index 412b76b0..994740a8 100644 --- a/drivers/hub75/hub75.hpp +++ b/drivers/hub75/hub75.hpp @@ -5,7 +5,10 @@ #include "hardware/dma.h" #include "hardware/irq.h" #include "libraries/pico_graphics/pico_graphics.hpp" + +#ifndef NO_QSTR #include "hub75.pio.h" +#endif namespace pimoroni { const uint DATA_BASE_PIN = 0; diff --git a/drivers/hub75_legacy/hub75.hpp b/drivers/hub75_legacy/hub75.hpp index f469ee28..c1267d78 100644 --- a/drivers/hub75_legacy/hub75.hpp +++ b/drivers/hub75_legacy/hub75.hpp @@ -4,7 +4,10 @@ #include "hardware/pio.h" #include "hardware/dma.h" #include "hardware/irq.h" + +#ifndef NO_QSTR #include "hub75.pio.h" +#endif const uint DATA_BASE_PIN = 0; const uint DATA_N_PINS = 6; diff --git a/drivers/plasma/apa102.hpp b/drivers/plasma/apa102.hpp index 7390f7c0..944ceb6c 100644 --- a/drivers/plasma/apa102.hpp +++ b/drivers/plasma/apa102.hpp @@ -14,7 +14,9 @@ found here: https://github.com/raspberrypi/pico-examples/tree/master/pio/apa102 #include #include +#ifndef NO_QSTR #include "apa102.pio.h" +#endif #include "pico/stdlib.h" #include "hardware/pio.h" diff --git a/drivers/plasma/ws2812.hpp b/drivers/plasma/ws2812.hpp index 860afb7f..0c507db4 100644 --- a/drivers/plasma/ws2812.hpp +++ b/drivers/plasma/ws2812.hpp @@ -14,7 +14,9 @@ found here: https://github.com/raspberrypi/pico-examples/tree/master/pio/ws2812 #include #include +#ifndef NO_QSTR #include "ws2812.pio.h" +#endif #include "pico/stdlib.h" #include "hardware/pio.h" diff --git a/drivers/pwm/pwm_cluster.cpp b/drivers/pwm/pwm_cluster.cpp index 3b49d8a4..3c600619 100644 --- a/drivers/pwm/pwm_cluster.cpp +++ b/drivers/pwm/pwm_cluster.cpp @@ -1,7 +1,10 @@ #include "pwm_cluster.hpp" #include "hardware/gpio.h" #include "hardware/clocks.h" + +#ifndef NO_QSTR #include "pwm_cluster.pio.h" +#endif // Uncomment the below line to enable debugging //#define DEBUG_MULTI_PWM diff --git a/drivers/sdcard/pio_spi.h b/drivers/sdcard/pio_spi.h index f6c4f6ff..e0bed024 100644 --- a/drivers/sdcard/pio_spi.h +++ b/drivers/sdcard/pio_spi.h @@ -7,7 +7,9 @@ #define _PIO_SPI_H #include "hardware/pio.h" +#ifndef NO_QSTR #include "spi.pio.h" +#endif typedef struct pio_spi_inst { PIO pio; diff --git a/drivers/st7789/st7789.hpp b/drivers/st7789/st7789.hpp index f19c1e0e..e4ad2ee6 100644 --- a/drivers/st7789/st7789.hpp +++ b/drivers/st7789/st7789.hpp @@ -11,7 +11,9 @@ #include "libraries/pico_graphics/pico_graphics.hpp" +#ifndef NO_QSTR #include "st7789_parallel.pio.h" +#endif #include diff --git a/examples/pico_explorer_encoder/pico_explorer_encoder.cpp b/examples/pico_explorer_encoder/pico_explorer_encoder.cpp index b8968b6f..ab2ae2d4 100644 --- a/examples/pico_explorer_encoder/pico_explorer_encoder.cpp +++ b/examples/pico_explorer_encoder/pico_explorer_encoder.cpp @@ -3,7 +3,11 @@ #include "pico_explorer.hpp" #include "pico/stdlib.h" #include "encoder.hpp" + +#ifndef NO_QSTR #include "quadrature_out.pio.h" +#endif + #include "drivers/st7789/st7789.hpp" #include "libraries/pico_graphics/pico_graphics.hpp" #include "button.hpp" diff --git a/libraries/cosmic_unicorn/cosmic_unicorn.cpp b/libraries/cosmic_unicorn/cosmic_unicorn.cpp index 2db59201..b7d16ab7 100644 --- a/libraries/cosmic_unicorn/cosmic_unicorn.cpp +++ b/libraries/cosmic_unicorn/cosmic_unicorn.cpp @@ -6,8 +6,10 @@ #include "hardware/clocks.h" +#ifndef NO_QSTR #include "cosmic_unicorn.pio.h" #include "audio_i2s.pio.h" +#endif #include "cosmic_unicorn.hpp" diff --git a/libraries/galactic_unicorn/galactic_unicorn.cpp b/libraries/galactic_unicorn/galactic_unicorn.cpp index c9587e18..44defb02 100644 --- a/libraries/galactic_unicorn/galactic_unicorn.cpp +++ b/libraries/galactic_unicorn/galactic_unicorn.cpp @@ -6,8 +6,10 @@ #include "hardware/clocks.h" +#ifndef NO_QSTR #include "galactic_unicorn.pio.h" #include "audio_i2s.pio.h" +#endif #include "galactic_unicorn.hpp" diff --git a/libraries/pico_unicorn/pico_unicorn.cpp b/libraries/pico_unicorn/pico_unicorn.cpp index 294d546e..ea17a546 100644 --- a/libraries/pico_unicorn/pico_unicorn.cpp +++ b/libraries/pico_unicorn/pico_unicorn.cpp @@ -2,7 +2,9 @@ #include "hardware/irq.h" #include "common/pimoroni_common.hpp" +#ifndef NO_QSTR #include "pico_unicorn.pio.h" +#endif #include "pico_unicorn.hpp" // pixel data is stored as a stream of bits delivered in the diff --git a/libraries/stellar_unicorn/stellar_unicorn.cpp b/libraries/stellar_unicorn/stellar_unicorn.cpp index 3b4bde04..f71de50b 100644 --- a/libraries/stellar_unicorn/stellar_unicorn.cpp +++ b/libraries/stellar_unicorn/stellar_unicorn.cpp @@ -6,8 +6,10 @@ #include "hardware/clocks.h" +#ifndef NO_QSTR #include "stellar_unicorn.pio.h" #include "audio_i2s.pio.h" +#endif #include "stellar_unicorn.hpp"