diff options
| author | jskyboo <jack@ron.local> | 2016-12-29 13:52:51 -0800 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-04 16:16:34 -0200 |
| commit | d6c4d9a01e768a25850395b0482e48f97f22eb73 (patch) | |
| tree | 624035cd3f086b04fd79a0667aa58490164f1bd6 /src/usr/local/www/widgets | |
| parent | 414d27200c0f04c8382d1e7d9965a7ac63e62760 (diff) | |
| download | pfsense-d6c4d9a01e768a25850395b0482e48f97f22eb73.zip pfsense-d6c4d9a01e768a25850395b0482e48f97f22eb73.tar.gz | |
Fix ntp gps status
- trim sat in use
- gps ok for GPGLL
- lat & lon direction for GPGGA & GPGLL
- sat in use text position fixed
(cherry picked from commit fdb0479758339e083f7745d738c9999d86af150f)
Diffstat (limited to 'src/usr/local/www/widgets')
| -rw-r--r-- | src/usr/local/www/widgets/widgets/ntp_status.widget.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/www/widgets/widgets/ntp_status.widget.php b/src/usr/local/www/widgets/widgets/ntp_status.widget.php index 317e43e..cae36f8 100644 --- a/src/usr/local/www/widgets/widgets/ntp_status.widget.php +++ b/src/usr/local/www/widgets/widgets/ntp_status.widget.php @@ -137,11 +137,11 @@ if ($_REQUEST['updateme']) { $gps_lon = $gps_lon * (($gps_vars[5] == "E") ? 1 : -1); $gps_alt = $gps_vars[9]; $gps_alt_unit = $gps_vars[10]; - $gps_sat = $gps_vars[7]; + $gps_sat = (int)$gps_vars[7]; $gps_la = $gps_vars[3]; $gps_lo = $gps_vars[5]; } elseif (substr($tmp, 0, 6) == '$GPGLL') { - $gps_vars = explode(",", $tmp); + $gps_vars = preg_split('/[,\*]+/', $tmp); $gps_ok = ($gps_vars[6] == "A"); $gps_lat_deg = substr($gps_vars[1], 0, 2); $gps_lat_min = substr($gps_vars[1], 2) / 60.0; |
