frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Find bitrate and signal level correctly

Browse Source 
Also, display signal level as just a number rather than a graph
This commit is contained in:
Joe Haig 2016-08-15 12:45:37 +00:00
parent f730aa1ffb
commit 66d6f3766c
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
includes/dashboard.php
View File

@ -33,13 +33,13 @@ function DisplayDashboard(){
$strSSID = str_replace( '"','',$result[1] ); $strSSID = str_replace( '"','',$result[1] );
preg_match( '/Access Point: ([0-9a-f:]+)/i',$strWlan0,$result ); preg_match( '/Access Point: ([0-9a-f:]+)/i',$strWlan0,$result );
$strBSSID = $result[1]; $strBSSID = $result[1];
preg_match( '/Bit Rate=([0-9]+ Mb\/s)/i',$strWlan0,$result ); preg_match( '/Bit Rate=([0-9\.]+ Mb\/s)/i',$strWlan0,$result );
$strBitrate = $result[1]; $strBitrate = $result[1];
preg_match( '/Tx-Power=([0-9]+ dBm)/i',$strWlan0,$result ); preg_match( '/Tx-Power=([0-9]+ dBm)/i',$strWlan0,$result );
$strTxPower = $result[1]; $strTxPower = $result[1];
preg_match( '/Link Quality=([0-9]+)/i',$strWlan0,$result ); preg_match( '/Link Quality=([0-9]+)/i',$strWlan0,$result );
$strLinkQuality = $result[1]; $strLinkQuality = $result[1];
preg_match( '/Signal Level=([0-9]+)/i',$strWlan0,$result ); preg_match( '/Signal level=(-?[0-9]+ dBm)/i',$strWlan0,$result );
$strSignalLevel = $result[1]; $strSignalLevel = $result[1];
preg_match('/Frequency:(\d+.\d+ GHz)/i',$strWlan0,$result); preg_match('/Frequency:(\d+.\d+ GHz)/i',$strWlan0,$result);
$strFrequency = $result[1]; $strFrequency = $result[1];
@ -99,6 +99,7 @@ function DisplayDashboard(){
<div class="info-item">Connected To</div> <?php echo $strSSID ?></br> <div class="info-item">Connected To</div> <?php echo $strSSID ?></br>
<div class="info-item">AP Mac Address</div> <?php echo $strBSSID ?></br> <div class="info-item">AP Mac Address</div> <?php echo $strBSSID ?></br>
<div class="info-item">Bitrate</div> <?php echo $strBitrate ?></br> <div class="info-item">Bitrate</div> <?php echo $strBitrate ?></br>
<div class="info-item">Signal Level</div> <?php echo $strSignalLevel ?></br>
<div class="info-item">Transmit Power</div> <?php echo $strTxPower ?></br> <div class="info-item">Transmit Power</div> <?php echo $strTxPower ?></br>
<div class="info-item">Frequency</div> <?php echo $strFrequency ?></br></br> <div class="info-item">Frequency</div> <?php echo $strFrequency ?></br></br>
<div class="info-item">Link Quality</div> <div class="info-item">Link Quality</div>
@ -108,15 +109,7 @@ function DisplayDashboard(){
aria-valuenow="<?php echo $strLinkQuality ?>" aria-valuemin="0" aria-valuemax="100" aria-valuenow="<?php echo $strLinkQuality ?>" aria-valuemin="0" aria-valuemax="100"
style="width: <?php echo $strLinkQuality ?>%;"><?php echo $strLinkQuality ?>% style="width: <?php echo $strLinkQuality ?>%;"><?php echo $strLinkQuality ?>%
</div> </div>
</div> </div>
<div class="info-item">Signal Level</div>
<div class="progress">
<div class="progress-bar progress-bar-info progress-bar-striped active"
role="progressbar"
aria-valuenow="<?php echo $strSignalLevel ?>" aria-valuemin="0" aria-valuemax="100"
style="width: <?php echo $strSignalLevel ?>%;"><?php echo $strSignalLevel ?>%
</div>
</div>
</div><!-- /.panel-body --> </div><!-- /.panel-body -->
</div><!-- /.panel-default --> </div><!-- /.panel-default -->
</div><!-- /.col-md-6 --> </div><!-- /.col-md-6 -->