meshtastic 0.0.43 → 0.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 105d223bd94e02d4473ac5fd66ed0b8dc7eef73d44578eb427fc3d55eb51ae21
-  data.tar.gz: 216a3957a439408579d1d7b48dd552d394885bbc09b8dc3410d776e4c1eb37d6
+  metadata.gz: b2d188ac05f244ce12a4825659a327bb883a51cb601875e5c21e8b45b4528741
+  data.tar.gz: 535ab977c36d067eb9c6a2a3be242b96efa1e3ed0864e2e4d3517970c806d870
 SHA512:
-  metadata.gz: 1381a13cff943403ef269c5a349529ab9c2f12e3a3af5b3e88c589f7fd427a6e45b23543251449e1d520471fdf5f6c8a11c55c56bfc24553dc2b02db7ace28d9
-  data.tar.gz: 01d01863635a22c2d3c42ace2a34076c4094ece8ef9629f08ae0e8da7c0a98bbc5815db26e2e4063fa462619caf710938628a8cd086f62411d1cd885017665a4
+  metadata.gz: c46cdbb49616cc18ddf12a06f11e2dcd981581455146923571601a16ca417a7ddf18b3d769a6182b874ae01aafb526ed6d967c453dfedb30142ed995b398728c
+  data.tar.gz: df15c9aa4b5084734e3db4122647242ed16d89ddc45d8a54bc163602b86ca5cf93a110ca064d90052698f726dc01910023ac8506bbc1b88ce50609dd825f0abc

data/lib/meshtastic/mqtt.rb

@@ -128,22 +128,39 @@ module Meshtastic
         # when :ZPS_APP
         # decoder = Meshtastic::Zps
       end
+
       payload = decoder.decode(payload).to_h
-      if payload.keys.include?(:latitude_i) && payload.keys.include?(:longitude_i)
+
+      if payload.keys.include?(:latitude_i)
         lat = payload[:latitude_i] * 0.0000001
-        lon = payload[:longitude_i] * 0.0000001
         payload[:latitude] = lat
+      end
+
+      if payload.keys.include?(:longitude_i)
+        lon = payload[:longitude_i] * 0.0000001
         payload[:longitude] = lon
-        if gps_metadata
-          gps_search_resp = Meshtastic.gps_search(lat: lat, lon: lon)
-          payload[:gps_metadata] = gps_search_resp
-        end
       end
 
       if payload.keys.include?(:macaddr)
-        mac_hex_arr = payload[:macaddr].bytes.map { |byte| byte.to_s(16).rjust(2, '0') }
-        mac_str = mac_hex_arr.join(':')
-        payload[:macaddr] = mac_str
+        mac_raw = payload[:macaddr]
+        mac_hex_arr = mac_raw.bytes.map { |byte| byte.to_s(16).rjust(2, '0') }
+        mac_hex_str = mac_hex_arr.join(':')
+        payload[:macaddr] = mac_hex_str
+      end
+
+      if payload.keys.include?(:time)
+        time_int = payload[:time]
+        time_utc = Time.at(time_int).utc if time_int.is_a?(Integer)
+        payload[:time_utc] = time_utc
+      end
+
+      if gps_metadata && payload[:latitude] && payload[:longitude]
+        lat = payload[:latitude]
+        lon = payload[:longitude]
+        unless lat.zero? && lon.zero?
+          gps_search_resp = gps_search(lat: lat, lon: lon)
+          payload[:gps_metadata] = gps_search_resp
+        end
       end
 
       payload
@@ -318,7 +335,7 @@ module Meshtastic
 
       gps_arr = [lat.to_f, lon.to_f]
 
-      Geocoder.search(gps_arr)
+      Geocoder.search(gps_arr).first.data
     rescue StandardError => e
       raise e
     end

data/lib/meshtastic/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.45
 platform: ruby
 authors:
 - 0day Inc.
@@ -348,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Ruby gem for Meshtastic