meshtastic 0.0.29 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53abe45ca69e2d962a54c1a6b7253cb0d1b9ccbac50cb17732d35c27171833f5
-  data.tar.gz: 3b394df70c866f209cdc723f888b80eaca04d99169db197ba2c5f0d2116917c0
+  metadata.gz: c29f11f50b242a0557b383c1fb5d0302b65369875a3b7bf6850e2b4d18d37024
+  data.tar.gz: 8d6592149ce03f4dec19924c2c23fcae0d15a80acd44d565f9fec9c3f6565e88
 SHA512:
-  metadata.gz: a9230cc0e5170ba34f11a743533fefeeb2cdfb7a1441cab4246e3b2b822569ed1c680a999859dbb2ec0097c5e040fe1efc85f0087f642bc473d85961e6ac3f0f
-  data.tar.gz: a019b8ccd299fe271ebe984b95de20b90f295df7aab24c773cd18b2bd6554526371db230aa274221a0f96f67192c301de91ce56e4f7b0b6a1bfbb53429ed3ecd
+  metadata.gz: 2d9d04eee129e4ae7079c4c4797ec258748424beec4f144c9a7a722f537c9e9eed4d1c2ac11c26df73cc51be7ca1548e28982cac59494507a18be51fb2bf270c
+  data.tar.gz: 2786119cf83aac960dc378c8c86f776254057e6e2968436f818fe568fa91495e3df5824003868904d6442a2a5573d41c1a9ee70d753f61eebb665f6bd476c8f0

data/lib/meshtastic/mqtt.rb

@@ -51,7 +51,8 @@ module Meshtastic
     #   psk: 'optional - channel pre-shared key (default: AQ==)',
     #   qos: 'optional - quality of service (default: 0)',
     #   json: 'optional - JSON output (default: false)',
-    #   filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)'
+    #   filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)',
+    #   gps_metadata: 'optional - include GPS metadata in output (default: false)'
     # )
 
     public_class_method def self.subscribe(opts = {})
@@ -63,6 +64,7 @@ module Meshtastic
       qos = opts[:qos] ||= 0
       json = opts[:json] ||= false
       filter = opts[:filter]
+      gps_metadata = opts[:gps_metadata] ||= false
 
       # TODO: Find JSON URI for this
       full_topic = "#{root_topic}/#{region}/2/json/#{channel}/#" if json
@@ -131,77 +133,77 @@ module Meshtastic
             case msg_type
             when :ADMIN_APP
               pb_obj = Meshtastic::AdminMessage.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
             when :ATAK_FORWARDER, :ATAK_PLUGIN
               pb_obj = Meshtastic::TAKPacket.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
               # when :AUDIO_APP
               # pb_obj = Meshtastic::Audio.decode(payload)
-              # when :DETECTION_SENSOR_APP
-              # pb_obj = Meshtastic::DetectionSensor.decode(payload)
+            when :DETECTION_SENSOR_APP
+              pb_obj = Meshtastic::DeviceState.decode(payload)
               # when :IP_TUNNEL_APP
               # pb_obj = Meshtastic::IpTunnel.decode(payload)
             when :MAP_REPORT_APP
               pb_obj = Meshtastic::MapReport.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
               # when :MAX
               # pb_obj = Meshtastic::Max.decode(payload)
             when :NEIGHBORINFO_APP
               pb_obj = Meshtastic::NeighborInfo.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
             when :NODEINFO_APP
               pb_obj = Meshtastic::NodeInfo.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
             when :PAXCOUNTER_APP
               pb_obj = Meshtastic::Paxcount.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
             when :POSITION_APP
               pb_obj = Meshtastic::Position.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
-              latitude = pb_obj.to_h[:latitude_i] * 0.0000001
-              longitude = pb_obj.to_h[:longitude_i] * 0.0000001
-              message[:decoded][:payload][:gps_metadata] = gps_search(lat: latitude, lon: longitude).first.data
               # when :PRIVATE_APP
               # pb_obj = Meshtastic::Private.decode(payload)
               # when :RANGE_TEST_APP
               # pb_obj = Meshtastic::RangeTest.decode(payload)
             when :REMOTE_HARDWARE_APP
               pb_obj = Meshtastic::HardwareMessage.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
               # when :REPLY_APP
               # pb_obj = Meshtastic::Reply.decode(payload)
             when :ROUTING_APP
               pb_obj = Meshtastic::Routing.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
             when :SERIAL_APP
               pb_obj = Meshtastic::SerialConnectionStatus.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
               # when :SIMULATOR_APP
               # pb_obj = Meshtastic::Simulator.decode(payload)
             when :STORE_FORWARD_APP
               pb_obj = Meshtastic::StoreAndForward.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
-              # when :TEXT_MESSAGE_APP
-              # pb_obj = Meshtastic::TextMessage.decode(payload)
+            when :TEXT_MESSAGE_APP
+              pb_obj = Meshtastic::MqttClientProxyMessage.decode(payload)
             when :TEXT_MESSAGE_COMPRESSED_APP
               pb_obj = Meshtastic::Compressed.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
             when :TELEMETRY_APP
               pb_obj = Meshtastic::Telemetry.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
-              # when :TRACEROUTE_APP
-              # pb_obj = Meshtastic::Traceroute.decode(payload)
+            when :TRACEROUTE_APP
+              pb_obj = Meshtastic::RouteDiscovery.decode(payload)
+              # message[:decoded][:payload] = pb_obj.to_h
+              # pb_obj.to_h[:route].each_with_index do |route, index|
+              #   message[:decoded][:payload][:route][index] = route.to_s(16)
+              # end
               # when :UNKNOWN_APP
               # pb_obj = Meshtastic.Unknown.decode(payload)
             when :WAYPOINT_APP
               pb_obj = Meshtastic::Waypoint.decode(payload)
-              message[:decoded][:payload] = pb_obj.to_h
               # when :ZPS_APP
               # pb_obj = Meshtastic::Zps.decode(payload)
             else
               puts "WARNING: Unknown message type: #{msg_type}"
             end
             # Overwrite the payload with the decoded protobuf object
+            # message[:decoded][:payload] = pb_obj.to_h unless msg_type == :TRACEROUTE_APP
+            message[:decoded][:payload] = pb_obj.to_h
+            if message[:decoded][:payload].keys.include?(:latitude_i) &&
+               message[:decoded][:payload].keys.include?(:longitude_i) &&
+               gps_metadata
+
+              latitude = pb_obj.to_h[:latitude_i] * 0.0000001
+              longitude = pb_obj.to_h[:longitude_i] * 0.0000001
+              message[:decoded][:payload][:gps_metadata] = gps_search(
+                lat: latitude,
+                lon: longitude
+              ).first.data
+            end
             # puts pb_obj.public_methods
             # message[:decoded][:pb_obj] = pb_obj
           end
@@ -302,7 +304,8 @@ module Meshtastic
           psk: 'optional - channel pre-shared key (default: AQ==)',
           qos: 'optional - quality of service (default: 0)',
           json: 'optional - JSON output (default: false)',
-          filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)'
+          filter: 'optional - comma-delimited string(s) to filter on in message (default: nil)',
+          gps_metadata: 'optional - include GPS metadata in output (default: false)'
         )
 
         #{self}.gps_search(

data/lib/meshtastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Meshtastic
-  VERSION = '0.0.29'
+  VERSION = '0.0.31'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.31
 platform: ruby
 authors:
 - 0day Inc.