meshtastic 0.0.32 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a810ada159c4d2bed444d0ef5e123a2959caec545ade37307ad621b885cb92f
-  data.tar.gz: 00c1c0e5aceb9a75c009af4aedd730918f6d5a8c6acca8fc1df589a357df4510
+  metadata.gz: 8bc079b846550e65c15013b3926d0680fbbb77e393484b2c001cd9ad95777f00
+  data.tar.gz: 47cde9a565ac4815bbeccf179269e1be1c982c107774b2790b3a7a2bd4cf883c
 SHA512:
-  metadata.gz: 9c01f0484f9b9da94d50c7d2f964eeffb9cb374e9993955337502081bcefab8af2a85a692fcb58ed6a2a2981528effd8189faf9f105eda3cb81b60704a60f492
-  data.tar.gz: 940d4174955651ede2eb5938314076a0702ee4ff7eb2c2b56eae491704d7d691ece5c41bbb248cac35ff385d6df48029af3fa8d556c66e11bf09d38db0cb8698
+  metadata.gz: 1b864230b6ab3db1c78955be811421ae7910cdbfeb962483a2b9c1afa7e9a7ec170e0eb1aae5f05c5f94049c7b122cfe9e8f719deb1c98d6b308d5b8ad3568a7
+  data.tar.gz: 8b5ab00dab82fdd351c9c7634765a121c316dfd1f0fb9dc319ab451073986d8c1a822cc95f421accd36db42a6e0c2ced4610f49a305692e667061ecc8b43f15e

data/lib/meshtastic/mqtt.rb

@@ -166,16 +166,16 @@ module Meshtastic
               pb_obj = Meshtastic::Routing.decode(payload)
             when :SERIAL_APP
               pb_obj = Meshtastic::SerialConnectionStatus.decode(payload)
-            when :SIMULATOR_APP
+            when :SIMULATOR_APP,
+                 :TEXT_MESSAGE_COMPRESSED_APP
+              # Unsure if this is the correct protobuf object
+              # for TEXT_MESSAGE_COMPRESSED_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
@@ -203,6 +203,13 @@ module Meshtastic
                 lon: longitude
               ).first.data
             end
+
+            # If we there's a mac address, make it look like one.
+            if message[:decoded][:payload].keys.include?(:macaddr)
+              macaddr = message[:decoded][:payload][:macaddr]
+              macaddr_fmt = macaddr.bytes.map { |byte| byte.to_s(16).rjust(2, '0') }.join(':')
+              message[:decoded][:payload][:macaddr] = macaddr_fmt
+            end
             # puts pb_obj.public_methods
             # message[:decoded][:pb_obj] = pb_obj
           end

data/lib/meshtastic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.34
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler