meshtastic 0.0.27 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 898ebccfa6f9e1dfaf7a8dceb7e96a8809c2dfb264c292e7615415296d09e3a9
-  data.tar.gz: 78b2aed960cfb158ec4e5fa18d4473030256c9bbde47ad279cefdba757165c6b
+  metadata.gz: 53abe45ca69e2d962a54c1a6b7253cb0d1b9ccbac50cb17732d35c27171833f5
+  data.tar.gz: 3b394df70c866f209cdc723f888b80eaca04d99169db197ba2c5f0d2116917c0
 SHA512:
-  metadata.gz: 14c3e366e953ba5188f53777072542c987d927c682aec73d098e3b5e89b19a6fb659df9561e56fb1d64b107acd105a677416e519c8f5011777a2881f67f81c70
-  data.tar.gz: 3b33c81aa2da8352212faf364e41f9abf5ab3f19f14a02e1898d979c21a929058456b35fa3d1253a967cf60556951ac768f95bbfcd1d03fc0eef035887474f20
+  metadata.gz: a9230cc0e5170ba34f11a743533fefeeb2cdfb7a1441cab4246e3b2b822569ed1c680a999859dbb2ec0097c5e040fe1efc85f0087f642bc473d85961e6ac3f0f
+  data.tar.gz: a019b8ccd299fe271ebe984b95de20b90f295df7aab24c773cd18b2bd6554526371db230aa274221a0f96f67192c301de91ce56e4f7b0b6a1bfbb53429ed3ecd

data/git_commit.sh

@@ -7,6 +7,7 @@ if [[ $1 != "" && $2 != "" && $3 != "" ]]; then
   git add . --all
   echo 'Updating Gems to Latest Versions in Gemfile...'
   ./upgrade_Gemfile_gems.sh
+  ./AUTOGEN_meshtastic_protobufs.sh
   meshtastic_autoinc_version
   git commit -a -S --author="${1} <${2}>" -m "${3}"
   ./upgrade_meshtastic.sh

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.27'
+  VERSION = '0.0.29'
 end

metadata

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