--- a/www-thermferm/units.php Wed May 31 16:29:52 2017 +0200
+++ b/www-thermferm/units.php Wed Jun 07 23:06:47 2017 +0200
@@ -1,6 +1,6 @@
<?php
/*****************************************************************************
- * Copyright (C) 2014-2015
+ * Copyright (C) 2014-2017
*
* Michiel Broek <mbroek at mbse dot eu>
*
@@ -93,17 +93,25 @@
$cmd[] = "NAME,".$_POST['Name'];
$cmd[] = "VOLUME,".$_POST['Volume'];
$cmd[] = "AIR_ADDRESS,".$_POST['AirAddress'];
+ $cmd[] = "AIR_IDX,".$_POST['AirIdx'];
$cmd[] = "BEER_ADDRESS,".$_POST['BeerAddress'];
+ $cmd[] = "BEER_IDX,".$_POST['BeerIdx'];
$cmd[] = "HEATER_ADDRESS,".$_POST['HeaterAddress'];
$cmd[] = "HEATER_DELAY,".$_POST['HeaterDelay'];
+ $cmd[] = "HEATER_IDX,".$_POST['HeaterIdx'];
$cmd[] = "COOLER_ADDRESS,".$_POST['CoolerAddress'];
$cmd[] = "COOLER_DELAY,".$_POST['CoolerDelay'];
+ $cmd[] = "COOLER_IDX,".$_POST['CoolerIdx'];
$cmd[] = "FAN_ADDRESS,".$_POST['FanAddress'];
$cmd[] = "FAN_DELAY,".$_POST['FanDelay'];
+ $cmd[] = "FAN_IDX,".$_POST['FanIdx'];
$cmd[] = "LIGHT_ADDRESS,".$_POST['LightAddress'];
$cmd[] = "LIGHT_DELAY,".$_POST['LightDelay'];
+ $cmd[] = "LIGHT_IDX,".$_POST['LightIdx'];
$cmd[] = "DOOR_ADDRESS,".$_POST['DoorAddress'];
+ $cmd[] = "DOOR_IDX,".$_POST['DoorIdx'];
$cmd[] = "PSU_ADDRESS,".$_POST['PSUAddress'];
+ $cmd[] = "PSU_IDX,".$_POST['PSUIdx'];
$cmd[] = "TEMP_SET_MIN,".$_POST['TempSetMin'];
$cmd[] = "TEMP_SET_MAX,".$_POST['TempSetMax'];
$cmd[] = "PIDC_IMAX,".$_POST['PIDC_iMax'];
@@ -126,17 +134,25 @@
unset($_POST['key']);
unset($_POST['command']);
unset($_POST['AirAddress']);
+ unset($_POST['AirIdx']);
unset($_POST['BeerAddress']);
+ unset($_POST['BeerIdx']);
unset($_POST['HeaterAddress']);
unset($_POST['HeaterDelay']);
+ unset($_POST['HeaterIdx']);
unset($_POST['CoolerAddress']);
unset($_POST['CoolerDelay']);
+ unset($_POST['CoolerIdx']);
unset($_POST['LightAddress']);
unset($_POST['LightDelay']);
+ unset($_POST['LightIdx']);
unset($_POST['FanAddress']);
unset($_POST['FanDelay']);
+ unset($_POST['FanIdx']);
unset($_POST['DoorAddress']);
+ unset($_POST['DoorIdx']);
unset($_POST['PSUAddress']);
+ unset($_POST['PSUIdx']);
unset($_POST['TempSetMin']);
unset($_POST['TempSetMax']);
unset($_POST['PIDC_iMax']);
@@ -187,7 +203,9 @@
isset($_POST['FanAddress']) && isset($_POST['DoorAddress']) && isset($_POST['TempSetMin']) && isset($_POST['TempSetMax']) &&
isset($_POST['PIDC_pGain']) && isset($_POST['PIDC_iGain']) && isset($_POST['PIDC_dGain']) && isset($_POST['PIDC_idleRange']) &&
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['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['FanDelay']) && isset($_POST['key']) && isset($_POST['command'])) {
if ($_POST['key'] == 'Cancel')
@@ -372,6 +390,12 @@
$outstr .= ' </select></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
+ if ($f[0] == "AIR_IDX") {
+ $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;
+ }
if ($f[0] == "BEER_ADDRESS") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Beer Sensor Address</td>'.PHP_EOL;
@@ -393,6 +417,12 @@
$outstr .= ' </select></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
+ if ($f[0] == "BEER_IDX") {
+ $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] == "HEATER_ADDRESS") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Heater Switch Address</td>'.PHP_EOL;
@@ -420,6 +450,12 @@
$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] == "HEATER_IDX") {
+ $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;
+ }
if ($f[0] == "PIDH_IMAX") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PID Heat Maximum</td>'.PHP_EOL;
@@ -477,6 +513,12 @@
$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] == "COOLER_IDX") {
+ $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;
+ }
if ($f[0] == "PIDC_IMAX") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">PID Cool Maximum</td>'.PHP_EOL;
@@ -534,6 +576,12 @@
$outstr .= ' <td class="editfield"><input type="text" name="FanDelay" size="5" value="'.$f[1].'"> seconds (0..720)</td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
+ 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 .= ' </tr>'.PHP_EOL;
+ }
if ($f[0] == "LIGHT_ADDRESS") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Lights Address</td>'.PHP_EOL;
@@ -561,6 +609,12 @@
$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] == "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 .= ' </tr>'.PHP_EOL;
+ }
if ($f[0] == "DOOR_ADDRESS") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Door Sensor Address</td>'.PHP_EOL;
@@ -582,6 +636,12 @@
$outstr .= ' </select></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
+ if ($f[0] == "DOOR_IDX") {
+ $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;
+ }
if ($f[0] == "PSU_ADDRESS") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Power Supply Sensor Address</td>'.PHP_EOL;
@@ -603,6 +663,12 @@
$outstr .= ' </select></td>'.PHP_EOL;
$outstr .= ' </tr>'.PHP_EOL;
}
+ if ($f[0] == "PSU_IDX") {
+ $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;
+ }
if ($f[0] == "TEMP_SET_MIN") {
$outstr .= ' <tr class="editor">'.PHP_EOL;
$outstr .= ' <td class="editname">Min. temp setting</td>'.PHP_EOL;
@@ -710,17 +776,25 @@
$outstr .= ' <td class="editsub"><input type="submit" value="Add" name="key"></td>'.PHP_EOL;
$outstr .= '<input type="hidden" value="0.0" name="Volume">';
$outstr .= '<input type="hidden" value="" name="AirAddress">';
+ $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="HeaterAddress">';
$outstr .= '<input type="hidden" value="20" name="HeaterDelay">';
+ $outstr .= '<input type="hidden" value="0" name="HeaterIdx">';
$outstr .= '<input type="hidden" value="" name="CoolerAddress">';
$outstr .= '<input type="hidden" value="20" name="CoolerDelay">';
+ $outstr .= '<input type="hidden" value="0" name="CoolerIdx">';
$outstr .= '<input type="hidden" value="" name="FanAddress">';
$outstr .= '<input type="hidden" value="20" name="FanDelay">';
+ $outstr .= '<input type="hidden" value="0" name="FanIdx">';
$outstr .= '<input type="hidden" value="" name="LightAddress">';
$outstr .= '<input type="hidden" value="1" name="LightDelay">';
+ $outstr .= '<input type="hidden" value="0" name="LightIdx">';
$outstr .= '<input type="hidden" value="" name="DoorAddress">';
+ $outstr .= '<input type="hidden" value="0" name="DoorIdx">';
$outstr .= '<input type="hidden" value="" name="PSUAddress">';
+ $outstr .= '<input type="hidden" value="0" name="PSUIdx">';
$outstr .= '<input type="hidden" value="1.0" name="TempSetMin">';
$outstr .= '<input type="hidden" value="30.0" name="TempSetMax">';
$outstr .= '<input type="hidden" value="100" name="PIDC_iMax">';