diff -r 1230b81ac36f -r 71b4c3d1b429 main/brewboard.c --- a/main/brewboard.c Thu May 02 11:53:03 2019 +0200 +++ b/main/brewboard.c Wed May 08 13:46:30 2019 +0200 @@ -21,8 +21,9 @@ int Main_Screen = MAIN_MODE_UNKNOWN; ///< Screen number int Old_Screen = MAIN_MODE_UNKNOWN; ///< Previous screen number +int Sub_Screen = 0; ///< Subscreen during mash bool System_TimeOk = false; ///< System time status - +const esp_app_desc_t *app_desc = NULL; void app_main() @@ -36,7 +37,8 @@ TFT_setFont(DEJAVU24_FONT, NULL); _fg = TFT_YELLOW; tempy = TFT_getfontheight() + 4; - sprintf(temp, "BrewBoard %s", VERSION); + app_desc = esp_ota_get_app_description(); + sprintf(temp, "BrewBoard %s", app_desc->version); TFT_print(temp, CENTER, 4); TFT_setFont(DEJAVU18_FONT, NULL); @@ -148,7 +150,7 @@ SoundPlay(SOUND_StartUp); /* Do not write to the TFT during VNC startup to avoid race conditions */ - VncStartup(); +// VncStartup(); start_http_websocket(); vTaskDelay(1000 / portTICK_PERIOD_MS); Main_Screen = MAIN_MODE_FREE;