diff --git a/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.cpp b/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.cpp
+++ b/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.h b/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.h
+++ b/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/ArduinoLoRa/LoRaSender/LoRaBoards.cpp b/examples/ArduinoLoRa/LoRaSender/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/ArduinoLoRa/LoRaSender/LoRaBoards.cpp
+++ b/examples/ArduinoLoRa/LoRaSender/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/ArduinoLoRa/LoRaSender/LoRaBoards.h b/examples/ArduinoLoRa/LoRaSender/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/ArduinoLoRa/LoRaSender/LoRaBoards.h
+++ b/examples/ArduinoLoRa/LoRaSender/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Display/Free_Font_Demo/LoRaBoards.cpp b/examples/Display/Free_Font_Demo/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Display/Free_Font_Demo/LoRaBoards.cpp
+++ b/examples/Display/Free_Font_Demo/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Display/Free_Font_Demo/LoRaBoards.h b/examples/Display/Free_Font_Demo/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Display/Free_Font_Demo/LoRaBoards.h
+++ b/examples/Display/Free_Font_Demo/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Display/TBeam_TFT_Shield/LoRaBoards.cpp b/examples/Display/TBeam_TFT_Shield/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Display/TBeam_TFT_Shield/LoRaBoards.cpp
+++ b/examples/Display/TBeam_TFT_Shield/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Display/TBeam_TFT_Shield/LoRaBoards.h b/examples/Display/TBeam_TFT_Shield/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Display/TBeam_TFT_Shield/LoRaBoards.h
+++ b/examples/Display/TBeam_TFT_Shield/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Display/TFT_Char_times/LoRaBoards.cpp b/examples/Display/TFT_Char_times/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Display/TFT_Char_times/LoRaBoards.cpp
+++ b/examples/Display/TFT_Char_times/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Display/TFT_Char_times/LoRaBoards.h b/examples/Display/TFT_Char_times/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Display/TFT_Char_times/LoRaBoards.h
+++ b/examples/Display/TFT_Char_times/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Display/UTFT_demo/LoRaBoards.cpp b/examples/Display/UTFT_demo/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Display/UTFT_demo/LoRaBoards.cpp
+++ b/examples/Display/UTFT_demo/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Display/UTFT_demo/LoRaBoards.h b/examples/Display/UTFT_demo/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Display/UTFT_demo/LoRaBoards.h
+++ b/examples/Display/UTFT_demo/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Factory/LoRaBoards.cpp b/examples/Factory/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Factory/LoRaBoards.cpp
+++ b/examples/Factory/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Factory/LoRaBoards.h b/examples/Factory/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Factory/LoRaBoards.h
+++ b/examples/Factory/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/GPS/TinyGPS_Example/LoRaBoards.cpp b/examples/GPS/TinyGPS_Example/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/GPS/TinyGPS_Example/LoRaBoards.cpp
+++ b/examples/GPS/TinyGPS_Example/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/GPS/TinyGPS_Example/LoRaBoards.h b/examples/GPS/TinyGPS_Example/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/GPS/TinyGPS_Example/LoRaBoards.h
+++ b/examples/GPS/TinyGPS_Example/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/GPS/TinyGPS_FullExample/LoRaBoards.cpp b/examples/GPS/TinyGPS_FullExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/GPS/TinyGPS_FullExample/LoRaBoards.cpp
+++ b/examples/GPS/TinyGPS_FullExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/GPS/TinyGPS_FullExample/LoRaBoards.h b/examples/GPS/TinyGPS_FullExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/GPS/TinyGPS_FullExample/LoRaBoards.h
+++ b/examples/GPS/TinyGPS_FullExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.cpp b/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.cpp
+++ b/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.h b/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.h
+++ b/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.cpp b/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.cpp
+++ b/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.h b/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.h
+++ b/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/GPS/UBlox_NMEAParsing/LoRaBoards.cpp b/examples/GPS/UBlox_NMEAParsing/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/GPS/UBlox_NMEAParsing/LoRaBoards.cpp
+++ b/examples/GPS/UBlox_NMEAParsing/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/GPS/UBlox_NMEAParsing/LoRaBoards.h b/examples/GPS/UBlox_NMEAParsing/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/GPS/UBlox_NMEAParsing/LoRaBoards.h
+++ b/examples/GPS/UBlox_NMEAParsing/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/GPS/UBlox_OutputRate/LoRaBoards.cpp b/examples/GPS/UBlox_OutputRate/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/GPS/UBlox_OutputRate/LoRaBoards.cpp
+++ b/examples/GPS/UBlox_OutputRate/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/GPS/UBlox_OutputRate/LoRaBoards.h b/examples/GPS/UBlox_OutputRate/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/GPS/UBlox_OutputRate/LoRaBoards.h
+++ b/examples/GPS/UBlox_OutputRate/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/GPS/UBlox_Recovery/LoRaBoards.cpp b/examples/GPS/UBlox_Recovery/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/GPS/UBlox_Recovery/LoRaBoards.cpp
+++ b/examples/GPS/UBlox_Recovery/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/GPS/UBlox_Recovery/LoRaBoards.h b/examples/GPS/UBlox_Recovery/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/GPS/UBlox_Recovery/LoRaBoards.h
+++ b/examples/GPS/UBlox_Recovery/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.cpp b/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.cpp
+++ b/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.h b/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.h
+++ b/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/LoRaWAN/LoRaWAN_ABP/LoRaBoards.cpp b/examples/LoRaWAN/LoRaWAN_ABP/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/LoRaWAN/LoRaWAN_ABP/LoRaBoards.cpp
+++ b/examples/LoRaWAN/LoRaWAN_ABP/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/LoRaWAN/LoRaWAN_ABP/LoRaBoards.h b/examples/LoRaWAN/LoRaWAN_ABP/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/LoRaWAN/LoRaWAN_ABP/LoRaBoards.h
+++ b/examples/LoRaWAN/LoRaWAN_ABP/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/LoRaWAN/RadioLib_OTAA/LoRaBoards.cpp b/examples/LoRaWAN/RadioLib_OTAA/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/LoRaWAN/RadioLib_OTAA/LoRaBoards.cpp
+++ b/examples/LoRaWAN/RadioLib_OTAA/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/LoRaWAN/RadioLib_OTAA/LoRaBoards.h b/examples/LoRaWAN/RadioLib_OTAA/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/LoRaWAN/RadioLib_OTAA/LoRaBoards.h
+++ b/examples/LoRaWAN/RadioLib_OTAA/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/OLED/SH1106FontUsage/LoRaBoards.cpp b/examples/OLED/SH1106FontUsage/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/OLED/SH1106FontUsage/LoRaBoards.cpp
+++ b/examples/OLED/SH1106FontUsage/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/OLED/SH1106FontUsage/LoRaBoards.h b/examples/OLED/SH1106FontUsage/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/OLED/SH1106FontUsage/LoRaBoards.h
+++ b/examples/OLED/SH1106FontUsage/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/OLED/SH1106GraphicsTest/LoRaBoards.cpp b/examples/OLED/SH1106GraphicsTest/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/OLED/SH1106GraphicsTest/LoRaBoards.cpp
+++ b/examples/OLED/SH1106GraphicsTest/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/OLED/SH1106GraphicsTest/LoRaBoards.h b/examples/OLED/SH1106GraphicsTest/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/OLED/SH1106GraphicsTest/LoRaBoards.h
+++ b/examples/OLED/SH1106GraphicsTest/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/OLED/SH1106IconMenu/LoRaBoards.cpp b/examples/OLED/SH1106IconMenu/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/OLED/SH1106IconMenu/LoRaBoards.cpp
+++ b/examples/OLED/SH1106IconMenu/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/OLED/SH1106IconMenu/LoRaBoards.h b/examples/OLED/SH1106IconMenu/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/OLED/SH1106IconMenu/LoRaBoards.h
+++ b/examples/OLED/SH1106IconMenu/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/OLED/SH1106PrintUTF8/LoRaBoards.cpp b/examples/OLED/SH1106PrintUTF8/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/OLED/SH1106PrintUTF8/LoRaBoards.cpp
+++ b/examples/OLED/SH1106PrintUTF8/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/OLED/SH1106PrintUTF8/LoRaBoards.h b/examples/OLED/SH1106PrintUTF8/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/OLED/SH1106PrintUTF8/LoRaBoards.h
+++ b/examples/OLED/SH1106PrintUTF8/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/OLED/SSD1306SimpleDemo/LoRaBoards.cpp b/examples/OLED/SSD1306SimpleDemo/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/OLED/SSD1306SimpleDemo/LoRaBoards.cpp
+++ b/examples/OLED/SSD1306SimpleDemo/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/OLED/SSD1306SimpleDemo/LoRaBoards.h b/examples/OLED/SSD1306SimpleDemo/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/OLED/SSD1306SimpleDemo/LoRaBoards.h
+++ b/examples/OLED/SSD1306SimpleDemo/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/OLED/SSD1306UiDemo/LoRaBoards.cpp b/examples/OLED/SSD1306UiDemo/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/OLED/SSD1306UiDemo/LoRaBoards.cpp
+++ b/examples/OLED/SSD1306UiDemo/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/OLED/SSD1306UiDemo/LoRaBoards.h b/examples/OLED/SSD1306UiDemo/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/OLED/SSD1306UiDemo/LoRaBoards.h
+++ b/examples/OLED/SSD1306UiDemo/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/PMU/LoRaBoards.cpp b/examples/PMU/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/PMU/LoRaBoards.cpp
+++ b/examples/PMU/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/PMU/LoRaBoards.h b/examples/PMU/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/PMU/LoRaBoards.h
+++ b/examples/PMU/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.cpp b/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.cpp
+++ b/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.h b/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.h
+++ b/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/RadioLibExamples/SX1280_Ranging/LoRaBoards.cpp b/examples/RadioLibExamples/SX1280_Ranging/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/RadioLibExamples/SX1280_Ranging/LoRaBoards.cpp
+++ b/examples/RadioLibExamples/SX1280_Ranging/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/RadioLibExamples/SX1280_Ranging/LoRaBoards.h b/examples/RadioLibExamples/SX1280_Ranging/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/RadioLibExamples/SX1280_Ranging/LoRaBoards.h
+++ b/examples/RadioLibExamples/SX1280_Ranging/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.cpp b/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.cpp
+++ b/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.h b/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.h
+++ b/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.cpp b/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.cpp
+++ b/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.h b/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.h
+++ b/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/BME280_TestExample/LoRaBoards.cpp b/examples/Sensor/BME280_TestExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/BME280_TestExample/LoRaBoards.cpp
+++ b/examples/Sensor/BME280_TestExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/BME280_TestExample/LoRaBoards.h b/examples/Sensor/BME280_TestExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/BME280_TestExample/LoRaBoards.h
+++ b/examples/Sensor/BME280_TestExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/BME280_UnifiedExample/LoRaBoards.cpp b/examples/Sensor/BME280_UnifiedExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/BME280_UnifiedExample/LoRaBoards.cpp
+++ b/examples/Sensor/BME280_UnifiedExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/BME280_UnifiedExample/LoRaBoards.h b/examples/Sensor/BME280_UnifiedExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/BME280_UnifiedExample/LoRaBoards.h
+++ b/examples/Sensor/BME280_UnifiedExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.cpp b/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.cpp
+++ b/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.h b/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.h
+++ b/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.cpp b/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.cpp
+++ b/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.h b/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.h
+++ b/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/PCF8563_TimeLib/LoRaBoards.cpp b/examples/Sensor/PCF8563_TimeLib/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/PCF8563_TimeLib/LoRaBoards.cpp
+++ b/examples/Sensor/PCF8563_TimeLib/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/PCF8563_TimeLib/LoRaBoards.h b/examples/Sensor/PCF8563_TimeLib/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/PCF8563_TimeLib/LoRaBoards.h
+++ b/examples/Sensor/PCF8563_TimeLib/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.cpp b/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.cpp
+++ b/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.h b/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.h
+++ b/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.cpp b/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.h b/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.h
+++ b/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMC6310_CompassExample/LoRaBoards.cpp b/examples/Sensor/QMC6310_CompassExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMC6310_CompassExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMC6310_CompassExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMC6310_CompassExample/LoRaBoards.h b/examples/Sensor/QMC6310_CompassExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMC6310_CompassExample/LoRaBoards.h
+++ b/examples/Sensor/QMC6310_CompassExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.cpp b/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.h b/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.h
+++ b/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.cpp b/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.h b/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.h
+++ b/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMI8658_BlockExample/LoRaBoards.cpp b/examples/Sensor/QMI8658_BlockExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMI8658_BlockExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMI8658_BlockExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMI8658_BlockExample/LoRaBoards.h b/examples/Sensor/QMI8658_BlockExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMI8658_BlockExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_BlockExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.cpp b/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.h b/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.cpp b/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.h b/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.cpp b/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.h b/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.cpp b/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.h b/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.cpp b/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.cpp
+++ b/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.h b/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.cpp b/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.h b/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.cpp b/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.cpp
+++ b/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.h b/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.cpp b/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.cpp
+++ b/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.h b/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/T3S3Factory/LoRaBoards.cpp b/examples/T3S3Factory/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/T3S3Factory/LoRaBoards.cpp
+++ b/examples/T3S3Factory/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/T3S3Factory/LoRaBoards.h b/examples/T3S3Factory/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/T3S3Factory/LoRaBoards.h
+++ b/examples/T3S3Factory/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif
 
