From 838d30b3a4484b3fd9fe5663fc8874b0f0b16020 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Mon, 30 Aug 2021 14:40:14 -0700
Subject: [PATCH] Fix incorrect macros

---
 ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.h  | 6 +++---
 ports/esp32s2/common-hal/paralleldisplay/ParallelBus.h     | 6 +++---
 ports/nrf/common-hal/paralleldisplay/ParallelBus.h         | 6 +++---
 ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.h | 6 +++---
 shared-bindings/displayio/__init__.c                       | 2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.h b/ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.h
index 4b6ec64b11..5ef7bcf195 100644
--- a/ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.h
+++ b/ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
+#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
+#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
 
 #include "common-hal/digitalio/DigitalInOut.h"
 
@@ -42,4 +42,4 @@ typedef struct {
     uint32_t write_mask;
 } paralleldisplay_parallelbus_obj_t;
 
-#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
+#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
diff --git a/ports/esp32s2/common-hal/paralleldisplay/ParallelBus.h b/ports/esp32s2/common-hal/paralleldisplay/ParallelBus.h
index adf5d6226f..8758b8fcca 100644
--- a/ports/esp32s2/common-hal/paralleldisplay/ParallelBus.h
+++ b/ports/esp32s2/common-hal/paralleldisplay/ParallelBus.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
-#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
+#ifndef MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
+#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
 
 #include "common-hal/digitalio/DigitalInOut.h"
 
@@ -44,4 +44,4 @@ typedef struct {
     uint32_t write_mask; // bit mask for the single bit for the write pin register
 } paralleldisplay_parallelbus_obj_t;
 
-#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
+#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
diff --git a/ports/nrf/common-hal/paralleldisplay/ParallelBus.h b/ports/nrf/common-hal/paralleldisplay/ParallelBus.h
index 3a3f71e3c9..14ba7bbc11 100644
--- a/ports/nrf/common-hal/paralleldisplay/ParallelBus.h
+++ b/ports/nrf/common-hal/paralleldisplay/ParallelBus.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
-#define MICROPY_INCLUDED_NRF_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
+#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
+#define MICROPY_INCLUDED_NRF_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
 
 #include "common-hal/digitalio/DigitalInOut.h"
 
@@ -42,4 +42,4 @@ typedef struct {
     uint32_t write_mask;
 } paralleldisplay_parallelbus_obj_t;
 
-#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
+#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
diff --git a/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.h b/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.h
index c93034da18..87f149b9b8 100644
--- a/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.h
+++ b/ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
-#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
+#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
+#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
 
 #include "common-hal/digitalio/DigitalInOut.h"
 #include "bindings/rp2pio/StateMachine.h"
@@ -42,4 +42,4 @@ typedef struct {
     rp2pio_statemachine_obj_t state_machine;
 } paralleldisplay_parallelbus_obj_t;
 
-#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_DISPLAYIO_PARALLELDISPLAY_H
+#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 27f6c88ed1..7ac2a84903 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -40,7 +40,7 @@
 #include "shared-bindings/displayio/I2CDisplay.h"
 #include "shared-bindings/displayio/OnDiskBitmap.h"
 #include "shared-bindings/displayio/Palette.h"
-#if CIRCUITPY_PARALLELBUS
+#if CIRCUITPY_PARALLELDISPLAY
 #include "shared-bindings/paralleldisplay/ParallelBus.h"
 #endif
 #include "shared-bindings/displayio/Shape.h"