diff -r 173b4480c4a0 -r 2197976f2bc5 www-thermferm/devices.php
--- a/www-thermferm/devices.php Wed Aug 20 12:02:49 2014 +0200
+++ b/www-thermferm/devices.php Wed Aug 20 12:46:31 2014 +0200
@@ -56,29 +56,12 @@
/*
* Device add
*
- * @param string $_POST['Name'] The rpofile name
+ * @param string $_POST['Type'] The device type
+ * @param string $_POST['key'] The pressed key
*/
function device_add() {
-
- if ($_POST['key'] == 'Add') {
-
- $cmd = "DEVICE ADD ".$_POST['Type'];
-
- $sock = open_socket();
- if ($sock != false) {
- /*
- * Send command and absorb the result.
- */
- socket_write($sock, $cmd, 4096);
- while (1) {
- $line = socket_read($sock, 4096);
- if ($line === '')
- break;
- }
- socket_close($sock);
- }
- }
-
+ if ($_POST['key'] == 'Add')
+ send_cmd("DEVICE ADD ".$_POST['Type']);
unset($_POST['UUID']);
unset($_POST['Name']);
unset($_POST['key']);
@@ -113,42 +96,19 @@
}
if ($_POST['key'] == 'Save') {
- $sock = open_socket();
- if ($sock != false) {
- /*
- * Send command and absorb the result.
- */
- socket_write($sock, "DEVICE PUT ".$_POST['UUID'], 4096);
- usleep(20000);
- socket_write($sock, "TYPE,".$_POST['Type'], 4096);
- usleep(20000);
- socket_write($sock, "DIRECTION,".$_POST['Direction'], 4096);
- usleep(20000);
- socket_write($sock, "VALUE,".$_POST['Value'], 4096);
- usleep(20000);
- socket_write($sock, "OFFSET,".$_POST['Offset'], 4096);
- usleep(20000);
- socket_write($sock, "PRESENT,".$_POST['Present'], 4096);
- usleep(20000);
- socket_write($sock, "ADDRESS,".$_POST['Address'], 4096);
- usleep(20000);
- socket_write($sock, "SUBDEVICE,".$_POST['Subdevice'], 4096);
- usleep(20000);
- socket_write($sock, "GPIOPIN,".$_POST['Gpiopin'], 4096);
- usleep(20000);
- socket_write($sock, "DESCRIPTION,".$_POST['Description'], 4096);
- usleep(20000);
- socket_write($sock, "COMMENT,".$_POST['Comment'], 4096);
- usleep(20000);
- socket_write($sock, '.', 4096);
- /* Absorb response */
- while (1) {
- $line = socket_read($sock, 4096);
- if ($line === '')
- break;
- }
- socket_close($sock);
- }
+ $cmd = array("DEVICE PUT ".$_POST['UUID']);
+ $cmd[] = "TYPE,".$_POST['Type'];
+ $cmd[] = "DIRECTION,".$_POST['Direction'];
+ $cmd[] = "VALUE,".$_POST['Value'];
+ $cmd[] = "OFFSET,".$_POST['Offset'];
+ $cmd[] = "PRESENT,".$_POST['Present'];
+ $cmd[] = "ADDRESS,".$_POST['Address'];
+ $cmd[] = "SUBDEVICE,".$_POST['Subdevice'];
+ $cmd[] = "GPIOPIN,".$_POST['Gpiopin'];
+ $cmd[] = "DESCRIPTION,".$_POST['Description'];
+ $cmd[] = "COMMENT,".$_POST['Comment'];
+ $cmd[] = ".";
+ send_array($cmd);
}
unset($_POST['UUID']);
@@ -351,6 +311,14 @@
$se = ($f[1] == "IN_ANALOG")?" selected":"";
$outstr .= ' '.PHP_EOL;
}
+ if ($type == "I2C") {
+ $se = ($f[1] == "UNDEF")?" selected":"";
+ $outstr .= ' '.PHP_EOL;
+ }
+ if ($type == "SPI") {
+ $se = ($f[1] == "UNDEF")?" selected":"";
+ $outstr .= ' '.PHP_EOL;
+ }
$outstr .= ' '.PHP_EOL;
}
$outstr .= ' '.PHP_EOL;