Mercurial > mbsePi-apps / changeset

--- a/configure	Sun Jul 07 14:28:37 2019 +0200
+++ b/configure	Mon Nov 04 13:19:27 2019 +0100
@@ -2047,7 +2047,7 @@
 
 
 PACKAGE="mbsePi-apps"
-VERSION="0.9.6"
+VERSION="0.9.7"
 COPYRIGHT="Copyright (C) 2014-2019 Michiel Broek, All Rights Reserved"
 CYEARS="2014-2019"
 

--- a/configure.ac	Sun Jul 07 14:28:37 2019 +0200
+++ b/configure.ac	Mon Nov 04 13:19:27 2019 +0100
@@ -8,7 +8,7 @@
 dnl General settings
 dnl After changeing the version number, run autoconf!
 PACKAGE="mbsePi-apps"
-VERSION="0.9.6"
+VERSION="0.9.7"
 COPYRIGHT="Copyright (C) 2014-2019 Michiel Broek, All Rights Reserved"
 CYEARS="2014-2019"
 AC_SUBST(PACKAGE)

--- a/thermferm/rdconfig.c	Sun Jul 07 14:28:37 2019 +0200
+++ b/thermferm/rdconfig.c	Mon Nov 04 13:19:27 2019 +0100
@@ -587,7 +587,7 @@
     unit->heater_wait = unit->cooler_wait = unit->fan_wait = unit->light_wait = 0;
     unit->heater_usage = unit->cooler_usage = unit->fan_usage = unit->light_usage = 0;
     unit->temp_set_min = 1.0;
-    unit->temp_set_max = 30.0;
+    unit->temp_set_max = 45.0;
     unit->yeast_lo = 12.0;
     unit->yeast_hi = 24.0;
     unit->prof_started = unit->prof_paused = unit->prof_primary_done = (time_t)0;

--- a/thermferm/server.c	Sun Jul 07 14:28:37 2019 +0200
+++ b/thermferm/server.c	Mon Nov 04 13:19:27 2019 +0100
@@ -1411,7 +1411,7 @@
 	unit->heater_wait = unit->cooler_wait = unit->fan_wait = unit->light_wait = 0;
 	unit->heater_usage = unit->cooler_usage = unit->fan_usage = unit->light_usage = 0;
 	unit->temp_set_min = 1.0;
-	unit->temp_set_max = 30.0;
+	unit->temp_set_max = 45.0;
 	unit->prof_started = unit->prof_paused = unit->prof_primary_done = (time_t)0;
 	unit->prof_percent = 0;
 	unit->PID_cool = (pid_var *)malloc(sizeof(pid_var));

