Mercurial > brewboard / changeset

--- 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)

--- 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

--- 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,

--- 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 @@
 
   <div id="row_info">
    <div style="color: yellow; text-align: center;">
-    <p />Written by Michiel Broek &copy; 2018
+    <p />Written by Michiel Broek &copy; 2018-2020
    </div>
    <div style="color: orange; text-align: center;">
     <p />Parts are written by Chris Morgan, Brett Beauregard, Blake Felt, LoBo and David Antliff.

--- 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);

--- 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);