From ff50124686ffede759520164141fbea23aefe4c8 Mon Sep 17 00:00:00 2001
From: prenticedavid <david.prentice@farming.co.uk>
Date: Tue, 30 Aug 2022 19:02:29 +0100
Subject: [PATCH] change ZERO vs M0 conditional

---
 utility/mcufriend_shield.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utility/mcufriend_shield.h b/utility/mcufriend_shield.h
index 3debd4a..8109498 100644
--- a/utility/mcufriend_shield.h
+++ b/utility/mcufriend_shield.h
@@ -259,7 +259,7 @@ void write_8(uint8_t val)
  // configure macros for data bus
 #define DMASK 0x0030C3C0
  //  #define write_8(x) PORT->Group[0].OUT.reg = (PORT->Group[0].OUT.reg & ~DMASK)|(((x) & 0x0F) << 6)|(((x) & 0x30) << 10)|(((x) & 0xC0)<<14)
-#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_ZERO)   // American ZERO
+#if defined(ARDUINO_SAMD_ZERO) && !defined(USE_M0_PINOUT)   // American ZERO
 //LCD pins   |D7  |D6  |D5  |D4  |D3  |D2  |D1  |D0  | |RD |WR |RS  |CS  |RST |
 //SAMD21 pin |PA21|PA20|PA15|PA8 |PA9 |PA14|PA7 |PA6 | |PA2|PB8|PB9 |PA4 |PA5 |
 #define write_8(x) {\