# HG changeset patch # User Ethan Zonca # Date 2014-09-25 21:22:36 # Node ID 1d2e435794e9b3fda39f31ebdc4be6c5424fadf6 # Parent e1ff9c2d3789ce6d48bc1d0698cb9ac5f8084207 Fixed bad EEPROM read address (poor casting) diff --git a/main.c b/main.c --- a/main.c +++ b/main.c @@ -443,25 +443,25 @@ void restore_settings() { Minimal_EEPROM_Unlock(); while(Minimal_FLASH_GetStatus()==FLASH_BUSY); - boottobrew = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_BOOTTOBREW); + boottobrew = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_BOOTTOBREW)); while(Minimal_FLASH_GetStatus()==FLASH_BUSY); - windup_guard = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_WINDUP_GUARD); + windup_guard = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_WINDUP_GUARD)); while(Minimal_FLASH_GetStatus()==FLASH_BUSY); - k_p = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_K_P); + k_p = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_K_P)); while(Minimal_FLASH_GetStatus()==FLASH_BUSY); - k_i = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_K_I); + k_i = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_K_I)); while(Minimal_FLASH_GetStatus()==FLASH_BUSY); - k_d = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_K_D); + k_d = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_K_D)); while(Minimal_FLASH_GetStatus()==FLASH_BUSY); - setpoint_brew = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_BREWTEMP); + setpoint_brew = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_BREWTEMP)); while(Minimal_FLASH_GetStatus()==FLASH_BUSY); - setpoint_steam = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP); + setpoint_steam = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP)); Minimal_EEPROM_Lock(); }