Thu, 26 Mar 2015 20:55:43 +0100
Added device direction and value in devices maintenance screen
thermferm/server.c | file | annotate | diff | comparison | revisions | |
www-thermferm/devices.php | file | annotate | diff | comparison | revisions |
--- a/thermferm/server.c Thu Mar 26 20:34:53 2015 +0100 +++ b/thermferm/server.c Thu Mar 26 20:55:43 2015 +0100 @@ -575,7 +575,8 @@ if (strcmp(opt, (char *)"LIST") == 0) { srv_send((char *)"212 Devices list follows:"); for (device = Config.devices; device; device = device->next) { - srv_send((char *)"%s,%s,%d,%d,%s,%s", device->uuid, device->address, device->subdevice, device->inuse, device->comment, DEVDIR[device->direction]); + srv_send((char *)"%s,%s,%d,%d,%s,%s,%d", device->uuid, device->address, device->subdevice, + device->inuse, device->comment, DEVDIR[device->direction], device->value + device->offset); } srv_send((char *)"."); return 1;
--- a/www-thermferm/devices.php Thu Mar 26 20:34:53 2015 +0100 +++ b/www-thermferm/devices.php Thu Mar 26 20:55:43 2015 +0100 @@ -473,9 +473,11 @@ $outstr .= ' <tr class="trhead">'.PHP_EOL; $outstr .= ' <td class="setup" style="width: 300px;">UUID</td>'.PHP_EOL; $outstr .= ' <td class="setup" style="width: 120px;">Address</td>'.PHP_EOL; - $outstr .= ' <td class="setup" style="width: 30px;">Sub</td>'.PHP_EOL; - $outstr .= ' <td class="setup" style="width: 30px;">Ref</td>'.PHP_EOL; - $outstr .= ' <td class="setup" style="width: 300px;">Cmt</td>'.PHP_EOL; + $outstr .= ' <td class="setup" style="width: 25px;">Sub</td>'.PHP_EOL; + $outstr .= ' <td class="setup" style="width: 25px;">Ref</td>'.PHP_EOL; + $outstr .= ' <td class="setup" style="width: 200px;">Cmt</td>'.PHP_EOL; + $outstr .= ' <td class="setup" style="width: 70px;">Dir</td>'.PHP_EOL; + $outstr .= ' <td class="setup" style="width: 70px;">Val</td>'.PHP_EOL; $outstr .= ' <td class="setup" style="width: 35px;">Edit</td>'.PHP_EOL; $outstr .= ' </tr>'.PHP_EOL; @@ -491,6 +493,8 @@ $outstr .= ' <td class="setup">'.$f[2].'</td>'.PHP_EOL; $outstr .= ' <td class="setup">'.$f[3].'</td>'.PHP_EOL; $outstr .= ' <td class="setup">'.$f[4].'</td>'.PHP_EOL; + $outstr .= ' <td class="setup">'.$f[5].'</td>'.PHP_EOL; + $outstr .= ' <td class="setup">'.$f[6].'</td>'.PHP_EOL; if ($f[3] == 0) $outstr .= ' <td class="setup"><a href="devices.php?action=edit&UUID='.$f[0].'">Edit</a></td>'.PHP_EOL; else