therm Changeset - 227e0d971bff · protofusion repositories

Changeset - 227e0d971bff

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca - 11 years ago 2014-09-21 17:46:02
ez@ethanzonca.com

Added prototype eeprom read function, added fix for run-on heating

1 file changed with 29 insertions and 8 deletions:

main.c

0 comments (0 inline, 0 general)

main.c

➞

Show inline comments

@@ @@ -266,25 +266,25 @@ void process() @@
             itoa(ssr_output, tempstr);
             ssd1306_DrawString("#=", 2, 45);
             ssd1306_DrawString("    ", 2, 57);
             ssd1306_DrawString(tempstr, 2, 57);
             GPIO_SetBits(LED_STAT);
             GPIO_SetBits(SSR_PIN);
             last_ssr_on = ticks;
+        }
+    }
     // Kill SSR after elapsed period less than SSR_PERIOD
     if(ticks - last_ssr_on > ssr_output)
+    if(ticks - last_ssr_on > ssr_output || ssr_output == 0)
+    {
         GPIO_ResetBits(LED_STAT);
         GPIO_ResetBits(SSR_PIN);
+    }
+}
 void draw_setpoint() {
     char tempstr[3];
     itoa_fp(temp, temp_frac, tempstr);
     //ssd1306_DrawString("        ", 3, 40);
     ssd1306_DrawString(tempstr, 3, 40);
     ssd1306_DrawString("-> ", 3, 80);
@@ @@ -307,82 +307,103 @@ uint8_t sw_right_last = 0; @@
 #define SW_DOWN_PRESSED (sw_down_last == 0 && sw_down == 1)
 #define SW_LEFT_PRESSED (sw_left_last == 0 && sw_left == 1)
 #define SW_RIGHT_PRESSED (sw_right_last == 0 && sw_right == 1)
 /*
  * uint8_t boottobrew = 0;
 #define WINDUP_GUARD_GAIN 100
 uint16_t windup_guard = WINDUP_GUARD_GAIN;
 uint16_t k_p = 1;
 uint16_t k_i = 1;
 uint16_t k_d = 1;*/
 #define EEPROM_ADDR_WINDUP_GUARD 	0x0808001C
 #define EEPROM_ADDR_BOOTTOBREW		0x08080020
 #define EEPROM_ADDR_K_P			0x8080024
 #define EEPROM_ADDR_K_I			0x8080028
 #define EEPROM_ADDR_K_D			0x808002C
 #define EEPROM_ADDR_WINDUP_GUARD 	0x001C
 #define EEPROM_ADDR_BOOTTOBREW		0x0020
 #define EEPROM_ADDR_K_P			0x0024
 #define EEPROM_ADDR_K_I			0x0028
 #define EEPROM_ADDR_K_D			0x002C
 #define EEPROM_ADDR_BREWTEMP		0x0030
 #define EEPROM_ADDR_STEAMTEMP		0x0034
 #define EEPROM_ADDR_BREWTEMP		0x8080030
 #define EEPROM_ADDR_STEAMTEMP		0x8080034
 #define EEPROM_BASE_ADDR    0x08080000
 #define EEPROM_BYTE_SIZE    0x0FFF
 /*
 uint32_t EEPROM_ReadWord(uint16_t Addr)
+{
     uint32 *wAddr;
     wAddr=(uint32 *)(EEPROM_BASE_ADDR+Addr);
     uint32 res;
     res = *wAddr++;
     while(Length--){
         *Buffer++=*wAddr++;
+    }
+}
 */
 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_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_Lock();
+}
 // TODO: Save/restore temperature setpoint settings
 void restore_settings()
+{
     DATA_EEPROM_Unlock();
     while(FLASH_GetStatus()==FLASH_BUSY);
     boottobrew = (*(__IO uint32_t*)EEPROM_ADDR_BOOTTOBREW);
     while(FLASH_GetStatus()==FLASH_BUSY);
     windup_guard = (*(__IO uint32_t*)EEPROM_ADDR_WINDUP_GUARD);
     while(FLASH_GetStatus()==FLASH_BUSY);
     k_p = (*(__IO uint32_t*)EEPROM_ADDR_K_P);
     while(FLASH_GetStatus()==FLASH_BUSY);
     k_i = (*(__IO uint32_t*)EEPROM_ADDR_K_I);
     while(FLASH_GetStatus()==FLASH_BUSY);
     k_d = (*(__IO uint32_t*)EEPROM_ADDR_K_D);
     while(FLASH_GetStatus()==FLASH_BUSY);
     setpoint_brew = (*(__IO uint32_t*)EEPROM_ADDR_BREWTEMP);
     while(FLASH_GetStatus()==FLASH_BUSY);
     setpoint_steam = (*(__IO uint32_t*)EEPROM_ADDR_STEAMTEMP);
     DATA_EEPROM_Lock();
+}
 void user_input(uint16_t* to_modify)
+{
     if(CHANGE_ELAPSED) {
         // TODO: Make function that takes reference to a var and increase/decreases it based on buttonpress
         if(!GPIO_ReadInputDataBit(SW_UP) ) {
             CHANGE_RESET;
             (*to_modify)++;
+        }
         else if(!GPIO_ReadInputDataBit(SW_DOWN) && (*to_modify) > 0) {
             CHANGE_RESET;
             (*to_modify)--;

0 comments (0 inline, 0 general)