--- a/www-thermferm/liveview.php	Sun Jul 07 14:28:37 2019 +0200
+++ b/www-thermferm/liveview.php	Mon Nov 04 13:19:27 2019 +0100
@@ -135,11 +135,11 @@
 
 	if ("$air_state" == "OK") {
 	    $outstr .= '       $("#gaugeContainer_air'.$unr.'").jqxGauge({'.PHP_EOL;
-	    $outstr .= '         min: -5, max: 35, width: 275, height: 275,'.PHP_EOL;
+	    $outstr .= '         min: -5, max: 45, width: 275, height: 275,'.PHP_EOL;
 	    $outstr .= '         ranges: [{ startValue: -5, endValue:  0, style: { fill: \'#3399FF\', stroke: \'#3399FF\' }, endWidth: 10, startWidth: 10 },'.PHP_EOL;
 	    $outstr .= '                  { startValue:  0, endValue: 16, style: { fill: \'#00CC33\', stroke: \'#00CC33\' }, endWidth: 10, startWidth: 10 },'.PHP_EOL;
 	    $outstr .= '                  { startValue: 16, endValue: 24, style: { fill: \'#FCA76A\', stroke: \'#FCA76A\' }, endWidth: 10, startWidth: 10 },'.PHP_EOL;
-	    $outstr .= '                  { startValue: 24, endValue: 35, style: { fill: \'#FC6A6A\', stroke: \'#FC6A6A\' }, endWidth: 10, startWidth: 10 }],'.PHP_EOL;
+	    $outstr .= '                  { startValue: 24, endValue: 45, style: { fill: \'#FC6A6A\', stroke: \'#FC6A6A\' }, endWidth: 10, startWidth: 10 }],'.PHP_EOL;
 	    $outstr .= '         ticksMinor: { interval: 1, size: \'5%\' },'.PHP_EOL;
 	    $outstr .= '         ticksMajor: { interval: 5, size: \'9%\' },'.PHP_EOL;
 	    $outstr .= '         labels: { interval: 5 },'.PHP_EOL;
@@ -152,11 +152,11 @@
 
 	if ("$beer_state" == "OK") {
 	    $outstr .= '       $(\'#gaugeContainer_beer'.$unr.'\').jqxGauge({'.PHP_EOL;
-	    $outstr .= '         min: -5, max: 35, width: 275, height: 275,'.PHP_EOL;
+	    $outstr .= '         min: -5, max: 45, width: 275, height: 275,'.PHP_EOL;
 	    $outstr .= '         ranges: [{ startValue: -5, endValue:  0, style: { fill: \'#3399FF\', stroke: \'#3399FF\' }, endWidth: 10, startWidth: 10 },'.PHP_EOL;
 	    $outstr .= '                  { startValue:  0, endValue: 16, style: { fill: \'#00CC33\', stroke: \'#00CC33\' }, endWidth: 10, startWidth: 10 },'.PHP_EOL;
 	    $outstr .= '                  { startValue: 16, endValue: 24, style: { fill: \'#FCA76A\', stroke: \'#FCA76A\' }, endWidth: 10, startWidth: 10 },'.PHP_EOL;
-	    $outstr .= '                  { startValue: 24, endValue: 35, style: { fill: \'#FC6A6A\', stroke: \'#FC6A6A\' }, endWidth: 10, startWidth: 10 }],'.PHP_EOL;
+	    $outstr .= '                  { startValue: 24, endValue: 45, style: { fill: \'#FC6A6A\', stroke: \'#FC6A6A\' }, endWidth: 10, startWidth: 10 }],'.PHP_EOL;
 	    $outstr .= '         ticksMinor: { interval: 1, size: \'5%\' },'.PHP_EOL;
 	    $outstr .= '         ticksMajor: { interval: 5, size: \'9%\' },'.PHP_EOL;
 	    $outstr .= '         labels: { interval: 5 },'.PHP_EOL;

--- a/www-thermferm/units.php	Sun Jul 07 14:28:37 2019 +0200
+++ b/www-thermferm/units.php	Mon Nov 04 13:19:27 2019 +0100
@@ -1,6 +1,6 @@
 <?php
 /*****************************************************************************
- * Copyright (C) 2014-2018
+ * Copyright (C) 2014-2019
  *   
  * Michiel Broek <mbroek at mbse dot eu>
  *
@@ -238,7 +238,7 @@
 	if ($_POST['TempSetMax'] <= $_POST['TempSetMin'])
 	    return 4;
 
-	if (($_POST['TempSetMax'] < 25) || ($_POST['TempSetMax'] > 35))
+	if (($_POST['TempSetMax'] < 25) || ($_POST['TempSetMax'] > 45))
 	    return 5;
 
 	if (($_POST['TempSetMin'] < -5) || ($_POST['TempSetMin'] > 15))
@@ -296,7 +296,7 @@
 		break;
 	case 4: $error = 'Temperature Maximum cannot be smaller then Temperature Minimum';
 		break;
-	case 5: $error = 'Temperature Maximum must be between 25 and 35 &deg;C';
+	case 5: $error = 'Temperature Maximum must be between 25 and 45 &deg;C';
 		break;
 	case 6:	$error = 'Temperature Minimum must be between -5 and 15 &deg;C';
 		break;