From 0394d3378b3baf99fe7e2ac5a80f49c5f2e30dcc Mon Sep 17 00:00:00 2001 From: Leonardo Cavagnis Date: Fri, 15 Nov 2024 15:05:31 +0100 Subject: [PATCH 1/4] fix compatibility with Silicon Labs boards --- Adafruit_SSD1306.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_SSD1306.h b/Adafruit_SSD1306.h index 610864e..11bafe9 100644 --- a/Adafruit_SSD1306.h +++ b/Adafruit_SSD1306.h @@ -54,7 +54,7 @@ typedef uint32_t PortMask; #elif defined(ARDUINO_ARCH_RTTHREAD) #undef HAVE_PORTREG #elif (defined(__arm__) || defined(ARDUINO_FEATHER52)) && \ - !defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_RP2040) + !defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_SILABS) typedef volatile uint32_t PortReg; typedef uint32_t PortMask; #define HAVE_PORTREG From cfaa660f17853e5c1ffd89cad7b34e8c48203fbd Mon Sep 17 00:00:00 2001 From: Leonardo Cavagnis Date: Fri, 15 Nov 2024 15:31:10 +0100 Subject: [PATCH 2/4] Fix clang-format issues --- Adafruit_SSD1306.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Adafruit_SSD1306.h b/Adafruit_SSD1306.h index 11bafe9..2236a3c 100644 --- a/Adafruit_SSD1306.h +++ b/Adafruit_SSD1306.h @@ -54,7 +54,8 @@ typedef uint32_t PortMask; #elif defined(ARDUINO_ARCH_RTTHREAD) #undef HAVE_PORTREG #elif (defined(__arm__) || defined(ARDUINO_FEATHER52)) && \ - !defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_SILABS) + !defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_RP2040) && \ + !defined(ARDUINO_SILABS) typedef volatile uint32_t PortReg; typedef uint32_t PortMask; #define HAVE_PORTREG From 1ec1fdb3e1f917e5444ea68e60294a2a2237c479 Mon Sep 17 00:00:00 2001 From: Leonardo Cavagnis <45899760+leonardocavagnis@users.noreply.github.com> Date: Tue, 3 Dec 2024 09:56:52 +0100 Subject: [PATCH 3/4] Update Adafruit_SSD1306.h --- Adafruit_SSD1306.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_SSD1306.h b/Adafruit_SSD1306.h index 2236a3c..a4dfc60 100644 --- a/Adafruit_SSD1306.h +++ b/Adafruit_SSD1306.h @@ -55,7 +55,7 @@ typedef uint32_t PortMask; #undef HAVE_PORTREG #elif (defined(__arm__) || defined(ARDUINO_FEATHER52)) && \ !defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_RP2040) && \ - !defined(ARDUINO_SILABS) + !defined(ARDUINO_ARCH_SILABS) typedef volatile uint32_t PortReg; typedef uint32_t PortMask; #define HAVE_PORTREG From df42e5f5575e922e7e3788a27bb3f62f1594fd74 Mon Sep 17 00:00:00 2001 From: Leonardo Cavagnis <45899760+leonardocavagnis@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:33:22 +0100 Subject: [PATCH 4/4] fix correct define --- Adafruit_SSD1306.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_SSD1306.h b/Adafruit_SSD1306.h index a4dfc60..2236a3c 100644 --- a/Adafruit_SSD1306.h +++ b/Adafruit_SSD1306.h @@ -55,7 +55,7 @@ typedef uint32_t PortMask; #undef HAVE_PORTREG #elif (defined(__arm__) || defined(ARDUINO_FEATHER52)) && \ !defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_RP2040) && \ - !defined(ARDUINO_ARCH_SILABS) + !defined(ARDUINO_SILABS) typedef volatile uint32_t PortReg; typedef uint32_t PortMask; #define HAVE_PORTREG