mudhorn/meshmap.net
1
0
Fork 0
mirror of https://github.com/brianshea2/meshmap.net.git synced 2024-11-12 16:44:19 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

collect altitude from position and map report messages

Browse source
This commit is contained in:
root 2024-08-18 22:14:17 +00:00
parent da626616b2
commit 3e5f76a5ca
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/meshobserv/meshobserv.go
View file

@ -20,8 +20,8 @@ import (
const ( const (
NodeExpiration = 86400 // 1 day NodeExpiration = 86400 // 1 day
NeighborExpiration = 7200 // 2 hr NeighborExpiration = 7200 // 2 hr
MetricsExpiration = 7200 // 2 hr MetricsExpiration = 7200 // 2 hr
PruneWriteInterval = time.Minute PruneWriteInterval = time.Minute
) )
@ -44,8 +44,9 @@ func handleMessage(from uint32, topic string, portNum generated.PortNum, payload
} }
latitude := position.GetLatitudeI() latitude := position.GetLatitudeI()
longitude := position.GetLongitudeI() longitude := position.GetLongitudeI()
altitude := position.GetAltitude()
precision := position.GetPrecisionBits() precision := position.GetPrecisionBits()
log.Printf("[msg] %v (%v) %s: (%v, %v) %v/32", from, topic, portNum, latitude, longitude, precision) log.Printf("[msg] %v (%v) %s: (%v, %v, %v) %v/32", from, topic, portNum, latitude, longitude, altitude, precision)
if latitude == 0 && longitude == 0 { if latitude == 0 && longitude == 0 {
return return
} }
@ -53,7 +54,7 @@ func handleMessage(from uint32, topic string, portNum generated.PortNum, payload
if Nodes[from] == nil { if Nodes[from] == nil {
Nodes[from] = meshtastic.NewNode(topic) Nodes[from] = meshtastic.NewNode(topic)
} }
Nodes[from].UpdatePosition(latitude, longitude, precision) Nodes[from].UpdatePosition(latitude, longitude, altitude, precision)
Nodes[from].UpdateSeenBy(topic) Nodes[from].UpdateSeenBy(topic)
NodesMutex.Unlock() NodesMutex.Unlock()
case generated.PortNum_NODEINFO_APP: case generated.PortNum_NODEINFO_APP:
@ -147,12 +148,13 @@ func handleMessage(from uint32, topic string, portNum generated.PortNum, payload
onlineLocalNodes := mapReport.GetNumOnlineLocalNodes() onlineLocalNodes := mapReport.GetNumOnlineLocalNodes()
latitude := mapReport.GetLatitudeI() latitude := mapReport.GetLatitudeI()
longitude := mapReport.GetLongitudeI() longitude := mapReport.GetLongitudeI()
altitude := mapReport.GetAltitude()
precision := mapReport.GetPositionPrecision() precision := mapReport.GetPositionPrecision()
log.Printf( log.Printf(
"[msg] %v (%v) %s: {\"%v\" \"%v\" %v %v %v %v %v %v %v} (%v, %v) %v/32", "[msg] %v (%v) %s: {\"%v\" \"%v\" %v %v %v %v %v %v %v} (%v, %v, %v) %v/32",
from, topic, portNum, from, topic, portNum,
longName, shortName, hwModel, role, fwVersion, region, modemPreset, hasDefaultCh, onlineLocalNodes, longName, shortName, hwModel, role, fwVersion, region, modemPreset, hasDefaultCh, onlineLocalNodes,
latitude, longitude, precision, latitude, longitude, altitude, precision,
) )
if len(longName) == 0 { if len(longName) == 0 {
return return
@ -166,7 +168,7 @@ func handleMessage(from uint32, topic string, portNum generated.PortNum, payload
} }
Nodes[from].UpdateUser(longName, shortName, hwModel, role) Nodes[from].UpdateUser(longName, shortName, hwModel, role)
Nodes[from].UpdateMapReport(fwVersion, region, modemPreset, hasDefaultCh, onlineLocalNodes) Nodes[from].UpdateMapReport(fwVersion, region, modemPreset, hasDefaultCh, onlineLocalNodes)
Nodes[from].UpdatePosition(latitude, longitude, precision) Nodes[from].UpdatePosition(latitude, longitude, altitude, precision)
Nodes[from].UpdateSeenBy(topic) Nodes[from].UpdateSeenBy(topic)
NodesMutex.Unlock() NodesMutex.Unlock()
default: default:

4
internal/meshtastic/node.go
View file

@ -33,6 +33,7 @@ type Node struct {
// Position // Position
Latitude int32 `json:"latitude"` Latitude int32 `json:"latitude"`
Longitude int32 `json:"longitude"` Longitude int32 `json:"longitude"`
Altitude int32 `json:"altitude,omitempty"`
Precision uint32 `json:"precision,omitempty"` Precision uint32 `json:"precision,omitempty"`
// DeviceMetrics // DeviceMetrics
BatteryLevel uint32 `json:"batteryLevel,omitempty"` BatteryLevel uint32 `json:"batteryLevel,omitempty"`
@ -157,9 +158,10 @@ func (node *Node) UpdateNeighborInfo(neighborNum uint32, snr float32) {
} }
} }
func (node *Node) UpdatePosition(latitude, longitude int32, precision uint32) { func (node *Node) UpdatePosition(latitude, longitude, altitude int32, precision uint32) {
node.Latitude = latitude node.Latitude = latitude
node.Longitude = longitude node.Longitude = longitude
node.Altitude = altitude
node.Precision = precision node.Precision = precision
} }