meshtastic 0.0.30 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b134e7c284e1fe0a79c3c49b2079d04c6c9688d2960a6f3101a259a21e93cda
-  data.tar.gz: cb282a94ffe80115beb6246d967b529a110adb0ab729d656649285eab4b67513
+  metadata.gz: 1a810ada159c4d2bed444d0ef5e123a2959caec545ade37307ad621b885cb92f
+  data.tar.gz: 00c1c0e5aceb9a75c009af4aedd730918f6d5a8c6acca8fc1df589a357df4510
 SHA512:
-  metadata.gz: 0516e43e2568a890adf39af3253e63c32b5e1d8a7357ba40b1c993963894ad94bb6a27a4a8176ff58ab06248810739c18f54eff4cf13e18e7e175ec9a5bf853a
-  data.tar.gz: 7319688485fadcf5d0085d2d04647d93e0dd062453030478a9df8197222be2c8c463f68da4d09d5c9727cfd1932912b7712e39b1e901abb6c48c5ee5c7c14530
+  metadata.gz: 9c01f0484f9b9da94d50c7d2f964eeffb9cb374e9993955337502081bcefab8af2a85a692fcb58ed6a2a2981528effd8189faf9f105eda3cb81b60704a60f492
+  data.tar.gz: 940d4174955651ede2eb5938314076a0702ee4ff7eb2c2b56eae491704d7d691ece5c41bbb248cac35ff385d6df48029af3fa8d556c66e11bf09d38db0cb8698

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
@@ -146,15 +148,16 @@ module Meshtastic
             when :NEIGHBORINFO_APP
               pb_obj = Meshtastic::NeighborInfo.decode(payload)
             when :NODEINFO_APP
-              pb_obj = Meshtastic::NodeInfo.decode(payload)
+              pb_obj = Meshtastic::User.decode(payload)
             when :PAXCOUNTER_APP
               pb_obj = Meshtastic::Paxcount.decode(payload)
             when :POSITION_APP
               pb_obj = Meshtastic::Position.decode(payload)
               # when :PRIVATE_APP
               # pb_obj = Meshtastic::Private.decode(payload)
-              # when :RANGE_TEST_APP
-              # pb_obj = Meshtastic::RangeTest.decode(payload)
+            when :RANGE_TEST_APP
+              # Unsure if this is the correct protobuf object
+              pb_obj = Meshtastic::FromRadio.decode(payload)
             when :REMOTE_HARDWARE_APP
               pb_obj = Meshtastic::HardwareMessage.decode(payload)
               # when :REPLY_APP
@@ -163,22 +166,20 @@ module Meshtastic
               pb_obj = Meshtastic::Routing.decode(payload)
             when :SERIAL_APP
               pb_obj = Meshtastic::SerialConnectionStatus.decode(payload)
-              # when :SIMULATOR_APP
-              # pb_obj = Meshtastic::Simulator.decode(payload)
+            when :SIMULATOR_APP
+              pb_obj = Meshtastic::Compressed.decode(payload)
             when :STORE_FORWARD_APP
               pb_obj = Meshtastic::StoreAndForward.decode(payload)
             when :TEXT_MESSAGE_APP
+              # Unsure if this is the correct protobuf object
               pb_obj = Meshtastic::MqttClientProxyMessage.decode(payload)
             when :TEXT_MESSAGE_COMPRESSED_APP
+              # Unsure if this is the correct protobuf object
               pb_obj = Meshtastic::Compressed.decode(payload)
             when :TELEMETRY_APP
               pb_obj = Meshtastic::Telemetry.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
@@ -192,7 +193,8 @@ module Meshtastic
             # 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)
+               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
@@ -301,7 +303,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.30'
+  VERSION = '0.0.32'
 end

metadata

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