From b2006878d32b6eb8d2f2fce9b9842f812f5d2784 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Tue, 30 Mar 2021 15:50:18 +0100 Subject: [PATCH] Fix include paths in MicroPython modules The ../../../pimoroni-pico path was selecting the "pimoroni-pico" directory adjacent my "micropython" directory However I was attempting to build against one in a different parent directory. This resulted in the MicroPython modules including the wrong (old) header and exploding. --- micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp | 2 +- micropython/modules/pico_display/pico_display.cpp | 2 +- micropython/modules/pico_explorer/pico_explorer.cpp | 2 +- micropython/modules/pico_rgb_keypad/pico_rgb_keypad.cpp | 2 +- micropython/modules/pico_scroll/pico_scroll.cpp | 2 +- micropython/modules/pico_unicorn/pico_unicorn.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp b/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp index 50aaeb12..3ab8b74c 100644 --- a/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp +++ b/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp @@ -1,4 +1,4 @@ -#include "../../../pimoroni-pico/libraries/breakout_roundlcd/breakout_roundlcd.hpp" +#include "../../../libraries/breakout_roundlcd/breakout_roundlcd.hpp" #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o)) diff --git a/micropython/modules/pico_display/pico_display.cpp b/micropython/modules/pico_display/pico_display.cpp index 3d2c0d2b..e77e64f4 100644 --- a/micropython/modules/pico_display/pico_display.cpp +++ b/micropython/modules/pico_display/pico_display.cpp @@ -2,7 +2,7 @@ #include "hardware/sync.h" #include "pico/binary_info.h" -#include "../../../pimoroni-pico/libraries/pico_display/pico_display.hpp" +#include "../../../libraries/pico_display/pico_display.hpp" using namespace pimoroni; diff --git a/micropython/modules/pico_explorer/pico_explorer.cpp b/micropython/modules/pico_explorer/pico_explorer.cpp index 17757464..419f9eb6 100644 --- a/micropython/modules/pico_explorer/pico_explorer.cpp +++ b/micropython/modules/pico_explorer/pico_explorer.cpp @@ -2,7 +2,7 @@ #include "hardware/sync.h" #include "pico/binary_info.h" -#include "../../../pimoroni-pico/libraries/pico_explorer/pico_explorer.hpp" +#include "../../../libraries/pico_explorer/pico_explorer.hpp" using namespace pimoroni; diff --git a/micropython/modules/pico_rgb_keypad/pico_rgb_keypad.cpp b/micropython/modules/pico_rgb_keypad/pico_rgb_keypad.cpp index 085e31e4..2a95402c 100644 --- a/micropython/modules/pico_rgb_keypad/pico_rgb_keypad.cpp +++ b/micropython/modules/pico_rgb_keypad/pico_rgb_keypad.cpp @@ -2,7 +2,7 @@ #include "hardware/sync.h" #include "pico/binary_info.h" -#include "../../../pimoroni-pico/libraries/pico_rgb_keypad/pico_rgb_keypad.hpp" +#include "../../../libraries/pico_rgb_keypad/pico_rgb_keypad.hpp" using namespace pimoroni; diff --git a/micropython/modules/pico_scroll/pico_scroll.cpp b/micropython/modules/pico_scroll/pico_scroll.cpp index 26936634..43dff462 100644 --- a/micropython/modules/pico_scroll/pico_scroll.cpp +++ b/micropython/modules/pico_scroll/pico_scroll.cpp @@ -2,7 +2,7 @@ #include "hardware/sync.h" #include "pico/binary_info.h" -#include "../../../pimoroni-pico/libraries/pico_scroll/pico_scroll.hpp" +#include "../../../libraries/pico_scroll/pico_scroll.hpp" using namespace pimoroni; diff --git a/micropython/modules/pico_unicorn/pico_unicorn.cpp b/micropython/modules/pico_unicorn/pico_unicorn.cpp index ad8c89d1..2e15e715 100644 --- a/micropython/modules/pico_unicorn/pico_unicorn.cpp +++ b/micropython/modules/pico_unicorn/pico_unicorn.cpp @@ -2,7 +2,7 @@ #include "hardware/sync.h" #include "pico/binary_info.h" -#include "../../../pimoroni-pico/libraries/pico_unicorn/pico_unicorn.hpp" +#include "../../../libraries/pico_unicorn/pico_unicorn.hpp" using namespace pimoroni;