Mercurial > brewboard / changeset

--- a/CMakeLists.txt	Fri Jul 30 20:35:04 2021 +0200
+++ b/CMakeLists.txt	Sat Jul 31 15:44:20 2021 +0200
@@ -2,7 +2,7 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(PROJECT_VER "0.3.18")
+set(PROJECT_VER "0.3.19")
 set(PROJECT_NAME "brewboard")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)

--- a/main/automation.c	Fri Jul 30 20:35:04 2021 +0200
+++ b/main/automation.c	Sat Jul 31 15:44:20 2021 +0200
@@ -818,7 +818,7 @@
                         	driver_state->mlt_sp = stageTemp;
                         	xSemaphoreGive(xSemaphoreDriver);
                     	    }
-			//ESP_LOGI(TAG, "Current %7.4f new %7.4f part %7.4f", stageTemp, newTemp, part);
+			    //ESP_LOGD(TAG, "Current %7.4f new %7.4f part %7.4f", stageTemp, newTemp, part);
 			}
 		    }
 		    oldTimeLeft = TimeLeft;
@@ -1075,7 +1075,7 @@
                 } else if (driver_state->mlt_pv >= stageTemp) {
                     Output = (int)((BoilPower * 255.0) / 100.0);
                 } else {
-                    Output = (int)((RampPower * 255.0) / 100.0);;
+                    Output = (int)((RampPower * 255.0) / 100.0);
                 }
 
                 MLT_info(71, 26, true);

--- a/main/brewboard.c	Fri Jul 30 20:35:04 2021 +0200
+++ b/main/brewboard.c	Sat Jul 31 15:44:20 2021 +0200
@@ -156,18 +156,11 @@
     vTaskDelay(1000 / portTICK_PERIOD_MS);
     Main_Screen = MAIN_MODE_FREE;
 
-//    static char cBuffer[ 1024 ];
-
     /*
      * Main application loop.
      */
     while (1) {
 	vTaskDelay(20000 / portTICK_PERIOD_MS);
-
-//	vTaskList( cBuffer );
-//	printf("Name            State   Prio    Stack   Num\n");
-//	printf("--------------- ------- ------- ------- -------\n");
-//	printf("%s\n", cBuffer);
     }
     // Not reached.
 }

--- a/main/config.c	Fri Jul 30 20:35:04 2021 +0200
+++ b/main/config.c	Sat Jul 31 15:44:20 2021 +0200
@@ -374,13 +374,6 @@
 
 
 
-int blacklist_station(uint8_t *SSID)
-{
-	return -1;
-}
-
-
-
 void write_runtime()
 {
     uint8_t	*dst = (uint8_t *)&runtime;

--- a/main/config.h	Fri Jul 30 20:35:04 2021 +0200
+++ b/main/config.h	Sat Jul 31 15:44:20 2021 +0200
@@ -287,13 +287,6 @@
  */
 void remove_station(uint8_t *SSID);
 
-/**
- * @brief Blacklist station SSID
- * @param SSID The SSID to blacklist.
- * @return -1 if error, else the record number.
- */
-int blacklist_station(uint8_t *SSID);
-
 
 
 /**

--- a/main/task_sdcard.c	Fri Jul 30 20:35:04 2021 +0200
+++ b/main/task_sdcard.c	Sat Jul 31 15:44:20 2021 +0200
@@ -464,8 +464,6 @@
     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.
-    //host.flags = SDMMC_HOST_FLAG_SPI | SDMMC_HOST_FLAG_DEINIT_ARG | SDMMC_HOST_FLAG_1BIT;
-    //host.max_freq_khz = 10000;
     spi_bus_config_t bus_cfg = {
         .mosi_io_num = SDCARD_PIN_NUM_MOSI,
         .miso_io_num = SDCARD_PIN_NUM_MISO,

--- a/main/task_wifi.c	Fri Jul 30 20:35:04 2021 +0200
+++ b/main/task_wifi.c	Sat Jul 31 15:44:20 2021 +0200
@@ -441,9 +441,7 @@
 	     * Or, option 3, the 5 seconds timeout is reached. This happens when the AP is not in range.
 	     * Note that the reason code is not exploited. For all intent and purposes a failure is a failure.
 	     */
-//	    ESP_LOGI(TAG, "2 wait for %08x", TASK_WIFI_STA_CONNECTED | TASK_WIFI_STA_FAILED);
 	    uxBits = xEventGroupWaitBits(xEventGroupWifi, TASK_WIFI_STA_CONNECTED | TASK_WIFI_STA_FAILED, pdFALSE, pdFALSE, 5000 / portTICK_PERIOD_MS);
-//	    ESP_LOGI(TAG, "2 waitbits %08x", uxBits & (TASK_WIFI_STA_CONNECTED | TASK_WIFI_STA_FAILED));
 
 	    if (uxBits & (TASK_WIFI_STA_CONNECTED | TASK_WIFI_STA_FAILED)) {
 		/* 

--- a/main/updates.c	Fri Jul 30 20:35:04 2021 +0200
+++ b/main/updates.c	Sat Jul 31 15:44:20 2021 +0200
@@ -203,11 +203,6 @@
     static char	theurl[73], thefile[41];
     FILE	*f;
 
-//    static char	todel[41];
-//    snprintf(todel, 40, "/spiffs//%s", filename);
-//    unlink(todel);
-//    return 0;
-
     snprintf(theurl, 72, "http://update.mbse.eu/ap1/image/%s", filename);
     snprintf(thefile, 40, "/spiffs/%s", filename);
 

--- a/sdkconfig	Fri Jul 30 20:35:04 2021 +0200
+++ b/sdkconfig	Sat Jul 31 15:44:20 2021 +0200
@@ -121,8 +121,10 @@
 #
 # BrewBoard Configuration
 #
-# CONFIG_TEMP_SENSORS_ONEWIRE is not set
-CONFIG_TEMP_SENSORS_SIMULATOR=y
+CONFIG_TEMP_SENSORS_ONEWIRE=y
+# CONFIG_TEMP_SENSORS_SIMULATOR is not set
+CONFIG_ONE_WIRE_MLT=27
+CONFIG_ONE_WIRE_HLT=26
 CONFIG_SSR_MLT_GPIO=32
 CONFIG_PWM_MLT_GPIO=0
 CONFIG_SSR_HLT_GPIO=33