meshtastic 0.0.29 → 0.0.30
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/meshtastic/mqtt.rb +22 -23
- data/lib/meshtastic/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0b134e7c284e1fe0a79c3c49b2079d04c6c9688d2960a6f3101a259a21e93cda
|
4
|
+
data.tar.gz: cb282a94ffe80115beb6246d967b529a110adb0ab729d656649285eab4b67513
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0516e43e2568a890adf39af3253e63c32b5e1d8a7357ba40b1c993963894ad94bb6a27a4a8176ff58ab06248810739c18f54eff4cf13e18e7e175ec9a5bf853a
|
7
|
+
data.tar.gz: 7319688485fadcf5d0085d2d04647d93e0dd062453030478a9df8197222be2c8c463f68da4d09d5c9727cfd1932912b7712e39b1e901abb6c48c5ee5c7c14530
|
data/lib/meshtastic/mqtt.rb
CHANGED
@@ -131,77 +131,76 @@ module Meshtastic
|
|
131
131
|
case msg_type
|
132
132
|
when :ADMIN_APP
|
133
133
|
pb_obj = Meshtastic::AdminMessage.decode(payload)
|
134
|
-
message[:decoded][:payload] = pb_obj.to_h
|
135
134
|
when :ATAK_FORWARDER, :ATAK_PLUGIN
|
136
135
|
pb_obj = Meshtastic::TAKPacket.decode(payload)
|
137
|
-
message[:decoded][:payload] = pb_obj.to_h
|
138
136
|
# when :AUDIO_APP
|
139
137
|
# pb_obj = Meshtastic::Audio.decode(payload)
|
140
|
-
|
141
|
-
|
138
|
+
when :DETECTION_SENSOR_APP
|
139
|
+
pb_obj = Meshtastic::DeviceState.decode(payload)
|
142
140
|
# when :IP_TUNNEL_APP
|
143
141
|
# pb_obj = Meshtastic::IpTunnel.decode(payload)
|
144
142
|
when :MAP_REPORT_APP
|
145
143
|
pb_obj = Meshtastic::MapReport.decode(payload)
|
146
|
-
message[:decoded][:payload] = pb_obj.to_h
|
147
144
|
# when :MAX
|
148
145
|
# pb_obj = Meshtastic::Max.decode(payload)
|
149
146
|
when :NEIGHBORINFO_APP
|
150
147
|
pb_obj = Meshtastic::NeighborInfo.decode(payload)
|
151
|
-
message[:decoded][:payload] = pb_obj.to_h
|
152
148
|
when :NODEINFO_APP
|
153
149
|
pb_obj = Meshtastic::NodeInfo.decode(payload)
|
154
|
-
message[:decoded][:payload] = pb_obj.to_h
|
155
150
|
when :PAXCOUNTER_APP
|
156
151
|
pb_obj = Meshtastic::Paxcount.decode(payload)
|
157
|
-
message[:decoded][:payload] = pb_obj.to_h
|
158
152
|
when :POSITION_APP
|
159
153
|
pb_obj = Meshtastic::Position.decode(payload)
|
160
|
-
message[:decoded][:payload] = pb_obj.to_h
|
161
|
-
latitude = pb_obj.to_h[:latitude_i] * 0.0000001
|
162
|
-
longitude = pb_obj.to_h[:longitude_i] * 0.0000001
|
163
|
-
message[:decoded][:payload][:gps_metadata] = gps_search(lat: latitude, lon: longitude).first.data
|
164
154
|
# when :PRIVATE_APP
|
165
155
|
# pb_obj = Meshtastic::Private.decode(payload)
|
166
156
|
# when :RANGE_TEST_APP
|
167
157
|
# pb_obj = Meshtastic::RangeTest.decode(payload)
|
168
158
|
when :REMOTE_HARDWARE_APP
|
169
159
|
pb_obj = Meshtastic::HardwareMessage.decode(payload)
|
170
|
-
message[:decoded][:payload] = pb_obj.to_h
|
171
160
|
# when :REPLY_APP
|
172
161
|
# pb_obj = Meshtastic::Reply.decode(payload)
|
173
162
|
when :ROUTING_APP
|
174
163
|
pb_obj = Meshtastic::Routing.decode(payload)
|
175
|
-
message[:decoded][:payload] = pb_obj.to_h
|
176
164
|
when :SERIAL_APP
|
177
165
|
pb_obj = Meshtastic::SerialConnectionStatus.decode(payload)
|
178
|
-
message[:decoded][:payload] = pb_obj.to_h
|
179
166
|
# when :SIMULATOR_APP
|
180
167
|
# pb_obj = Meshtastic::Simulator.decode(payload)
|
181
168
|
when :STORE_FORWARD_APP
|
182
169
|
pb_obj = Meshtastic::StoreAndForward.decode(payload)
|
183
|
-
|
184
|
-
|
185
|
-
# pb_obj = Meshtastic::TextMessage.decode(payload)
|
170
|
+
when :TEXT_MESSAGE_APP
|
171
|
+
pb_obj = Meshtastic::MqttClientProxyMessage.decode(payload)
|
186
172
|
when :TEXT_MESSAGE_COMPRESSED_APP
|
187
173
|
pb_obj = Meshtastic::Compressed.decode(payload)
|
188
|
-
message[:decoded][:payload] = pb_obj.to_h
|
189
174
|
when :TELEMETRY_APP
|
190
175
|
pb_obj = Meshtastic::Telemetry.decode(payload)
|
191
|
-
|
192
|
-
|
193
|
-
#
|
176
|
+
when :TRACEROUTE_APP
|
177
|
+
pb_obj = Meshtastic::RouteDiscovery.decode(payload)
|
178
|
+
# message[:decoded][:payload] = pb_obj.to_h
|
179
|
+
# pb_obj.to_h[:route].each_with_index do |route, index|
|
180
|
+
# message[:decoded][:payload][:route][index] = route.to_s(16)
|
181
|
+
# end
|
194
182
|
# when :UNKNOWN_APP
|
195
183
|
# pb_obj = Meshtastic.Unknown.decode(payload)
|
196
184
|
when :WAYPOINT_APP
|
197
185
|
pb_obj = Meshtastic::Waypoint.decode(payload)
|
198
|
-
message[:decoded][:payload] = pb_obj.to_h
|
199
186
|
# when :ZPS_APP
|
200
187
|
# pb_obj = Meshtastic::Zps.decode(payload)
|
201
188
|
else
|
202
189
|
puts "WARNING: Unknown message type: #{msg_type}"
|
203
190
|
end
|
204
191
|
# Overwrite the payload with the decoded protobuf object
|
192
|
+
# message[:decoded][:payload] = pb_obj.to_h unless msg_type == :TRACEROUTE_APP
|
193
|
+
message[:decoded][:payload] = pb_obj.to_h
|
194
|
+
if message[:decoded][:payload].keys.include?(:latitude_i) &&
|
195
|
+
message[:decoded][:payload].keys.include?(:longitude_i)
|
196
|
+
|
197
|
+
latitude = pb_obj.to_h[:latitude_i] * 0.0000001
|
198
|
+
longitude = pb_obj.to_h[:longitude_i] * 0.0000001
|
199
|
+
message[:decoded][:payload][:gps_metadata] = gps_search(
|
200
|
+
lat: latitude,
|
201
|
+
lon: longitude
|
202
|
+
).first.data
|
203
|
+
end
|
205
204
|
# puts pb_obj.public_methods
|
206
205
|
# message[:decoded][:pb_obj] = pb_obj
|
207
206
|
end
|
data/lib/meshtastic/version.rb
CHANGED