diff -r ba3a2d27d59e -r acd840c9fcc0 www-thermferm/devices.php --- a/www-thermferm/devices.php Thu Mar 26 16:40:53 2015 +0100 +++ b/www-thermferm/devices.php Thu Mar 26 20:34:53 2015 +0100 @@ -1,6 +1,6 @@ * @@ -272,12 +272,22 @@ */ $outstr .= ' '.PHP_EOL; $outstr .= ' Device Type'.PHP_EOL; - if (($type == "W1") || ($type == "GPIO")) + if (($type == "W1") || ($type == "GPIO") || ($type == "SIM")) $outstr .= ' '.$f[1].''.PHP_EOL; else $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; } + if ($f[0] == "ADDRESS") { + $address = $f[1]; + $outstr .= ' '.PHP_EOL; + $outstr .= ' Address'.PHP_EOL; + if (($type == "W1") || ($type == "GPIO")) + $outstr .= ' '.$f[1].''.PHP_EOL; + else + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + } if ($f[0] == "DIRECTION") { $direction = $f[1]; /* @@ -285,9 +295,22 @@ */ $outstr .= ' '.PHP_EOL; $outstr .= ' IO Direction and mode'.PHP_EOL; - if ($type == "W1") - $outstr .= ' '.$f[1].''.PHP_EOL; - else { + if ($type == "W1") { + if ((strncmp($address, "29", 2) == 0) || (strncmp($address, "3a", 2) == 0)) { + $outstr .= ' '.PHP_EOL; + } else { + $outstr .= ' '.$f[1].''.PHP_EOL; + } + } else { $outstr .= ' '.PHP_EOL; } $outstr .= ' '.PHP_EOL; @@ -337,7 +364,7 @@ } if ($f[0] == "OFFSET") { $outstr .= ' '.PHP_EOL; - $outstr .= ' Value'.PHP_EOL; + $outstr .= ' Offset'.PHP_EOL; if ($direction == "IN_ANALOG") $outstr .= ' '.PHP_EOL; else @@ -366,15 +393,6 @@ } $outstr .= ' '.PHP_EOL; } - if ($f[0] == "ADDRESS") { - $outstr .= ' '.PHP_EOL; - $outstr .= ' Address'.PHP_EOL; - if (($type == "W1") || ($type == "GPIO")) - $outstr .= ' '.$f[1].''.PHP_EOL; - else - $outstr .= ' '.PHP_EOL; - $outstr .= ' '.PHP_EOL; - } if ($f[0] == "SUBDEVICE") { $outstr .= ' '.PHP_EOL; $outstr .= ' Subdevice'.PHP_EOL;