diff options
| author | yylyyl <yangyiliang@gmail.com> | 2014-09-23 21:48:07 +0800 |
|---|---|---|
| committer | yylyyl <yangyiliang@gmail.com> | 2014-09-23 21:48:07 +0800 |
| commit | ee8a91ebd4f7e919db0fc79df25fa164e4d43eb6 (patch) | |
| tree | aaae5b4c4db0fc0253eebb35078b5543d1bf79d9 | |
| parent | 5de466966718de28d50e84f5e7a6b4560aaf643f (diff) | |
| download | pfsense-packages-ee8a91ebd4f7e919db0fc79df25fa164e4d43eb6.tar.gz pfsense-packages-ee8a91ebd4f7e919db0fc79df25fa164e4d43eb6.tar.bz2 pfsense-packages-ee8a91ebd4f7e919db0fc79df25fa164e4d43eb6.zip | |
lcd2usb doesn't need Device to be specified, also fix traffic display
| -rw-r--r-- | config/lcdproc-dev/lcdproc.inc | 5 | ||||
| -rw-r--r-- | config/lcdproc-dev/lcdproc_client.php | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index 00768cd7..5664461d 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -308,7 +308,8 @@ $config_text .= "[{$lcdproc_config['driver']}]\n"; $config_text .= "driverpath=/usr/local/lib/lcdproc/\n"; $config_text .= "ConnectionType={$lcdproc_config['connection_type']}\n"; - $config_text .= "Device={$realport}\n"; + if($realport != "none") + $config_text .= "Device={$realport}\n"; $config_text .= "Port=0x378\n"; $config_text .= "Speed=0\n"; $config_text .= "Keypad=yes\n"; @@ -502,7 +503,7 @@ EOD; restart_service(LCDPROC_SERVICE_NAME); } } - if((! $lcdproc_config['driver']) || ($lcdproc_config['comport'] == "none")) { + if((! $lcdproc_config['driver']) || (! $lcdproc_config['comport'])) { /* no parameters user does not want lcdproc running */ /* lets stop the service and remove the rc file */ if(file_exists(LCDPROC_RCFILE)) { diff --git a/config/lcdproc-dev/lcdproc_client.php b/config/lcdproc-dev/lcdproc_client.php index 5306c903..922ed14e 100644 --- a/config/lcdproc-dev/lcdproc_client.php +++ b/config/lcdproc-dev/lcdproc_client.php @@ -554,11 +554,11 @@ /* format speed in bits/sec, input: bytes/sec Code from: graph.php ported to PHP*/ if ($speed < 125000) - {return sprintf("%3d.1 Kbps", $speed / 125);} + {return sprintf("%5.1f Kbps", $speed / 125);} if ($speed < 125000000) - {return sprintf("%3d.1 Mbps", $speed / 125000);} + {return sprintf("%5.1f Mbps", $speed / 125000);} // else - return sprintf("%3d.1 Gbps", $speed / 125000000); + return sprintf("%5.1f Gbps", $speed / 125000000); } function add_summary_declaration(&$lcd_cmds, $name) { |