5 files changed, 6 insertions, 4 deletions
diff --git a/include/driver/soft_i2c.h b/include/driver/soft_i2c.h
index a5da1f6..15784d9 100644
--- a/include/driver/soft_i2c.h
+++ b/include/driver/soft_i2c.h
@@ -37,6 +37,8 @@ class SoftI2C {
 
 #ifndef DRIVER_HARDWARE_I2C
 extern SoftI2C i2c;
+#else
+extern SoftI2C softi2c;
 #endif
 
 #endif
diff --git a/include/lib/pixelfont/pixeloperator.h b/include/lib/pixelfont/pixeloperator.h
index 30f5154..dc1c7d2 100644
--- a/include/lib/pixelfont/pixeloperator.h
+++ b/include/lib/pixelfont/pixeloperator.h
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: CC0-1.0
  */
 
-#ifdef MULTIPASS_ARCH_arduino_nano
+#ifdef HAVE_PROGMEM
 #include <avr/pgmspace.h>
 #define GLYPH_ATTR PROGMEM
 #else
diff --git a/include/lib/pixelfont/pixeloperator_mirrored.h b/include/lib/pixelfont/pixeloperator_mirrored.h
index 149015c..817d843 100644
--- a/include/lib/pixelfont/pixeloperator_mirrored.h
+++ b/include/lib/pixelfont/pixeloperator_mirrored.h
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: CC0-1.0
  */
 
-#ifdef MULTIPASS_ARCH_arduino_nano
+#ifdef HAVE_PROGMEM
 #include <avr/pgmspace.h>
 #define GLYPH_ATTR PROGMEM
 #else
diff --git a/include/lib/pixelfont/terminus16.h b/include/lib/pixelfont/terminus16.h
index e63fba8..d84a328 100644
--- a/include/lib/pixelfont/terminus16.h
+++ b/include/lib/pixelfont/terminus16.h
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: OFL-1.1
  */
 
-#ifdef MULTIPASS_ARCH_arduino_nano
+#ifdef HAVE_PROGMEM
 #include <avr/pgmspace.h>
 #define GLYPH_ATTR PROGMEM
 #else
diff --git a/include/lib/pixelfont/terminus24.h b/include/lib/pixelfont/terminus24.h
index cd4a785..3a285e1 100644
--- a/include/lib/pixelfont/terminus24.h
+++ b/include/lib/pixelfont/terminus24.h
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: OFL-1.1
  */
 
-#ifdef MULTIPASS_ARCH_arduino_nano
+#ifdef HAVE_PROGMEM
 #include <avr/pgmspace.h>
 #define GLYPH_ATTR PROGMEM
 #else