therm Changeset - fe0367a9a87a · protofusion repositories

Changeset - fe0367a9a87a

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca - 10 years ago 2014-10-18 17:33:12
ez@ethanzonca.com

Added larger font size and removed logos on preheat/etc screens

1 file changed with 16 insertions and 18 deletions:

main.c

0 comments (0 inline, 0 general)

main.c

➞

Show inline comments

@@ @@ -71,50 +71,51 @@ int main(void) @@
     // Init GPIO
     init_gpio();
     // Turn on power LED
     GPIO_SetBits(LED_POWER);
     // TODO: Awesome pwm of power LED (TIM4_CH4 or TIM11_CH1)
     // Configure 1ms SysTick (change if more temporal resolution needed)
     RCC_ClocksTypeDef RCC_Clocks;
     RCC_GetClocksFreq(&RCC_Clocks);
     SysTick_Config(RCC_Clocks.HCLK_Frequency / 1000);
     // Init SPI busses
     init_spi();
     // Init OLED over SPI
     ssd1306_Init();
     ssd1306_clearscreen();
     // Check for problems on startup
     if(clock_fail) {
         //ssd1306_DrawStringBig("ERROR: Check Xtal", 2, 0);
         ssd1306_DrawStringBig("XTAL ERR", 2, 0);
         delay(5000);
         ssd1306_DrawStringBig("NO XTAL", 2, 0);
         delay(1000);
         ssd1306_clearscreen();
+    }
     // Init USB
     //Set_System(); // hw_config.h
     Set_USBClock();
     USB_Interrupts_Config();
     USB_Init();
     //SYSCFG_USBPuCmd(ENABLE);
     //PowerOn();
     // Startup screen
     ssd1306_DrawString("therm v0.1", 1, 40);
     ssd1306_DrawString("protofusion.org/therm", 3, 0);
     delay(1500);
     ssd1306_clearscreen();
     restore_settings();
     if(boottobrew)
       state = STATE_PREHEAT_BREW; // Go to brew instead of idle if configured thusly
     GPIO_ResetBits(LED_STAT);
     // Main loop
@@ @@ -243,75 +244,72 @@ void process() @@
         GPIO_ToggleBits(LED_POWER);
         last_led = ticks;
+    }
     // Every 200ms, set the SSR on unless output is 0
     if((ticks - last_ssr_on > SSR_PERIOD))
+    {
         if(pid_enabled)
+        {
             // Get ssr output for next time
             int16_t power_percent = update_pid(k_p, k_i, k_d, temp, temp_frac, setpoint);
             //power-percent is 0-1000
             ssr_output = power_percent; //(((uint32_t)SSR_PERIOD * (uint32_t)10 * (uint32_t)100) * power_percent) / (uint32_t)1000000;
+        }
         else
+        {
             ssr_output = 0;
+        }
         // Only support heating (ssr_output > 0) right now
         if(ssr_output > 0) {
             char tempstr[6];
             itoa(ssr_output, tempstr);
             ssd1306_DrawString("#=", 2, 45);
             ssd1306_DrawString("    ", 2, 57);
             ssd1306_DrawString(tempstr, 2, 57);
             ssd1306_DrawString(tempstr, 0, 90);
             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 || 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);
     ssd1306_DrawStringBig(tempstr, 3, 0);
     ssd1306_DrawStringBig(">", 3, 74);
     itoa(setpoint, tempstr);
     ssd1306_DrawString("    ", 3, 95);
     ssd1306_DrawString(tempstr, 3, 95);
     ssd1306_DrawStringBig("    ", 3, 90);
     ssd1306_DrawStringBig(tempstr, 3, 90);
+}
 uint8_t goto_mode = 2;
 // State machine
 uint8_t sw_btn_last = 0;
 uint8_t sw_up_last = 0;
 uint8_t sw_down_last = 0;
 uint8_t sw_left_last = 0;
 uint8_t sw_right_last = 0;
 #define SW_BTN_PRESSED (sw_btn_last == 0 && sw_btn == 1) // rising edge on buttonpress
 #define SW_UP_PRESSED (sw_up_last == 0 && sw_up == 1)
 #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)
 void save_settings()
+{
    Minimal_EEPROM_Unlock();
     // Try programming a word at an address divisible by 4
     Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_BOOTTOBREW, boottobrew);
     Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_WINDUP_GUARD, windup_guard);
     Minimal_EEPROM_ProgramWord(EEPROM_BASE_ADDR + EEPROM_ADDR_K_P, k_p);
@@ @@ -573,129 +571,129 @@ void machine() @@
             ssd1306_DrawString("Press to accept", 3, 40);
             // Button handler
             if(SW_BTN_PRESSED) {
                 save_settings();
                 state = STATE_IDLE;
+            }
             else if(!GPIO_ReadInputDataBit(SW_UP)) {
                 boottobrew = 1;
+            }
             else if(!GPIO_ReadInputDataBit(SW_DOWN)) {
                 boottobrew = 0;
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_PREHEAT_BREW:
+        {
             // Write text to OLED
             // [ therm : preheating brew ]
             // [ 30 => 120 C             ]
             ssd1306_DrawString("Preheating...", 0, 40);
             ssd1306_drawlogo();
             ssd1306_DrawString("Preheating...", 0, 0);
             //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 {
                 user_input(&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();
             ssd1306_DrawString("Preheated!", 0, 0);
             //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 {
                 user_input(&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();
             ssd1306_DrawString("Preheating...", 0, 0);
             //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 {
                 user_input(&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();
             ssd1306_DrawString("Ready to Steam!", 0, 0);
             //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 {
                 user_input(&setpoint_steam);
+            }
             // Event Handler
             // N/A
         } break;
         // Something is terribly wrong
         default:
+        {
             state = STATE_IDLE;
             pid_enabled = 0;

0 comments (0 inline, 0 general)