therm Changeset - 31284ec8ec2c · protofusion repositories

Changeset - 31284ec8ec2c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca - 10 years ago 2014-09-03 22:45:13
ez@ethanzonca.com

Added setpoint saving. Need to do modification checks to reduce number of writes.

1 file changed with 42 insertions and 14 deletions:

main.c

0 comments (0 inline, 0 general)

main.c

➞

Show inline comments

@@ @@ -20,24 +20,27 @@ extern __IO uint32_t length ; @@
 uint8_t Send_Buffer[64];
 uint32_t packet_sent=1;
 uint32_t packet_receive=1;
 // Globalish setting vars
 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;
 int16_t setpoint_brew = 0;
 int16_t setpoint_steam = 0;
 // State definition
 enum state {
     STATE_IDLE = 0,
     STATE_SETP,
     STATE_SETI,
     STATE_SETD,
     STATE_SETWINDUP,
     STATE_SETBOOTTOBREW,
     STATE_PREHEAT_BREW,
     STATE_MAINTAIN_BREW,
@@ @@ -48,24 +51,25 @@ enum state { @@
 uint8_t state = STATE_IDLE;
 static __IO uint32_t TimingDelay;
 // Move to header file
 void init_gpio();
 void init_spi();
 void process();
 void machine();
 void delay(__IO uint32_t nTime);
 void restore_settings();
 void save_settings();
 void save_setpoints();
 int main(void)
+{
     // Init clocks
     SystemInit();
     // Init GPIO
     init_gpio();
     // Init USB
     //Set_USBClock();
@@ @@ -298,56 +302,73 @@ uint8_t sw_right_last = 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_BREWTEMP		0x8080030
 #define EEPROM_ADDR_STEAMTEMP		0x8080034
 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 machine()
+{
     uint8_t last_state = state;
     uint8_t sw_btn = !GPIO_ReadInputDataBit(SW_BTN);
     uint8_t sw_up = !GPIO_ReadInputDataBit(SW_UP);
     uint8_t sw_down = !GPIO_ReadInputDataBit(SW_DOWN);
     uint8_t sw_left = !GPIO_ReadInputDataBit(SW_LEFT);
     uint8_t sw_right = !GPIO_ReadInputDataBit(SW_RIGHT);
@@ @@ -582,119 +603,126 @@ void machine() @@
         case STATE_PREHEAT_BREW:
+        {
             // Write text to OLED
             // [ therm : preheating brew ]
             // [ 30 => 120 C             ]
             ssd1306_DrawString("Preheating...", 0, 40);
             ssd1306_drawlogo();
             draw_setpoint();
             pid_enabled = 1;
 	    setpoint = setpoint_brew;
             // Button handler
             if(SW_BTN_PRESSED) {
 		save_setpoints(); // TODO: Check for mod
                 state = STATE_IDLE;
+            }
             else if(!GPIO_ReadInputDataBit(SW_UP)) {
-               setpoint++;
+               setpoint_brew++;
+            }
             else if(!GPIO_ReadInputDataBit(SW_DOWN) && setpoint > 0) {
                 setpoint--;
             else if(!GPIO_ReadInputDataBit(SW_DOWN) && setpoint_brew > 0) {
                 setpoint_brew--;
+            }
             // Event Handler
             if(temp >= setpoint) {
                 state = STATE_MAINTAIN_BREW;
+            }
         } break;
         case STATE_MAINTAIN_BREW:
+        {
             // Write text to OLED
             // [ therm : ready to brew ]
             // [ 30 => 120 C           ]
             ssd1306_DrawString("Ready to Brew!", 0, 40);
             ssd1306_drawlogo();
             draw_setpoint();
             pid_enabled = 1;
 	    setpoint = setpoint_brew;
             // Button handler
             if(SW_BTN_PRESSED) {
 		save_setpoints(); // TODO: Check for mod
                 state = STATE_IDLE;
+            }
             else if(!GPIO_ReadInputDataBit(SW_UP)) {
-               setpoint++;
+               setpoint_brew++;
+            }
             else if(!GPIO_ReadInputDataBit(SW_DOWN) && setpoint > 0) {
                 setpoint--;
             else if(!GPIO_ReadInputDataBit(SW_DOWN) && setpoint_brew > 0) {
                 setpoint_brew--;
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_PREHEAT_STEAM:
+        {
             // Write text to OLED
             // [ therm : preheating steam ]
             // [ 30 => 120 C           ]
             ssd1306_DrawString("Preheating...", 0, 40);
             ssd1306_drawlogo();
             draw_setpoint();
             pid_enabled = 1;
 	    setpoint = setpoint_steam;
             // Button handler
             if(SW_BTN_PRESSED) {
                 state = STATE_IDLE;
 		save_setpoints(); // TODO: Check for mod
+            }
             else if(!GPIO_ReadInputDataBit(SW_UP)) {
-               setpoint++;
+               setpoint_steam++;
+            }
             else if(!GPIO_ReadInputDataBit(SW_DOWN) && setpoint > 0) {
                 setpoint--;
             else if(!GPIO_ReadInputDataBit(SW_DOWN) && setpoint_steam > 0) {
                 setpoint_steam--;
+            }
             // Event Handler
             if(temp >= setpoint) {
                 state = STATE_MAINTAIN_STEAM;
+            }
         } break;
         case STATE_MAINTAIN_STEAM:
+        {
             // Write text to OLED
             // [ therm : ready to steam ]
             // [ 30 => 120 C            ]
             ssd1306_DrawString("Ready to Steam!", 0, 40);
             ssd1306_drawlogo();
             draw_setpoint();
             pid_enabled = 1;
 	    setpoint = setpoint_steam;
             // Button handler
             if(SW_BTN_PRESSED) {
                 state = STATE_IDLE;
 		save_setpoints(); // TODO: Check for mod
+            }
             else if(!GPIO_ReadInputDataBit(SW_UP)) {
-               setpoint++;
+               setpoint_steam++;
+            }
             else if(!GPIO_ReadInputDataBit(SW_DOWN) && setpoint > 0) {
                 setpoint--;
             else if(!GPIO_ReadInputDataBit(SW_DOWN) && setpoint_steam > 0) {
                 setpoint_steam--;
+            }
             // Event Handler
             // N/A
         } break;
         // Something is terribly wrong
         default:
+        {
             state = STATE_IDLE;

0 comments (0 inline, 0 general)