# HG changeset patch # User Michiel Broek # Date 1408533010 -7200 # Node ID b29f80afaeac7b27fd1f61c2682adfb4bd26fa29 # Parent 7b6abc0dd1c6ea8b53f29880be7aad1a86439026 Units editor uses array commands diff -r 7b6abc0dd1c6 -r b29f80afaeac www-thermferm/units.php --- a/www-thermferm/units.php Wed Aug 20 13:02:12 2014 +0200 +++ b/www-thermferm/units.php Wed Aug 20 13:10:10 2014 +0200 @@ -89,46 +89,21 @@ } if ($_POST['key'] == 'Save') { - $sock = open_socket(); - if ($sock != false) { - /* - * Send command and absorb the result. - */ - socket_write($sock, "UNIT PUT ".$_POST['UUID'], 4096); - usleep(20000); - socket_write($sock, "NAME,".$_POST['Name'], 4096); - usleep(20000); - socket_write($sock, "VOLUME,".$_POST['Volume'], 4096); - usleep(20000); - socket_write($sock, "AIR_ADDRESS,".$_POST['AirAddress'], 4096); - usleep(20000); - socket_write($sock, "BEER_ADDRESS,".$_POST['BeerAddress'], 4096); - usleep(20000); - socket_write($sock, "HEATER_ADDRESS,".$_POST['HeaterAddress'], 4096); - usleep(20000); - socket_write($sock, "COOLER_ADDRESS,".$_POST['CoolerAddress'], 4096); - usleep(20000); - socket_write($sock, "FAN_ADDRESS,".$_POST['FanAddress'], 4096); - usleep(20000); - socket_write($sock, "DOOR_ADDRESS,".$_POST['DoorAddress'], 4096); - usleep(20000); - socket_write($sock, "TEMP_SET_MIN,".$_POST['TempSetMin'], 4096); - usleep(20000); - socket_write($sock, "TEMP_SET_MAX,".$_POST['TempSetMax'], 4096); - usleep(20000); - socket_write($sock, "IDLE_RANGE_L,".$_POST['IdleRangeL'], 4096); - usleep(20000); - socket_write($sock, "IDLE_RANGE_H,".$_POST['IdleRangeH'], 4096); - usleep(20000); - - socket_write($sock, ".", 4096); - while (1) { - $line = socket_read($sock, 4096); - if ($line === '') - break; - } - socket_close($sock); - } + $cmd = array("UNIT PUT ".$_POST['UUID']); + $cmd[] = "NAME,".$_POST['Name']; + $cmd[] = "VOLUME,".$_POST['Volume']; + $cmd[] = "AIR_ADDRESS,".$_POST['AirAddress']; + $cmd[] = "BEER_ADDRESS,".$_POST['BeerAddress']; + $cmd[] = "HEATER_ADDRESS,".$_POST['HeaterAddress']; + $cmd[] = "COOLER_ADDRESS,".$_POST['CoolerAddress']; + $cmd[] = "FAN_ADDRESS,".$_POST['FanAddress']; + $cmd[] = "DOOR_ADDRESS,".$_POST['DoorAddress']; + $cmd[] = "TEMP_SET_MIN,".$_POST['TempSetMin']; + $cmd[] = "TEMP_SET_MAX,".$_POST['TempSetMax']; + $cmd[] = "IDLE_RANGE_L,".$_POST['IdleRangeL']; + $cmd[] = "IDLE_RANGE_H,".$_POST['IdleRangeH']; + $cmd[] = "."; + send_array($cmd); } unset($_POST['UUID']); @@ -136,6 +111,16 @@ unset($_POST['Volume']); unset($_POST['key']); unset($_POST['command']); + unset($_POST['AirAddress']); + unset($_POST['BeerAddress']); + unset($_POST['HeaterAddress']); + unset($_POST['CoolerAddress']); + unset($_POST['FanAddress']); + unset($_POST['DoorAddress']); + unset($_POST['TempSetMin']); + unset($_POST['TempSetMax']); + unset($_POST['IdleRangeL']); + unset($_POST['IdleRangeH']); load('units.php'); }