Fix display on NRF52

diff --git a/Display.h b/Display.h
index 14201671dc9f1d013bd66f2aff6569c175d1e5c0..a988f0e309a9b24da059ab96ce8f1180083be01a 100644 (file)
--- a/Display.h
+++ b/Display.h
@@ -134,7 +134,11 @@ bool display_init() {
     #endif
 
     #if DISP_CUSTOM_ADDR == true
+      #if HAS_EEPROM
       uint8_t display_address = EEPROM.read(eeprom_addr(ADDR_CONF_DADR));
+      #elif MCU_VARIANT == MCU_NRF52
+      uint8_t display_address = eeprom_read(eeprom_addr(ADDR_CONF_DADR));
+      #endif
       if (display_address == 0xFF) display_address = DISP_ADDR;
     #else
       uint8_t display_address = DISP_ADDR;
@@ -188,7 +192,11 @@ bool display_init() {
       disp_area.cp437(true);
       display.cp437(true);
 
-      display_intensity = EEPROM.read(eeprom_addr(ADDR_CONF_DINT));
+      #if HAS_EEPROM
+      uint8_t display_intensity = EEPROM.read(eeprom_addr(ADDR_CONF_DINT));
+      #elif MCU_VARIANT == MCU_NRF52
+      uint8_t display_intensity = eeprom_read(eeprom_addr(ADDR_CONF_DINT));
+      #endif
 
       return true;
     }

diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index c0b019253a778d338ac6154bfa3795e845756da9..34d31e7b2418568ed1a9727cfe1a13c72450c695 100644 (file)
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -151,7 +151,11 @@ void setup() {
   #endif
 
   #if HAS_DISPLAY
+    #if HAS_EEPROM
     if (EEPROM.read(eeprom_addr(ADDR_CONF_DSET)) != CONF_OK_BYTE) {
+    #elif MCU_VARIANT == MCU_NRF52
+    if (eeprom_read(eeprom_addr(ADDR_CONF_DSET)) != CONF_OK_BYTE) {
+    #endif
       eeprom_update(eeprom_addr(ADDR_CONF_DSET), CONF_OK_BYTE);
       eeprom_update(eeprom_addr(ADDR_CONF_DINT), 0xFF);
     }

diff --git a/Utilities.h b/Utilities.h
index b2f4f7419fc1b15e51c6f2952b884649e2a5b3aa..22080de59a26af82186c0bf2e13a01710c8fad92 100644 (file)
--- a/Utilities.h
+++ b/Utilities.h
@@ -43,6 +43,10 @@ sx128x *LoRa = &sx128x_modem;
 #include "Framing.h"
 #include "MD5.h"
 
+#if !HAS_EEPROM && MCU_VARIANT == MCU_NRF52
+uint8_t eeprom_read(uint32_t mapped_addr);
+#endif
+
 #if HAS_DISPLAY == true
   #include "Display.h"
 #endif