# HG changeset patch # User Michiel Broek # Date 1591790967 -7200 # Node ID 7f02dbee58d001883b2c993feaf9fe8e9e87ab4f # Parent 47253f294a9fc1a384946449ad416f3e6d7b1ee5 Fix missing log entries. More code space saving. diff -r 47253f294a9f -r 7f02dbee58d0 main/brewboard.c --- a/main/brewboard.c Wed Jun 10 09:43:51 2020 +0200 +++ b/main/brewboard.c Wed Jun 10 14:09:27 2020 +0200 @@ -44,7 +44,7 @@ TFT_setFont(DEJAVU18_FONT, NULL); _fg = TFT_CYAN; TFT_print((char *)"Mount /spiffs ", 0, LASTY+tempy); - ESP_LOGI(TAG, "Initializing SPIFFS"); + ESP_LOGD(TAG, "Initializing SPIFFS"); esp_vfs_spiffs_conf_t conf = { .base_path = "/spiffs", diff -r 47253f294a9f -r 7f02dbee58d0 main/task_driver.c --- a/main/task_driver.c Wed Jun 10 09:43:51 2020 +0200 +++ b/main/task_driver.c Wed Jun 10 14:09:27 2020 +0200 @@ -134,7 +134,7 @@ bool rc; unsigned long now, RealTime, w_StartTime = 0; - ESP_LOGI(TAG, "Starting output drivers"); + ESP_LOGI(TAG, "Start drivers"); /* * Configure IOMUX register. diff -r 47253f294a9f -r 7f02dbee58d0 main/task_ds18b20.c --- a/main/task_ds18b20.c Wed Jun 10 09:43:51 2020 +0200 +++ b/main/task_ds18b20.c Wed Jun 10 14:09:27 2020 +0200 @@ -192,7 +192,7 @@ float Plate_MLT = 18.90; extern int MLT_pin, HLT_pin; - ESP_LOGI(TAG, "Starting Fake sensors"); + ESP_LOGI(TAG, "Start Fake sensors"); ds18b20_state = malloc(sizeof(DS18B20_State)); ds18b20_state->mlt_valid = ds18b20_state->hlt_valid = true; ds18b20_state->mlt_temperature = 18.90; diff -r 47253f294a9f -r 7f02dbee58d0 main/task_http.c --- a/main/task_http.c Wed Jun 10 09:43:51 2020 +0200 +++ b/main/task_http.c Wed Jun 10 14:09:27 2020 +0200 @@ -545,7 +545,7 @@ struct netconn *conn, *newconn; static err_t err; - ESP_LOGI(TAG, "Starting http server_task"); + ESP_LOGI(TAG, "Start http server_task"); client_queue = xQueueCreate(client_queue_size,sizeof(struct netconn*)); conn = netconn_new(NETCONN_TCP); @@ -577,7 +577,7 @@ { struct netconn* conn; - ESP_LOGI(TAG, "Starting Queue task"); + ESP_LOGI(TAG, "Start Queue task"); for(;;) { xQueueReceive(client_queue, &conn, portMAX_DELAY); if (!conn) @@ -593,7 +593,7 @@ void start_http_websocket(void) { - ESP_LOGI(TAG, "Starting HTTP/Websocket server"); + ESP_LOGI(TAG, "Start HTTP/Websocket server"); ws_server_start(); xTaskCreate(&task_HTTPserver, "HTTPserver", 3000, NULL, 9, &xTaskHTTP); diff -r 47253f294a9f -r 7f02dbee58d0 main/task_sdcard.c --- a/main/task_sdcard.c Wed Jun 10 09:43:51 2020 +0200 +++ b/main/task_sdcard.c Wed Jun 10 14:09:27 2020 +0200 @@ -406,7 +406,7 @@ json_log = malloc(sizeof(JSON_log)); - ESP_LOGI(TAG, "Starting SD card"); + ESP_LOGI(TAG, "Start SD card"); sdmmc_host_t host = SDSPI_HOST_DEFAULT(); host.slot = SDCARD_HOST_SLOT; // HSPI_HOST is in use by the TFT. sdspi_slot_config_t slot_config = SDSPI_SLOT_CONFIG_DEFAULT(); diff -r 47253f294a9f -r 7f02dbee58d0 main/task_sound.c --- a/main/task_sound.c Wed Jun 10 09:43:51 2020 +0200 +++ b/main/task_sound.c Wed Jun 10 14:09:27 2020 +0200 @@ -93,7 +93,7 @@ { EventBits_t uxBits; - ESP_LOGI(TAG, "Starting sound"); + ESP_LOGI(TAG, "Start sound"); gpio_pad_select_gpio(PIEZO_BUZZER); gpio_set_direction(PIEZO_BUZZER, GPIO_MODE_OUTPUT); diff -r 47253f294a9f -r 7f02dbee58d0 main/task_tft.c --- a/main/task_tft.c Wed Jun 10 09:43:51 2020 +0200 +++ b/main/task_tft.c Wed Jun 10 14:09:27 2020 +0200 @@ -87,7 +87,7 @@ .name = "SecondsTimer" }; - ESP_LOGI(TAG, "Initialize TFT"); + ESP_LOGD(TAG, "Initialize TFT"); max_rdclock = 8000000; TFT_PinsInit(); @@ -126,7 +126,7 @@ ret = spi_lobo_device_deselect(spi); assert(ret == ESP_OK); - ESP_LOGI(TAG, "SPI: attached display, spi bus: %d, speed: %u, bus uses native pins: %s", + ESP_LOGD(TAG, "SPI: attached display, spi bus: %d, speed: %u, bus uses native pins: %s", SPI_BUS, spi_lobo_get_speed(spi), spi_lobo_uses_native_pins(spi) ? "true" : "false"); ESP_LOGI(TAG, "TS pins : miso=%d, mosi=%d, sck=%d, cs=%d", PIN_NUM_MISO, PIN_NUM_MOSI, PIN_NUM_CLK, PIN_NUM_TCS); @@ -141,7 +141,7 @@ ret = spi_lobo_device_deselect(tsspi); assert(ret == ESP_OK); - ESP_LOGI(TAG, "SPI: attached TS device, spi bus: %d, speed: %u", SPI_BUS, spi_lobo_get_speed(tsspi)); + ESP_LOGD(TAG, "SPI: attached TS device, spi bus: %d, speed: %u", SPI_BUS, spi_lobo_get_speed(tsspi)); // ==== Initialize the Display ==== TFT_display_init(); @@ -151,7 +151,7 @@ // ==== Set SPI clock used for display operations ==== spi_lobo_set_speed(spi, DEFAULT_SPI_CLOCK); - ESP_LOGI(TAG, "SPI: Max rd speed: %u, changed speed to %u", max_rdclock, spi_lobo_get_speed(spi)); + ESP_LOGD(TAG, "SPI: Max rd speed: %u, changed speed to %u", max_rdclock, spi_lobo_get_speed(spi)); font_rotate = 0; text_wrap = 0; @@ -492,7 +492,7 @@ { char msg[96]; - ESP_LOGI(TAG, "Starting TFT/Touch"); + ESP_LOGI(TAG, "Start TFT/Touch"); /* * Task loop. Read touchscreen events. @@ -501,13 +501,12 @@ /* * Build new screen. */ -startover: - updateRuntime = false; if (_NewMinute) { _NewMinute = false; NewMinute = true; } +startover: /* * Timekeeping. diff -r 47253f294a9f -r 7f02dbee58d0 main/task_wifi.c --- a/main/task_wifi.c Wed Jun 10 09:43:51 2020 +0200 +++ b/main/task_wifi.c Wed Jun 10 14:09:27 2020 +0200 @@ -379,7 +379,7 @@ { esp_err_t ret; - ESP_LOGI(TAG, "Starting WiFi"); + ESP_LOGI(TAG, "Start WiFi"); /* * Initialize NVS