# HG changeset patch # User Ethan Zonca # Date 2015-06-05 19:51:12 # Node ID 0747d846c71e523b5d2a40c550d12f5f58186c0f # Parent 149610e94cf94e1e6dfd92898e5103fe1d694ac4 Fix cal offset string being too long diff --git a/display.c b/display.c --- a/display.c +++ b/display.c @@ -361,7 +361,7 @@ void display_process(therm_settings_t* s // Write text to OLED // [ therm :: set temp offset ] // [ g = 12 ] - ssd1306_DrawString("Thermocouple Offset", 0, 40); + ssd1306_DrawString("Temp Cal Offset", 0, 40); ssd1306_drawlogo(); char tempstr[6]; diff --git a/main.c b/main.c --- a/main.c +++ b/main.c @@ -235,7 +235,7 @@ int16_t update_pid(uint16_t k_p, uint16_ // Error accumulator (integrator) i_state += error; - // to prevent the iTerm getting huge despite lots of + // to prevent the iTerm getting huge from lots of // error, we use a "windup guard" // (this happens when the machine is first turned on and // it cant help be cold despite its best efforts) diff --git a/storage.c b/storage.c --- a/storage.c +++ b/storage.c @@ -14,6 +14,7 @@ void save_settings(therm_settings_t *tos Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_D, k_d); Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_UNITS, temp_units); Minimal_EEPROM_Lock(); + // TODO: Check for missing settings */ } @@ -58,6 +59,8 @@ void restore_settings(therm_settings_t * while(Minimal_FLASH_GetStatus()==FLASH_BUSY); temp_units = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_UNITS)); + // TODO: Check for missing settings + Minimal_EEPROM_Lock(); */ }