therm Changeset - f1a2d85da29b · protofusion repositories

Changeset - f1a2d85da29b

Parent rev.

Child rev.

[Not reviewed]

cortex-f0

0 1 0

Ethan Zonca - 9 years ago 2015-06-15 21:11:56
ez@ethanzonca.com

Bootloader is now the top menu item, and menu defaults to second item. System resets on flash erase.

1 file changed with 16 insertions and 14 deletions:

display.c

0 comments (0 inline, 0 general)

display.c

➞

Show inline comments

@@ @@ -53,90 +53,92 @@ void display_process(therm_settings_t* s @@
     uint8_t sw_left = !HAL_GPIO_ReadPin(SW_LEFT);
     uint8_t sw_right = !HAL_GPIO_ReadPin(SW_RIGHT);
     switch(status->state)
+    {
         // Idle state
         case STATE_IDLE:
+        {
             // Write text to OLED
             // [ therm :: idle ]
             ssd1306_DrawString("therm :: idle ", 0, 40);
             status->pid_enabled = 0;
             if(temp_changed) {
                 char tempstr[6];
                 itoa_fp(status->temp, status->temp_frac, tempstr);
                 ssd1306_DrawString("Temp: ", 3, 40);
                 ssd1306_DrawString("    ", 3, 72);
                 ssd1306_DrawString(tempstr, 3, 72);
+            }
             ssd1306_drawlogo();
             switch(goto_mode) {
                 case 3:
+                {
                     ssd1306_DrawString("-> loader   ", 1, 40);
                 } break;
                 case 2:
+                {
                     ssd1306_DrawString("-> heat     ", 1, 40);
                 } break;
                 case 1:
+                {
                     ssd1306_DrawString("-> setup    ", 1, 40);
                 } break;
                 case 0:
+                {
                     ssd1306_DrawString("-> loader   ", 1, 40);
                 } break;
                 case 3:
+                {
                     ssd1306_DrawString("-> reset    ", 1, 40);
+                }
+            }
             // Button handler
             if(SW_BTN_PRESSED) {
                 switch(goto_mode) {
                     case 3:
                         status->state = STATE_IDLE;
                         flash_erase(set);
                     case 2:
                         status->state = STATE_PREHEAT_BREW;
                         break;
                     case 1:
                         status->state = STATE_SETP;
                         break;
                     case 0:
+                    {
                         ssd1306_clearscreen();
                         ssd1306_DrawString("Bootloader Entered", 0, 0);
                         ssd1306_DrawString("Device won't boot", 2, 0);
                         ssd1306_DrawString("until reflashed!", 3, 0);
                         bootloader_enter(); // Resets into bootloader
                         status->state = STATE_IDLE; // Just in case
                     } break;
                     case 2:
                         status->state = STATE_PREHEAT_BREW;
                         break;
                     case 1:
                         status->state = STATE_SETP;
                         break;
                     case 0:
                         status->state = STATE_IDLE;
                         flash_erase(set);
                         NVIC_SystemReset();
                         break;
                     default:
                         status->state = STATE_PREHEAT_BREW;
+                }
+            }
             else if(SW_UP_PRESSED && goto_mode < 3) {
                 goto_mode++;
+            }
             else if(SW_DOWN_PRESSED && goto_mode > 0) {
                 goto_mode--;
+            }
             // Event Handler
             // N/A
         } break;
         case STATE_SETP:
+        {
             // Write text to OLED
             // [ therm :: set p ]
             // [ p = 12         ]
             ssd1306_DrawString("Proportional", 0, 40);

0 comments (0 inline, 0 general)