# HG changeset patch
# User Ethan Zonca <ez@ethanzonca.com>
# Date 2014-09-25 20:46:55
# Node ID 51243b5920db01d1e39b0825d964c72cce8b80bb
# Parent  aa0d40ec2a0a0e4a5c771fd882a399bef9370b9e

Fixed EEPROM read issue

diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
@@ -347,19 +347,19 @@ void save_settings()
 {
     DATA_EEPROM_Unlock();
     // Try programming a word at an address divisible by 4
-    DATA_EEPROM_ProgramWord(EEPROM_ADDR_BOOTTOBREW, boottobrew);
-    DATA_EEPROM_ProgramWord(EEPROM_ADDR_WINDUP_GUARD, windup_guard);
-    DATA_EEPROM_ProgramWord(EEPROM_ADDR_K_P, k_p);
-    DATA_EEPROM_ProgramWord(EEPROM_ADDR_K_I, k_i);
-    DATA_EEPROM_ProgramWord(EEPROM_ADDR_K_D, k_d);
+    DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_BOOTTOBREW, boottobrew);
+    DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_WINDUP_GUARD, windup_guard);
+    DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_P, k_p);
+    DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_I, k_i);
+    DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_D, k_d);
     DATA_EEPROM_Lock();
     
 }
 void save_setpoints()
 {
     DATA_EEPROM_Unlock();
-    DATA_EEPROM_ProgramWord(EEPROM_ADDR_BREWTEMP, setpoint_brew);
-    DATA_EEPROM_ProgramWord(EEPROM_ADDR_STEAMTEMP, setpoint_steam); 
+    DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_BREWTEMP, setpoint_brew);
+    DATA_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP, setpoint_steam); 
     DATA_EEPROM_Lock();
 }
 
@@ -370,25 +370,25 @@ void restore_settings()
 
     DATA_EEPROM_Unlock();
     while(FLASH_GetStatus()==FLASH_BUSY);
-    boottobrew = (*(__IO uint32_t*)EEPROM_ADDR_BOOTTOBREW);
+    boottobrew = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_BOOTTOBREW);
     
     while(FLASH_GetStatus()==FLASH_BUSY);
-    windup_guard = (*(__IO uint32_t*)EEPROM_ADDR_WINDUP_GUARD);
+    windup_guard = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_WINDUP_GUARD);
     
     while(FLASH_GetStatus()==FLASH_BUSY);
-    k_p = (*(__IO uint32_t*)EEPROM_ADDR_K_P);
+    k_p = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_K_P);
 
     while(FLASH_GetStatus()==FLASH_BUSY);
-    k_i = (*(__IO uint32_t*)EEPROM_ADDR_K_I);
+    k_i = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_K_I);
 
     while(FLASH_GetStatus()==FLASH_BUSY);
-    k_d = (*(__IO uint32_t*)EEPROM_ADDR_K_D);
+    k_d = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_K_D);
     
     while(FLASH_GetStatus()==FLASH_BUSY);
-    setpoint_brew = (*(__IO uint32_t*)EEPROM_ADDR_BREWTEMP);
+    setpoint_brew = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_BREWTEMP);
 
     while(FLASH_GetStatus()==FLASH_BUSY);
-    setpoint_steam = (*(__IO uint32_t*)EEPROM_ADDR_STEAMTEMP);    
+    setpoint_steam = (*(__IO uint32_t*)EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP);    
     
     DATA_EEPROM_Lock();