--- a/www-thermferm/units.php Mon Jun 26 13:58:11 2017 +0200
+++ b/www-thermferm/units.php Mon Jun 26 19:21:07 2017 +0200
@@ -96,6 +96,8 @@
$cmd[] = "AIR_IDX,".$_POST['AirIdx'];
$cmd[] = "BEER_ADDRESS,".$_POST['BeerAddress'];
$cmd[] = "BEER_IDX,".$_POST['BeerIdx'];
+ $cmd[] = "CHILLER_ADDRESS,".$_POST['ChillerAddress'];
+ $cmd[] = "CHILLER_IDX,".$_POST['ChillerIdx'];
$cmd[] = "HEATER_ADDRESS,".$_POST['HeaterAddress'];
$cmd[] = "HEATER_DELAY,".$_POST['HeaterDelay'];
$cmd[] = "HEATER_IDX,".$_POST['HeaterIdx'];
@@ -137,6 +139,8 @@
unset($_POST['AirIdx']);
unset($_POST['BeerAddress']);
unset($_POST['BeerIdx']);
+ unset($_POST['ChillerAddress']);
+ unset($_POST['ChillerIdx']);
unset($_POST['HeaterAddress']);
unset($_POST['HeaterDelay']);
unset($_POST['HeaterIdx']);
@@ -197,7 +201,7 @@
global $arr;
- if (isset($_POST['UUID']) && isset($_POST['Name']) && isset($_POST['Volume']) && isset($_POST['AirAddress']) &&
+ if (isset($_POST['UUID']) && isset($_POST['Name']) && isset($_POST['Volume']) && isset($_POST['AirAddress']) && isset($_POST['ChillerAddress']) &&
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']) &&
@@ -205,7 +209,7 @@
isset($_POST['PIDH_pGain']) && isset($_POST['PIDH_iGain']) && isset($_POST['PIDH_dGain']) && isset($_POST['PIDH_idleRange']) &&
isset($_POST['PIDC_iMax']) && isset($_POST['PIDH_iMax']) && isset($_POST['AirIdx']) && isset($_POST['BeerIdx']) &&
isset($_POST['HeaterIdx']) && isset($_POST['CoolerIdx']) && isset($_POST['LightIdx']) && isset($_POST['DoorIdx']) &&
- isset($_POST['PSUIdx']) && isset($_POST['FanIdx']) &&
+ isset($_POST['PSUIdx']) && isset($_POST['FanIdx']) && isset($_POST['ChillerIdx']) &&
isset($_POST['FanDelay']) && isset($_POST['key']) && isset($_POST['command'])) {
if ($_POST['key'] == 'Cancel')
@@ -360,13 +364,13 @@
if ($f[0] == "NAME") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Unit Name</td>'.PHP_EOL;
- $outstr .= ' <td class="editfield"><input type="text" name="Name" size="50" value="'.$f[1].'"></td>'.PHP_EOL;
+ $outstr .= ' <td colspan="3" class="editfield"><input type="text" name="Name" size="50" value="'.$f[1].'"></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "VOLUME") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Unit Volume</td>'.PHP_EOL;
- $outstr .= ' <td class="editfield"><input type="text" name="Volume" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
+ $outstr .= ' <td colspan="3" class="editfield"><input type="text" name="Volume" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "AIR_ADDRESS") {
@@ -388,10 +392,10 @@
}
}
$outstr .= ' </select></td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "AIR_IDX") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Air domoticz idx</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="AirIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
@@ -415,14 +419,41 @@
}
}
$outstr .= ' </select></td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "BEER_IDX") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Beer domoticz idx</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="BeerIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
+ if ($f[0] == "CHILLER_ADDRESS") {
+ $outstr .= ' <tr class="editor">'.PHP_EOL;
+ $outstr .= ' <td class="editname">Chiller Sensor Address</td>'.PHP_EOL;
+ $outstr .= ' <td class="editfield"><select name="ChillerAddress">'.PHP_EOL;
+ $outstr .= ' <option value="">Not Assigned</option>'.PHP_EOL;
+ if (startsWith($devices[0], "212")) {
+ $j = 1;
+ while (1) {
+ if (strcmp($devices[$j], ".") == 0)
+ break;
+ $g = explode(",", $devices[$j]);
+ if ($g[5] == "IN_ANALOG") {
+ ($f[1] == $g[0]) ? $se = " selected" : $se = "";
+ $outstr .= ' <option value="'.$g[0].'"'.$se.'>'.$g[1].' '.$g[4].'</option>'.PHP_EOL;
+ }
+ $j++;
+ }
+ }
+ $outstr .= ' </select></td>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
+ }
+ if ($f[0] == "CHILLER_IDX") {
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
+ $outstr .= ' <td class="editname">Chiller domoticz idx</td>'.PHP_EOL;
+ $outstr .= ' <td class="editfield"><input type="text" name="ChillerIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
+ $outstr .= ' </tr>'.PHP_EOL;
+ }
if ($f[0] == "HEATER_ADDRESS") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Heater Switch Address</td>'.PHP_EOL;
@@ -442,10 +473,10 @@
}
}
$outstr .= ' </select></td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "HEATER_DELAY") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $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].'"> seconds (0..720)</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
@@ -454,16 +485,22 @@
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Heater domoticz idx</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="HeaterIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "PIDH_IMAX") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PID Heat Maximum</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="PIDH_iMax" size="6" value="'.$f[1].'"> % (1..100)</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
+ if ($f[0] == "PIDH_IDLERANGE") {
+ $outstr .= ' <tr class="editor">'.PHP_EOL;
+ $outstr .= ' <td class="editname">Heater Idle Range</td>'.PHP_EOL;
+ $outstr .= ' <td class="editfield"><input type="text" name="PIDH_idleRange" size="6" value="'.$f[1].'"> °C (Heater margin)</td>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
+ }
if ($f[0] == "PIDH_PGAIN") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PID Heat pGain</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="PIDH_pGain" size="6" value="'.$f[1].'"> Proportional</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
@@ -472,20 +509,14 @@
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PID Heat iGain</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="PIDH_iGain" size="6" value="'.$f[1].'"> Intergral</td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "PIDH_DGAIN") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PID Heat dGain</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="PIDH_dGain" size="6" value="'.$f[1].'"> Derivative</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
- if ($f[0] == "PIDH_IDLERANGE") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
- $outstr .= ' <td class="editname">Heater Idle Range</td>'.PHP_EOL;
- $outstr .= ' <td class="editfield"><input type="text" name="PIDH_idleRange" size="6" value="'.$f[1].'"> °C (Heater margin)</td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
- }
if ($f[0] == "COOLER_ADDRESS") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Cooler Switch Address</td>'.PHP_EOL;
@@ -505,10 +536,10 @@
}
}
$outstr .= ' </select></td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "COOLER_DELAY") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $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].'"> seconds (0..720)</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
@@ -517,16 +548,22 @@
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Cooler domoticz idx</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="CoolerIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "PIDC_IMAX") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PID Cool Maximum</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="PIDC_iMax" size="6" value="'.$f[1].'"> % (1..100)</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
+ if ($f[0] == "PIDC_IDLERANGE") {
+ $outstr .= ' <tr class="editor">'.PHP_EOL;
+ $outstr .= ' <td class="editname">Cooler Idle Range</td>'.PHP_EOL;
+ $outstr .= ' <td class="editfield"><input type="text" name="PIDC_idleRange" size="6" value="'.$f[1].'"> °C (Cooler margin)</td>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
+ }
if ($f[0] == "PIDC_PGAIN") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PID Cool pGain</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="PIDC_pGain" size="6" value="'.$f[1].'"> Proportional</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
@@ -535,20 +572,14 @@
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PID Cool iGain</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="PIDC_iGain" size="6" value="'.$f[1].'"> Intergral</td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "PIDC_DGAIN") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PID Cool dGain</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="PIDC_dGain" size="6" value="'.$f[1].'"> Derivative</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
- if ($f[0] == "PIDC_IDLERANGE") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
- $outstr .= ' <td class="editname">Cooler Idle Range</td>'.PHP_EOL;
- $outstr .= ' <td class="editfield"><input type="text" name="PIDC_idleRange" size="6" value="'.$f[1].'"> °C (Cooler margin)</td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
- }
if ($f[0] == "FAN_ADDRESS") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Fan Switch Address</td>'.PHP_EOL;
@@ -568,10 +599,10 @@
}
}
$outstr .= ' </select></td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "FAN_DELAY") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Fan Switch Delay</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="FanDelay" size="5" value="'.$f[1].'"> seconds (0..720)</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
@@ -579,7 +610,7 @@
if ($f[0] == "FAN_IDX") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Fan domoticz idx</td>'.PHP_EOL;
- $outstr .= ' <td class="editfield"><input type="text" name="FanIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
+ $outstr .= ' <td colspan="3" class="editfield"><input type="text" name="FanIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "LIGHT_ADDRESS") {
@@ -601,10 +632,10 @@
}
}
$outstr .= ' </select></td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "LIGHT_DELAY") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $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].'"> seconds (0..720)</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
@@ -612,7 +643,7 @@
if ($f[0] == "LIGHT_IDX") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Light domoticz idx</td>'.PHP_EOL;
- $outstr .= ' <td class="editfield"><input type="text" name="LightIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
+ $outstr .= ' <td colspan="3" class="editfield"><input type="text" name="LightIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "DOOR_ADDRESS") {
@@ -634,10 +665,10 @@
}
}
$outstr .= ' </select></td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "DOOR_IDX") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Door domoticz idx</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="DoorIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
@@ -661,10 +692,10 @@
}
}
$outstr .= ' </select></td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "PSU_IDX") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PSU domoticz idx</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="PSUIdx" size="5" value="'.$f[1].'"></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
@@ -673,10 +704,10 @@
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Min. temp setting</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="TempSetMin" size="5" value="'.$f[1].'"> °C</td>'.PHP_EOL;
- $outstr .= ' </tr>'.PHP_EOL;
+// $outstr .= ' </tr>'.PHP_EOL;
}
if ($f[0] == "TEMP_SET_MAX") {
- $outstr .= ' <tr class="editor">'.PHP_EOL;
+// $outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Max. temp setting</td>'.PHP_EOL;
$outstr .= ' <td class="editfield"><input type="text" name="TempSetMax" size="5" value="'.$f[1].'"> °C</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
@@ -686,7 +717,7 @@
}
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname"><input type="submit" value="Save" name="key"></td>'.PHP_EOL;
- $outstr .= ' <td class="editfield"><input type="submit" value="Cancel" name="key">';
+ $outstr .= ' <td colspan="3" class="editfield"><input type="submit" value="Cancel" name="key">';
$outstr .= '<input type="submit" value="Delete" name="key" style="margin-left: 100px;">';
$outstr .= '<input type="hidden" value="testdata" name="action">';
$outstr .= '<input type="hidden" value="'.$command.'" name="command">';
@@ -779,6 +810,8 @@
$outstr .= '<input type="hidden" value="0" name="AirIdx">';
$outstr .= '<input type="hidden" value="" name="BeerAddress">';
$outstr .= '<input type="hidden" value="0" name="BeerIdx">';
+ $outstr .= '<input type="hidden" value="" name="ChillerAddress">';
+ $outstr .= '<input type="hidden" value="0" name="ChillerIdx">';
$outstr .= '<input type="hidden" value="" name="HeaterAddress">';
$outstr .= '<input type="hidden" value="20" name="HeaterDelay">';
$outstr .= '<input type="hidden" value="0" name="HeaterIdx">';