github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-14 10:46:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

new: gps.new event now reports GPS data changes as they occur (fixes #878)

Browse source
This commit is contained in:
Simone Margaritelli 2021-05-11 12:02:26 +02:00
commit 8c00207e7e
4 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/gps/gps.go
View file

@ -138,16 +138,7 @@ func (mod *GPS) readFromSerial() {
if line, err := mod.readLine(); err == nil {
if s, err := nmea.Parse(line); err == nil {
// http://aprs.gids.nl/nmea/#gga
if m, ok := s.(nmea.GNGGA); ok {
mod.Session.GPS.Updated = time.Now()
mod.Session.GPS.Latitude = m.Latitude
mod.Session.GPS.Longitude = m.Longitude
mod.Session.GPS.FixQuality = m.FixQuality
mod.Session.GPS.NumSatellites = m.NumSatellites
mod.Session.GPS.HDOP = m.HDOP
mod.Session.GPS.Altitude = m.Altitude
mod.Session.GPS.Separation = m.Separation
} else if m, ok := s.(nmea.GPGGA); ok {
if m, ok := s.(nmea.GGA); ok {
mod.Session.GPS.Updated = time.Now()
mod.Session.GPS.Latitude = m.Latitude
mod.Session.GPS.Longitude = m.Longitude
@ -156,6 +147,8 @@ func (mod *GPS) readFromSerial() {
mod.Session.GPS.HDOP = m.HDOP
mod.Session.GPS.Altitude = m.Altitude
mod.Session.GPS.Separation = m.Separation
mod.Session.Events.Add("gps.new", mod.Session.GPS)
}
} else {
mod.Debug("error parsing line '%s': %s", line, err)
@ -173,6 +166,8 @@ func (mod *GPS) runFromGPSD() {
mod.Session.GPS.Longitude = report.Lon
mod.Session.GPS.FixQuality = ModeInfo[report.Mode]
mod.Session.GPS.Altitude = report.Alt
mod.Session.Events.Add("gps.new", mod.Session.GPS)
})
mod.gpsd.Subscribe("SKY", func(r interface{}) {