therm Changeset - 0747d846c71e · protofusion repositories

Changeset - 0747d846c71e

Parent rev.

Child rev.

[Not reviewed]

cortex-f0

0 3 0

Ethan Zonca - 9 years ago 2015-06-05 19:51:12
ez@ethanzonca.com

Fix cal offset string being too long

3 files changed with 5 insertions and 2 deletions:

display.c

main.c

storage.c

0 comments (0 inline, 0 general)

display.c

➞

Show inline comments

@@ @@ -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];

main.c

➞

Show inline comments

@@ @@ -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)

storage.c

➞

Show inline comments

@@ @@ -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(); */
+}

0 comments (0 inline, 0 general)