diff --git a/examples/TBeamFactory/LoRaBoards.cpp b/examples/TBeamFactory/LoRaBoards.cpp
index ec0fe33..8dea788 100644
--- a/examples/TBeamFactory/LoRaBoards.cpp
+++ b/examples/TBeamFactory/LoRaBoards.cpp
@@ -450,7 +450,7 @@ void loopPMU(void (*pressed_cb)(void))
 }
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay()
 {
     Wire.beginTransmission(DISPLAY_ADDR);
@@ -810,7 +810,7 @@ void setupBoards(bool disable_u8g2 )
 
     beginSDCard();
 
-#ifdef DISPLAY_ADDR
+#ifdef HAS_DISPLAY
     if (!disable_u8g2) {
         beginDisplay();
     }
diff --git a/examples/TBeamFactory/LoRaBoards.h b/examples/TBeamFactory/LoRaBoards.h
index 3bca53c..89e4ed6 100644
--- a/examples/TBeamFactory/LoRaBoards.h
+++ b/examples/TBeamFactory/LoRaBoards.h
@@ -35,6 +35,12 @@
 
 #include <esp_mac.h>
 
+
+#ifndef DISPLAY_ADDR
+#define DISPLAY_ADDR               0x3C
+#endif
+
+
 // #define ENABLE_BLE      //Enable ble function
 
 enum {
@@ -74,7 +80,7 @@ bool beginSDCard();
 #define beginSDCard()
 #endif
 
-#ifdef DISPLAY_ADDR
+#ifdef DISPLAY_MODEL
 bool beginDisplay();
 #endif