Mercurial > mbsePi-apps / file diff

--- a/www-thermferm/units.php	Sun Feb 15 23:09:00 2015 +0100
+++ b/www-thermferm/units.php	Mon Feb 16 19:52:42 2015 +0100
@@ -203,10 +203,10 @@
 	if (($_POST['TempSetMin'] < -5) || ($_POST['TempSetMin'] > 15))
 	    return 6;
 
-	if (($_POST['HeaterDelay'] < 0) || ($_POST['HeaterDelay'] > 45))
+	if (($_POST['HeaterDelay'] < 0) || ($_POST['HeaterDelay'] > 720))
 	    return 7;
 
-	if (($_POST['CoolerDelay'] < 0) || ($_POST['CoolerDelay'] > 45))
+	if (($_POST['CoolerDelay'] < 0) || ($_POST['CoolerDelay'] > 720))
 	    return 8;
 
 	if (($_POST['IdleRangeL'] > 0) || ($_POST['IdleRangeL'] < -5))
@@ -215,7 +215,7 @@
 	if (($_POST['IdleRangeH'] < 0) || ($_POST['IdleRangeH'] > 5))
 	    return 10;
 
-	if (($_POST['LightDelay'] < 0) || ($_POST['LightDelay'] > 45))
+	if (($_POST['LightDelay'] < 0) || ($_POST['LightDelay'] > 720))
 	    return 11;
 
     } else {
@@ -256,15 +256,15 @@
 		break;
 	case 6:	$error = 'Temperature Minimum must be between -5 and 15 &deg;C';
 		break;
-	case 7: $error = 'Heater Delay must be bewteen 0 and 45';
+	case 7: $error = 'Heater Delay must be bewteen 0 and 720 seconds';
 		break;
-	case 8:	$error = 'Cooler Delay must be bewteen 0 and 45';
+	case 8:	$error = 'Cooler Delay must be bewteen 0 and 720 seconds';
 		break;
 	case 9: $error = 'Idle Range Low must be between -5 en 0';
 		break;
 	case 10: $error = 'Idle Range High must be between 0 and 5';
 		break;
-	case 11: $error = 'Light Delay must be bewteen 0 and 45';
+	case 11: $error = 'Light Delay must be bewteen 0 and 720 seconds';
 		break;
 	case 99:        
 		load('units.php');
@@ -397,7 +397,7 @@
 	    if ($f[0] == "HEATER_DELAY") {
 		$outstr .= '       <tr class="editor">'.PHP_EOL;
 		$outstr .= '        <td class="editname">Heater Switch Delay</td>'.PHP_EOL;
-		$outstr .= '        <td class="editfield"><input type="text" name="HeaterDelay" size="5" value="'.$f[1].'"> * 15 seconds</td>'.PHP_EOL;
+		$outstr .= '        <td class="editfield"><input type="text" name="HeaterDelay" size="5" value="'.$f[1].'"> seconds (0..720)</td>'.PHP_EOL;
 		$outstr .= '       </tr>'.PHP_EOL;
 	    }
 	    if ($f[0] == "COOLER_ADDRESS") {
@@ -424,7 +424,7 @@
 	    if ($f[0] == "COOLER_DELAY") {
 		$outstr .= '       <tr class="editor">'.PHP_EOL;
 		$outstr .= '        <td class="editname">Cooler Switch Delay</td>'.PHP_EOL;
-		$outstr .= '        <td class="editfield"><input type="text" name="CoolerDelay" size="5" value="'.$f[1].'"> * 15 seconds</td>'.PHP_EOL;
+		$outstr .= '        <td class="editfield"><input type="text" name="CoolerDelay" size="5" value="'.$f[1].'"> seconds (0..720)</td>'.PHP_EOL;
 		$outstr .= '       </tr>'.PHP_EOL;
 	    }
 	    if ($f[0] == "FAN_ADDRESS") {
@@ -472,7 +472,7 @@
 	    if ($f[0] == "LIGHT_DELAY") {
 		$outstr .= '       <tr class="editor">'.PHP_EOL;
 		$outstr .= '        <td class="editname">Lights Delay</td>'.PHP_EOL;
-		$outstr .= '        <td class="editfield"><input type="text" name="LightDelay" size="5" value="'.$f[1].'"> * 15 seconds</td>'.PHP_EOL;
+		$outstr .= '        <td class="editfield"><input type="text" name="LightDelay" size="5" value="'.$f[1].'"> seconds (0..720)</td>'.PHP_EOL;
 		$outstr .= '       </tr>'.PHP_EOL;
 	    }
 	    if ($f[0] == "DOOR_ADDRESS") {
@@ -532,13 +532,13 @@
 	    if ($f[0] == "IDLE_RANGE_L") {
 		$outstr .= '       <tr class="editor">'.PHP_EOL;
 		$outstr .= '        <td class="editname">Idle Range Low</td>'.PHP_EOL;
-		$outstr .= '        <td class="editfield"><input type="text" name="IdleRangeL" size="5" value="'.$f[1].'"> &deg;C (Cooler margin)</td>'.PHP_EOL;
+		$outstr .= '        <td class="editfield"><input type="text" name="IdleRangeL" size="6" value="'.$f[1].'"> &deg;C (Cooler margin)</td>'.PHP_EOL;
 		$outstr .= '       </tr>'.PHP_EOL;
 	    }
 	    if ($f[0] == "IDLE_RANGE_H") {
 		$outstr .= '       <tr class="editor">'.PHP_EOL;
 		$outstr .= '        <td class="editname">Idle Range High</td>'.PHP_EOL;
-		$outstr .= '        <td class="editfield"><input type="text" name="IdleRangeH" size="5" value="'.$f[1].'"> &deg;C (Heater margin)</td>'.PHP_EOL;
+		$outstr .= '        <td class="editfield"><input type="text" name="IdleRangeH" size="6" value="'.$f[1].'"> &deg;C (Heater margin)</td>'.PHP_EOL;
 		$outstr .= '       </tr>'.PHP_EOL;
 	    }
 	    if ($f[0] == "PID_KP") {
@@ -663,9 +663,9 @@
     $outstr .= '<input type="hidden" value="30.0" name="TempSetMax">';
     $outstr .= '<input type="hidden" value="-1.0" name="IdleRangeL">';
     $outstr .= '<input type="hidden" value="1.0" name="IdleRangeH">';
-    $outstr .= '<input type="hidden" value="0.0" name="PID_Kp">';
-    $outstr .= '<input type="hidden" value="0.0" name="PID_Kd">';
-    $outstr .= '<input type="hidden" value="0.0" name="PID_Ki">';
+    $outstr .= '<input type="hidden" value="4.0" name="PID_Kp">';
+    $outstr .= '<input type="hidden" value="0.2" name="PID_Kd">';
+    $outstr .= '<input type="hidden" value="1.0" name="PID_Ki">';
     $outstr .= '<input type="hidden" value="testdata" name="action">';
     $outstr .= '<input type="hidden" value="add" name="command">';
     $outstr .= '<input type="hidden" value="00000000-0000-0000-0000-000000000000" name="UUID">';