# HG changeset patch # User Michiel Broek # Date 1591036020 -7200 # Node ID 3ff381bfa4696e201862a18b994adb3043aa088e # Parent 224851e811170d727d5fbe56c961f4c8bae3565a Version 0.3.10 Updated the webui. The recipe mash infusiont temperature rounding from 0.25 to 0.0625 degrees. diff -r 224851e81117 -r 3ff381bfa469 CMakeLists.txt --- a/CMakeLists.txt Sun Apr 19 23:28:26 2020 +0200 +++ b/CMakeLists.txt Mon Jun 01 20:27:00 2020 +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.9") +set(PROJECT_VER "0.3.10") set(PROJECT_NAME "brewboard") include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff -r 224851e81117 -r 3ff381bfa469 image/version.txt --- a/image/version.txt Sun Apr 19 23:28:26 2020 +0200 +++ b/image/version.txt Mon Jun 01 20:27:00 2020 +0200 @@ -1,1 +1,1 @@ -0.3.6 +0.3.7a diff -r 224851e81117 -r 3ff381bfa469 image/w/css/webui.css --- a/image/w/css/webui.css Sun Apr 19 23:28:26 2020 +0200 +++ b/image/w/css/webui.css Mon Jun 01 20:27:00 2020 +0200 @@ -20,6 +20,7 @@ color: yellow; text-align: center; font-size: 18px; + font-weight: 700; } #mltline, diff -r 224851e81117 -r 3ff381bfa469 image/w/webui.html --- a/image/w/webui.html Sun Apr 19 23:28:26 2020 +0200 +++ b/image/w/webui.html Mon Jun 01 20:27:00 2020 +0200 @@ -109,7 +109,7 @@
-

Written by Michiel Broek © 2018 +

Written by Michiel Broek © 2018-2020

Parts are written by Chris Morgan, Brett Beauregard, Blake Felt, LoBo and David Antliff. diff -r 224851e81117 -r 3ff381bfa469 main/recipes.c --- a/main/recipes.c Sun Apr 19 23:28:26 2020 +0200 +++ b/main/recipes.c Mon Jun 01 20:27:00 2020 +0200 @@ -722,8 +722,8 @@ } EditInt((char *)"Maisch stappen", &mashsteps, 1, 6); EditFloat((char *)"Inmaisch temperatuur", &recipe.MashStep[0].Temperature, 38, 74, 2); - // Round to 0.25 values - recipe.MashStep[0].Temperature = ((int)(recipe.MashStep[0].Temperature * 4)) / 4.0; + // Round to 0.0625 values + recipe.MashStep[0].Temperature = ((int)(recipe.MashStep[0].Temperature * 16)) / 16.0; for (int i = 1; i <= mashsteps; i++) { sprintf(tmp, "Maisch stap %d naam", i); EditText(tmp, recipe.MashStep[i].Name, 31); @@ -734,6 +734,7 @@ else mintemp = recipe.MashStep[i - 1].Temperature; EditFloat(tmp, &recipe.MashStep[i].Temperature, mintemp, 74, 2); + // Round to 0.25 values recipe.MashStep[i].Temperature = ((int)(recipe.MashStep[i].Temperature * 4)) / 4.0; sprintf(tmp, "Maisch stap %d rusttijd in minuten", i); EditUint16(tmp, &recipe.MashStep[i].Resttime, 1, 480); diff -r 224851e81117 -r 3ff381bfa469 main/task_tft.c --- a/main/task_tft.c Sun Apr 19 23:28:26 2020 +0200 +++ b/main/task_tft.c Mon Jun 01 20:27:00 2020 +0200 @@ -560,7 +560,7 @@ TopMessage(temp_buf); _fg = TFT_YELLOW; TFT_setFont(UBUNTU16_FONT, NULL); - TFT_print((char *)"Written by Michiel Broek (C) 2018\r\n\n", 0, 50); + TFT_print((char *)"Written by Michiel Broek (C) 2018-2020\r\n\n", 0, 50); // ------------------------------------- _fg = TFT_ORANGE; TFT_print((char *)"Parts are written by Chris Morgan,\r\n", 0, LASTY);