meshtastic 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd76d5eb5caa289b389949f752dcdcbe9185dd55db794ceeaa7aeff86342eb9
-  data.tar.gz: 9a941303697050de11c04c2fbcc64ef6cffebd16b1959a3b1e5359b904c7628d
+  metadata.gz: 92ee92f4c1356fc60440b101723abac1c35e33ef757bb74266e8d32a982df2b5
+  data.tar.gz: 3917587b0080996105d5f0c73fee9208f2c89ddf067a13a661d95f58a5fb5f43
 SHA512:
-  metadata.gz: 3af0be5f4930d87b7a4f536417de6429302bd65da11f19ccf843241de0d32b1c72077ab6a4ce2231f237b75669514ee4a237b618e65534884da6f0db619f5f0a
-  data.tar.gz: d560584669d17490e6da18e4169164dce4077f2cbcb8619bca0f5d816b46e4526d2334acaeaeba3cd32b4a5e0494250dbd34fe6994a0baf4e2b066d60289722e
+  metadata.gz: 678c08feb284f83a56bdc43824074621b1a0835de6ecf56757f2129f5ac26277940b4c1cc48b636947dbd8974bc94f872f7169429872c86c9f04f33161cc47c4
+  data.tar.gz: d581f878f32669d5a93a57dc849468669c21939d98b20915cce1c432bb76f1984b6bf9005690c9d581741fbe40a068bd06c5d3e0c7c9356853b6e5808eeccdef

data/README.md

@@ -37,10 +37,11 @@ Meshtastic::MQTT.subscribe(
 ```
 
 This code will print the `from` value of each message received:
+
 ```ruby
 require 'meshtastic'
 mqtt_obj = Meshastic::MQTT.connect
-Meshtastic::MQTT.subscribe( mqtt_obj: mqtt_obj) do |message|
+Meshtastic::MQTT.subscribe(mqtt_obj: mqtt_obj) do |message|
   puts message[:from]
 end
 ```

data/lib/meshtastic/mqtt.rb

@@ -45,6 +45,7 @@ module Meshtastic
     # Supported Method Parameters::
     # Meshtastic::MQQT.subscribe(
     #   mqtt_obj: 'required - mqtt_obj returned from #connect method'
+    #   root_topic: 'optional - root topic (default: msh)',
     #   region: 'optional - region (default: US)',
     #   channel: 'optional - channel name (default: LongFast)',
     #   psk: 'optional - channel pre-shared key (default: AQ==)',
@@ -55,6 +56,7 @@ module Meshtastic
 
     public_class_method def self.subscribe(opts = {})
       mqtt_obj = opts[:mqtt_obj]
+      root_topic = opts[:root_topic] ||= 'msh'
       region = opts[:region] ||= 'US'
       channel = opts[:channel] ||= 'LongFast'
       psk = opts[:psk] ||= 'AQ=='
@@ -63,9 +65,10 @@ module Meshtastic
       filter = opts[:filter]
 
       # TODO: Find JSON URI for this
-      root_topic = "msh/#{region}/2/json" if json
-      root_topic = "msh/#{region}/2/c" unless json
-      mqtt_obj.subscribe("#{root_topic}/#{channel}/#", qos)
+      mqtt_path = "#{root_topic}/#{region}/2/json/#{channel}/#" if json
+      mqtt_path = "#{root_topic}/#{region}/2/c/#{channel}/#" unless json
+      puts "Subscribing to: #{mqtt_path}"
+      mqtt_obj.subscribe(mqtt_path, qos)
 
       # Decrypt the message
       # Our AES key is 128 or 256 bits, shared as part of the 'Channel' specification.
@@ -131,16 +134,19 @@ module Meshtastic
           next
         ensure
           if disp
-            puts "\n"
-            puts '-' * 80
-            puts "*** DEBUGGING ***"
-            puts "MSG:\n#{message.inspect}"
-            # puts "\nMap Report: #{map_report.inspect}"
-            puts "\nRaw Packet: #{raw_packet.inspect}"
-            puts "Length: #{raw_packet_len}"
-            puts '-' * 80
-            puts "\n\n\n"
-            yield message if block_given?
+            if block_given?
+              yield message
+            else
+              puts "\n"
+              puts '-' * 80
+              puts "*** DEBUGGING ***"
+              puts "MSG:\n#{message.inspect}"
+              # puts "\nMap Report: #{map_report.inspect}"
+              puts "\nRaw Packet: #{raw_packet.inspect}"
+              puts "Length: #{raw_packet_len}"
+              puts '-' * 80
+              puts "\n\n\n"
+            end
           else
             print '.'
           end
@@ -206,6 +212,7 @@ module Meshtastic
 
         #{self}.subscribe(
           mqtt_obj: 'required - mqtt_obj object returned from #connect method',
+          root_topic: 'optional - root topic (default: msh)',
           region: 'optional - region (default: US)',
           channel: 'optional - channel name (default: LongFast)',
           psk: 'optional - channel pre-shared key (default: AQ==)',

data/lib/meshtastic/version.rb

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

metadata

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