therm Changeset - 7e8e32dead20 · protofusion repositories

Changeset - 7e8e32dead20

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca - 11 years ago 2014-11-14 23:12:59
ez@ethanzonca.com

Setpoint setting code compiles

1 file changed with 43 insertions and 51 deletions:

main.c

0 comments (0 inline, 0 general)

main.c

➞

Show inline comments

@@ @@ -34,24 +34,25 @@ uint16_t k_d = 1; @@
 volatile uint32_t ticks = 0;
 int16_t setpoint_brew = 0;
 int16_t setpoint_steam = 0;
 // State definition
 enum state {
     STATE_IDLE = 0,
     STATE_SETP,
     STATE_SETI,
     STATE_SETD,
     STATE_SETSTEPS,
     STATE_SETWINDUP,
     STATE_SETBOOTTOBREW,
     STATE_PREHEAT_BREW,
     STATE_MAINTAIN_BREW,
     STATE_PREHEAT_STEAM,
     STATE_MAINTAIN_STEAM,
 };
 uint8_t state = STATE_IDLE;
 static __IO uint32_t TimingDelay;
@@ @@ -353,76 +354,28 @@ void restore_settings() @@
     while(Minimal_FLASH_GetStatus()==FLASH_BUSY);
     setpoint_steam = (*(__IO uint32_t*)(EEPROM_BASE_ADDR + EEPROM_ADDR_STEAMTEMP));
     Minimal_EEPROM_Lock();
+}
 int16_t last_temp = 21245;
 ///////////////////////////////////////////////////////////////////////////////////////
 /// freaking multiple setpoint support ///
 uint8_t step_duration[10];
 int16_t step_setpoint[10];
 uint8_t step_duration[10] = {0,0,0,0,0,0,0,0,0,0};
 int16_t step_setpoint[10] = {0,0,0,0,0,0,0,0,0,0};
 uint8_t final_setpoint = 0;
 void stepper_init()
+{
     int i;
     for(i=0; i<10; i++)
+    {
         step_duration[i] = 0;
         step_setpoint[i] = 0;
+    }
+}
 void state_setstepper()
+{
     // Write text to OLED
     // [ step #1:: Duration: ### ]
     // [           Setpoint: ### ]
     char tempstr[6];
     itoa(stepnum, tempstr);
     ssd1306_DrawString("Step #", 0, 0);
     ssd1306_DrawString(tempstr, 0, 40);
     ssd1306_DrawString("Duration: ", 0, 5);
     itoa(step_duration[final_setpoint], tempstr);
     ssd1306_DrawString(tempstr, 0, 70);
     ssd1306_DrawString("Setpoint: ", 0, 0);
     itoa(step_setpoint[final_setpoint], tempstr);
     itoa(stepnum, tempstr);
     ssd1306_DrawString("Press to accept", 3, 40);
     // Button handler - TODO: increment max_step if pressed
     // return and go to next state otherwise
     if(SW_BTN_PRESSED) {
         state = STATE_SETSTEPPER;
         final_setpoint++
+    }
     else if(SW_LEFT_PRESSED) {
         state++; // go to next state or something
+    }
     else {
         user_input(&k_p);
+    }
     // Event Handler
     // N/A
+}
 // Multiple screens to set setpoint and duration on each screen
 // press center to go to the next one, and press left or right or something to confirm
 // When executing, complete on time AND(?) temperature. Maybe allow switching to OR via settings
 ////////////////////////////////////////////////////////////////////////////////////////////////
 void machine()
+{
     uint8_t last_state = state;
     uint8_t temp_changed = temp != last_temp;
@@ @@ -567,35 +520,74 @@ void machine() @@
             ssd1306_drawlogo();
             char tempstr[6];
             itoa(k_d, tempstr);
             ssd1306_DrawString("D=", 1, 45);
             ssd1306_DrawString("    ", 1, 57);
             ssd1306_DrawString(tempstr, 1, 57);
             ssd1306_DrawString("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
-                state = STATE_SETWINDUP;
+                state = STATE_SETSTEPS;
+            }
             else {
                 user_input(&k_d);
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETSTEPS:
+        {
             // Write text to OLED
             // [ step #1:: Duration: ### ]
             // [           Setpoint: ### ]
             char tempstr[6];
             itoa(final_setpoint, tempstr);
             ssd1306_DrawString("Step #", 0, 0);
             ssd1306_DrawString(tempstr, 0, 40);
             ssd1306_DrawString("Duration: ", 0, 5);
             itoa(step_duration[final_setpoint], tempstr);
             ssd1306_DrawString(tempstr, 0, 70);
             ssd1306_DrawString("Setpoint: ", 0, 0);
             itoa(step_setpoint[final_setpoint], tempstr);
             ssd1306_DrawString(tempstr, 0, 70);
             ssd1306_DrawString("Press to accept", 3, 40);
             // Button handler - TODO: increment max_step if pressed
             // return and go to next state otherwise
             if(SW_BTN_PRESSED) {
                 state = STATE_SETSTEPS;
                 final_setpoint++;
+            }
         //    else if(SW_LEFT_PRESSED) {
         //        state++; // go to next state or something
         //    }
             else {
                 user_input(&k_p);
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETWINDUP:
+        {
             // Write text to OLED
             // [ therm :: set windup ]
             // [ g = 12         ]
             ssd1306_DrawString("Windup Guard", 0, 40);
             ssd1306_drawlogo();
             char tempstr[6];
             itoa(windup_guard, tempstr);
             ssd1306_DrawString("G=", 1, 45);
             ssd1306_DrawString("    ", 1, 57);

0 comments (0 inline, 0 general)