diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c @@ -42,27 +42,27 @@ static uint8_t toggle = 0; void display_1hz(void) { - toggle = !toggle; + toggle = !toggle; } static char updown(void) { - if(toggle) - return '\x8f'; - else - return '\x90'; + if(toggle) + return '\x8f'; + else + return '\x90'; } // Display state machine void display_process(void) { - therm_status_t* status = runtime_status(); - therm_settings_t* set = flash_getsettings(); + therm_status_t* status = runtime_status(); + therm_settings_t* set = flash_getsettings(); uint8_t state_changed = status->state != last_state; last_state = status->state; - + uint8_t temp_changed = status->temp != last_temp; last_temp = status->temp; @@ -85,23 +85,23 @@ void display_process(void) if(temp_changed || state_changed) { char tempstr[16]; snprintf(tempstr, 16, "Temp: %4.1f", status->temp); -// ssd1306_drawstring(" ", 3, 40); + // ssd1306_drawstring(" ", 3, 40); ssd1306_drawstring(tempstr, 3, 40); } if (state_changed) { - ssd1306_drawlogo(); + ssd1306_drawlogo(); } switch(goto_mode) { case MODE_HEAT: { - if(set->val.plant_type == PLANT_HEATER) - ssd1306_drawstring("\x83 heat ", 1, 40); - else - ssd1306_drawstring("\x83 cool ", 1, 40); + if(set->val.plant_type == PLANT_HEATER) + ssd1306_drawstring("\x83 heat ", 1, 40); + else + ssd1306_drawstring("\x83 cool ", 1, 40); } break; @@ -115,12 +115,12 @@ void display_process(void) ssd1306_drawstring("\x83 reset ", 1, 40); } break; - #ifdef BOOTLOADER_SHORTCUT +#ifdef BOOTLOADER_SHORTCUT case MODE_BOOTLOADER: { ssd1306_drawstring("\x83 dfu ", 1, 40); } - #endif +#endif } // Button handler @@ -136,16 +136,16 @@ void display_process(void) status->state = STATE_RESET; reset_mode = RESET_REBOOT; break; - #ifdef BOOTLOADER_SHORTCUT +#ifdef BOOTLOADER_SHORTCUT case MODE_BOOTLOADER: 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 + // bootloader_enter(); // Resets into bootloader status->state = STATE_RESET; // Just in case break; - #endif +#endif default: status->state = STATE_PREHEAT; } @@ -174,7 +174,7 @@ void display_process(void) ssd1306_drawlogo(); ssd1306_drawchar(updown(), 1, 52); - ssd1306_drawstring(sensor_lookup[set->val.sensor_type], 1, 60); + ssd1306_drawstring(sensor_lookup[set->val.sensor_type], 1, 60); ssd1306_drawstring("Press to accept", 3, 40); // Button handler @@ -183,9 +183,9 @@ void display_process(void) } else { - user_input((uint16_t*)&set->val.sensor_type); + user_input((uint16_t*)&set->val.sensor_type); if(set->val.sensor_type > 6) - set->val.sensor_type = 6; + set->val.sensor_type = 6; } // Event Handler @@ -210,7 +210,7 @@ void display_process(void) ssd1306_drawstring("Thermostat", 1, 60); ssd1306_drawstring("Press to accept", 3, 40); - + // Button handler if(SW_BTN_PRESSED) { status->state = STATE_SETPLANTTYPE; @@ -223,7 +223,7 @@ void display_process(void) } // Event Handler // N/A - + } break; @@ -243,7 +243,7 @@ void display_process(void) ssd1306_drawstring("Cooler", 1, 60); ssd1306_drawstring("Press to accept", 3, 40); - + // Button handler if(SW_BTN_PRESSED) { if(set->val.control_mode == MODE_PID) @@ -259,7 +259,7 @@ void display_process(void) } // Event Handler // N/A - + } break; @@ -279,7 +279,7 @@ void display_process(void) snprintf(tempstr, 12, "P=%d", set->val.k_p); ssd1306_drawstring(tempstr, 1, 60); ssd1306_drawstring("Press to accept", 3, 40); - + // Button handler if(SW_BTN_PRESSED) { status->state = STATE_SETI; @@ -290,7 +290,7 @@ void display_process(void) // Event Handler // N/A - + } break; case STATE_SETI: @@ -308,7 +308,7 @@ void display_process(void) ssd1306_drawstring(tempstr, 1, 60); ssd1306_drawstring("Press to accept", 3, 40); - + // Button handler if(SW_BTN_PRESSED) { status->state = STATE_SETD; @@ -319,7 +319,7 @@ void display_process(void) // Event Handler // N/A - + } break; case STATE_SETD: @@ -348,7 +348,7 @@ void display_process(void) // Event Handler // N/A - + } break; @@ -407,7 +407,7 @@ void display_process(void) // Event Handler // N/A - + } break; case STATE_SETBOOTTOBREW: @@ -419,7 +419,7 @@ void display_process(void) ssd1306_drawlogo(); ssd1306_drawstring("sob=", 1, 50); - + ssd1306_drawchar(updown(), 1, 43); if(set->val.boottobrew) @@ -442,7 +442,7 @@ void display_process(void) // Event Handler // N/A - + } break; case STATE_SETUNITS: @@ -475,7 +475,7 @@ void display_process(void) // Event Handler // N/A - + } break; @@ -497,7 +497,7 @@ void display_process(void) // Button handler if(SW_BTN_PRESSED) { - flash_savesettings(); + flash_savesettings(); status->state = STATE_IDLE; } else { @@ -506,7 +506,7 @@ void display_process(void) // Event Handler // N/A - + } break; @@ -539,7 +539,7 @@ void display_process(void) if(status->temp >= status->setpoint) { status->state = STATE_MAINTAIN; } - + } break; case STATE_MAINTAIN: @@ -568,7 +568,7 @@ void display_process(void) // Event Handler // N/A - + } break; // Thermocouple error @@ -601,9 +601,9 @@ void display_process(void) // Button handler if(SW_BTN_PRESSED) { status->state = STATE_IDLE; - #ifdef MAX31865_RTD_SENSOR - max31865_clear_errors(spi_get()); - #endif +#ifdef MAX31865_RTD_SENSOR + max31865_clear_errors(spi_get()); +#endif } else if(SW_RIGHT_PRESSED) { set->val.ignore_error = 1; @@ -612,7 +612,7 @@ void display_process(void) // Event Handler // Maybe handle if TC is plugged in // N/A - + } break; @@ -627,10 +627,10 @@ void display_process(void) ssd1306_drawlogo(); switch(reset_mode) { - case RESET_DEFAULTS: - { - ssd1306_drawstring("-> defaults ", 1, 40); - } break; + case RESET_DEFAULTS: + { + ssd1306_drawstring("-> defaults ", 1, 40); + } break; case RESET_BOOTLOADER: { ssd1306_drawstring("-> bootloader ", 1, 40); @@ -655,14 +655,14 @@ void display_process(void) ssd1306_drawstring("Device won't boot", 2, 0); ssd1306_drawstring("until reflashed!", 3, 0); HAL_Delay(1000); -// bootloader_enter(); // Resets into bootloader + // bootloader_enter(); // Resets into bootloader status->state = STATE_RESET; // Just in case } break; case RESET_DEFAULTS: { status->state = STATE_RESET; -// flash_load_defaults(set); -// flash_save(set); + // flash_load_defaults(set); + // flash_save(set); NVIC_SystemReset(); } break; case RESET_REBOOT: @@ -696,7 +696,7 @@ void display_process(void) status->pid_enabled = 0; } break; - + } if(last_state != status->state) {