mudhorn/meshmap.net
1
0
Fork 0
mirror of https://github.com/brianshea2/meshmap.net.git synced 2025-03-05 21:00:01 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: mudhorn:59b76c90871d98fa72b30b1c26ee247f84dbe638
Branches Tags
mudhorn:main
..
compare: mudhorn:da626616b2fb1f52999d24d1b63c7f59af391f92
Branches Tags
mudhorn:main

No commits in common. "59b76c90871d98fa72b30b1c26ee247f84dbe638" and "da626616b2fb1f52999d24d1b63c7f59af391f92" have entirely different histories.
59b76c9087 ... da626616b2

4 changed files with 11 additions and 16 deletions
Show stats 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,9 +44,8 @@ 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) %v/32", from, topic, portNum, latitude, longitude, altitude, precision) log.Printf("[msg] %v (%v) %s: (%v, %v) %v/32", from, topic, portNum, latitude, longitude, precision)
if latitude == 0 && longitude == 0 { if latitude == 0 && longitude == 0 {
return return
} }
@ -54,7 +53,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, altitude, precision) Nodes[from].UpdatePosition(latitude, longitude, precision)
Nodes[from].UpdateSeenBy(topic) Nodes[from].UpdateSeenBy(topic)
NodesMutex.Unlock() NodesMutex.Unlock()
case generated.PortNum_NODEINFO_APP: case generated.PortNum_NODEINFO_APP:
@ -148,13 +147,12 @@ 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) %v/32", "[msg] %v (%v) %s: {\"%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, altitude, precision, latitude, longitude, precision,
) )
if len(longName) == 0 { if len(longName) == 0 {
return return
@ -168,7 +166,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, altitude, precision) Nodes[from].UpdatePosition(latitude, longitude, precision)
Nodes[from].UpdateSeenBy(topic) Nodes[from].UpdateSeenBy(topic)
NodesMutex.Unlock() NodesMutex.Unlock()
default: default:

4
internal/meshtastic/node.go
View file

@ -33,7 +33,6 @@ 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"`
@ -158,10 +157,9 @@ func (node *Node) UpdateNeighborInfo(neighborNum uint32, snr float32) {
} }
} }
func (node *Node) UpdatePosition(latitude, longitude, altitude int32, precision uint32) { func (node *Node) UpdatePosition(latitude, longitude int32, precision uint32) {
node.Latitude = latitude node.Latitude = latitude
node.Longitude = longitude node.Longitude = longitude
node.Altitude = altitude
node.Precision = precision node.Precision = precision
} }

4
patch/remove-nanopb.patch
View file

@ -2,8 +2,8 @@
+++ b/protobufs/meshtastic/deviceonly.proto +++ b/protobufs/meshtastic/deviceonly.proto
@@ -7,14 +7,12 @@ import "meshtastic/localonly.proto"; @@ -7,14 +7,12 @@ import "meshtastic/localonly.proto";
import "meshtastic/mesh.proto"; import "meshtastic/mesh.proto";
import "meshtastic/module_config.proto";
import "meshtastic/telemetry.proto"; import "meshtastic/telemetry.proto";
import "meshtastic/config.proto";
-import "nanopb.proto"; -import "nanopb.proto";
option csharp_namespace = "Meshtastic.Protobufs"; option csharp_namespace = "Meshtastic.Protobufs";
@ -15,7 +15,7 @@
/* /*
@@ -235,7 +233,7 @@ message DeviceState { @@ -191,7 +189,7 @@ message DeviceState {
/* /*
* New lite version of NodeDB to decrease memory footprint * New lite version of NodeDB to decrease memory footprint
*/ */

3
website/index.html
View file

@ -219,7 +219,7 @@
const { const {
longName, shortName, hwModel, role, longName, shortName, hwModel, role,
fwVersion, region, modemPreset, hasDefaultCh, onlineLocalNodes, fwVersion, region, modemPreset, hasDefaultCh, onlineLocalNodes,
latitude, longitude, altitude, precision, latitude, longitude, precision,
batteryLevel, voltage, chUtil, airUtilTx, uptime, batteryLevel, voltage, chUtil, airUtilTx, uptime,
neighbors, seenBy neighbors, seenBy
} = node } = node
@ -246,7 +246,6 @@
${airUtilTx ? `<tr><th>AirUtilTX</th><td>${airUtilTx.toFixed(2)}%</td></tr>` : ''} ${airUtilTx ? `<tr><th>AirUtilTX</th><td>${airUtilTx.toFixed(2)}%</td></tr>` : ''}
${uptime ? `<tr><th>Uptime</th><td>${duration(uptime)}</td></tr>` : ''} ${uptime ? `<tr><th>Uptime</th><td>${duration(uptime)}</td></tr>` : ''}
${onlineLocalNodes ? `<tr><th>Online local nodes</th><td>${onlineLocalNodes}</td></tr>` : ''} ${onlineLocalNodes ? `<tr><th>Online local nodes</th><td>${onlineLocalNodes}</td></tr>` : ''}
${altitude ? `<tr><th>Altitude</th><td>${altitude.toLocaleString()} m above MSL</td></tr>` : ''}
${precision && precisionMargins[precision-1] ? ${precision && precisionMargins[precision-1] ?
`<tr><th>Location precision</th><td>&#177; ${precisionMargins[precision-1].toLocaleString()} m (orange circle)</td></tr>` : '' `<tr><th>Location precision</th><td>&#177; ${precisionMargins[precision-1].toLocaleString()} m (orange circle)</td></tr>` : ''
} }