Fix display on NRF52
This commit is contained in:
		
							
								
								
									
										10
									
								
								Display.h
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								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;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user