meshtastic 0.0.131 → 0.0.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d5c8125b93a40c6bf9c026e9772c358780efccd8c726429374f236dde76ee3e
-  data.tar.gz: dddc89b1ff453d5f1d632c08b829c423ae37d4da2eefbe73e486404abc7ba1bb
+  metadata.gz: 55a43435391e779611e5b054b48922b801ede63b8e2a1475ca6231bee6fea0dc
+  data.tar.gz: a174043a34c15e67ac5d3633b2f3e7cb4e8043103f1ec772511dfe07ab4e25e1
 SHA512:
-  metadata.gz: e5c6a5f73853b09707850e2d3f33bfd9cd93f35dc5db352589f384d5c246640b6bdd377ff054096bd94d5c5896953a47a2fa05ec03e10057ad075cd051d675ce
-  data.tar.gz: 186455cdf4cefe78b9d4711515675ee06f8664e4cb431e0865103a1ad6a6663484e754aa1358dd8442239e3ce74b9d57e7385b152ed6ef65d15518cd01a2b9ce
+  metadata.gz: 56e964f576c853715ba6991d86e4136f40e2c7aca7a33ab51cc0d395c826738bcc97556b05d3556a611b131520d714a016a9a8fe49235dc8dff0c63cdf3cff16
+  data.tar.gz: 9ceb1c0ba1b34b56d44cfdc9c382c2cbee879607555f61671ed4d1d21961ccdb2057b1ce702c74223712191b76382414375ff1a54a63688ff54ba2e6af7fe631

data/README.md

@@ -30,6 +30,7 @@ At the moment the only module available is `Meshtastic::MQTT`.  To view MQTT mes
 require 'meshtastic'
 Meshtastic::MQTT.help
 mqtt_obj = Meshastic::MQTT.connect
+puts mqtt_obj.inspect
 Meshtastic::MQTT.subscribe(
   mqtt_obj: mqtt_obj,
   include: '_APP, LongFast'
@@ -43,6 +44,7 @@ require 'meshtastic'
 mqtt_obj = Meshastic::MQTT.connect
 Meshtastic::MQTT.subscribe(
   mqtt_obj: mqtt_obj,
+  root_topic: 'msh',
   region: 'US',
   topic: '2/e/LongFast/#',
   psks: { LongFast: 'AQ==' }
@@ -61,7 +63,9 @@ Meshtastic::MQTT.send_text(
   mqtt_obj: mqtt_obj,
   from: client_id,
   to: '!ffffffff',
-  topic: "msh/US/2/e/LongFast/#{client_id}",
+  root_topic: 'msh',
+  region: 'US',
+  topic: '2/e/LongFast/#',
   channel: 93,
   text: 'Hello, World!',
   psks: { LongFast: 'AQ==' }
@@ -75,6 +79,7 @@ require 'meshtastic'
 mqtt_obj = Meshastic::MQTT.connect
 Meshtastic::MQTT.subscribe(
   mqtt_obj: mqtt_obj,
+  root_topic: 'msh',
   region: 'US',
   topic: '2/e/LongFast/#',
   psks: { LongFast: 'AQ==' },

data/lib/meshtastic/mqtt.rb

@@ -255,7 +255,7 @@ module Meshtastic
     #   to: 'optional - Destination ID (Default: "!ffffffff")',
     #   root_topic: 'optional - root topic (default: msh)',
     #   region: 'optional - region e.g. "US/VA", etc (default: US)',
-    #   topic: 'optional - topic to publish to (default: "2/e/LongFast")',
+    #   topic: 'optional - topic to publish to (default: "2/e/LongFast/#")',
     #   channel: 'optional - channel (Default: 6)',
     #   text: 'optional - Text Message (Default: SYN)',
     #   want_ack: 'optional - Want Acknowledgement (Default: false)',
@@ -270,9 +270,11 @@ module Meshtastic
       opts[:to] ||= '!ffffffff'
       opts[:root_topic] ||= 'msh'
       opts[:region] ||= 'US'
-      opts[:topic] ||= '2/e/LongFast'
+      opts[:topic] ||= '2/e/LongFast/#'
+      opts[:topic] = opts[:topic].to_s.gsub('/#', '')
       opts[:channel] ||= 6
       absolute_topic = "#{opts[:root_topic]}/#{opts[:region]}/#{opts[:topic]}/#{opts[:from]}"
+      opts[:topic] = absolute_topic
       opts[:via] = :mqtt
 
       # TODO: Implement chunked message to deal with large messages
@@ -339,7 +341,7 @@ module Meshtastic
           to: 'optional - Destination ID (Default: \"!ffffffff\")',
           root_topic: 'optional - root topic (default: msh)',
           region: 'optional - region e.g. 'US/VA', etc (default: US)',
-          topic: 'optional - topic to publish to (default: '2/e/LongFast')',
+          topic: 'optional - topic to publish to (default: '2/e/LongFast/#')',
           channel: 'optional - channel (Default: 6)',
           text: 'optional - Text Message (Default: SYN)',
           want_ack: 'optional - Want Acknowledgement (Default: false)',

data/lib/meshtastic/version.rb

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

metadata

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