Mercurial > mbsePi-apps / file diff

--- a/www-thermferm/units.php	Sun Feb 15 18:21:20 2015 +0100
+++ b/www-thermferm/units.php	Sun Feb 15 20:38:54 2015 +0100
@@ -107,6 +107,9 @@
 	$cmd[] = "TEMP_SET_MAX,".$_POST['TempSetMax'];
 	$cmd[] = "IDLE_RANGE_L,".$_POST['IdleRangeL'];
 	$cmd[] = "IDLE_RANGE_H,".$_POST['IdleRangeH'];
+	$cmd[] = "PID_KP,".$_POST['PID_Kp'];
+	$cmd[] = "PID_KD,".$_POST['PID_Kd'];
+	$cmd[] = "PID_KI,".$_POST['PID_Ki'];
 	$cmd[] = ".";
 	send_array($cmd);
     }
@@ -131,6 +134,9 @@
     unset($_POST['TempSetMax']);
     unset($_POST['IdleRangeL']);
     unset($_POST['IdleRangeH']);
+    unset($_POST['PID_Kp']);
+    unset($_POST['PID_Kd']);
+    unset($_POST['PID_Ki']);
     load('units.php');
 }
 
@@ -166,6 +172,7 @@
 	isset($_POST['BeerAddress']) && isset($_POST['HeaterAddress']) && isset($_POST['CoolerAddress']) && isset($_POST['LightAddress']) &&
 	isset($_POST['HeaterDelay']) && isset($_POST['CoolerDelay']) && isset($_POST['LightDelay']) && isset($_POST['PSUAddress']) &&
 	isset($_POST['FanAddress']) && isset($_POST['DoorAddress']) && isset($_POST['TempSetMin']) && isset($_POST['TempSetMax']) &&
+	isset($_POST['PID_Kp']) && isset($_POST['PID_Kd']) && isset($_POST['PID_Li']) &&
 	isset($_POST['IdleRangeL']) && isset($_POST['IdleRangeH']) && isset($_POST['key']) && isset($_POST['command'])) {
 
 	if ($_POST['key'] == 'Cancel')
@@ -534,6 +541,24 @@
 		$outstr .= '        <td class="editfield"><input type="text" name="IdleRangeH" size="5" value="'.$f[1].'"> &deg;C (Heater margin)</td>'.PHP_EOL;
 		$outstr .= '       </tr>'.PHP_EOL;
 	    }
+	    if ($f[0] == "PID_KP") {
+		$outstr .= '       <tr class="editor">'.PHP_EOL;
+		$outstr .= '        <td class="editname">PID Kp</td>'.PHP_EOL;
+		$outstr .= '        <td class="editfield"><input type="text" name="PID_Kp" size="6" value="'.$f[1].'"> Proportional</td>'.PHP_EOL;
+		$outstr .= '       </tr>'.PHP_EOL;
+	    }
+	    if ($f[0] == "PID_KI") {
+		$outstr .= '       <tr class="editor">'.PHP_EOL;
+		$outstr .= '        <td class="editname">PID Ki</td>'.PHP_EOL;
+		$outstr .= '        <td class="editfield"><input type="text" name="PID_Ki" size="6" value="'.$f[1].'"> Intergral</td>'.PHP_EOL;
+		$outstr .= '       </tr>'.PHP_EOL;
+	    }
+	    if ($f[0] == "PID_KD") {
+		$outstr .= '       <tr class="editor">'.PHP_EOL;
+		$outstr .= '        <td class="editname">PID Kd</td>'.PHP_EOL;
+		$outstr .= '        <td class="editfield"><input type="text" name="PID_Kd" size="6" value="'.$f[1].'"> Derivative</td>'.PHP_EOL;
+		$outstr .= '       </tr>'.PHP_EOL;
+	    }
 	    $i++;
 	}
     }
@@ -638,6 +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="testdata" name="action">';
     $outstr .= '<input type="hidden" value="add" name="command">';
     $outstr .= '<input type="hidden" value="00000000-0000-0000-0000-000000000000" name="UUID">';