meshtastic 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b80ae9abe5cb5bdb83e479b4a3ce480bbd7cbd9bc51435ab1142f5a2c1f4ddcd
-  data.tar.gz: 819a011c9a9e9e595eb7ba98e7ee823b22d325a9c569f37d2b9f0302ac9b344c
+  metadata.gz: 53abe45ca69e2d962a54c1a6b7253cb0d1b9ccbac50cb17732d35c27171833f5
+  data.tar.gz: 3b394df70c866f209cdc723f888b80eaca04d99169db197ba2c5f0d2116917c0
 SHA512:
-  metadata.gz: d588c49bd385c6e910b36b066f8baf8120a765232171f8306b65bc2a534df45a8c274833754d6b575bb3788209b7bb6e9e9eb1e211297171915b6439d5da1c43
-  data.tar.gz: 42b85500508e2f1a93c2bb486ccb592e4372a5dcea1d09d401a16ee776ecb0b17a57fd6aca8b65315f4b70c46d227378545c4d03f42888a6ea817020c419e353
+  metadata.gz: a9230cc0e5170ba34f11a743533fefeeb2cdfb7a1441cab4246e3b2b822569ed1c680a999859dbb2ec0097c5e040fe1efc85f0087f642bc473d85961e6ac3f0f
+  data.tar.gz: a019b8ccd299fe271ebe984b95de20b90f295df7aab24c773cd18b2bd6554526371db230aa274221a0f96f67192c301de91ce56e4f7b0b6a1bfbb53429ed3ecd

data/lib/meshtastic/mqtt.rb

@@ -131,8 +131,10 @@ 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
@@ -141,51 +143,65 @@ module Meshtastic
               # 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_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 :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
             # 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.28'
+  VERSION = '0.0.29'
 end

metadata

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