meshtastic 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 105d223bd94e02d4473ac5fd66ed0b8dc7eef73d44578eb427fc3d55eb51ae21
-  data.tar.gz: 216a3957a439408579d1d7b48dd552d394885bbc09b8dc3410d776e4c1eb37d6
+  metadata.gz: 5dec0934f3c9c639e3af0cf5f8b88447dd83a96c5ed8082ff954ce13c5b758dd
+  data.tar.gz: c4a3e692fdc5f92a8e1ddf997ae9d5f7c6e33915dd239546d52f3adcee690a44
 SHA512:
-  metadata.gz: 1381a13cff943403ef269c5a349529ab9c2f12e3a3af5b3e88c589f7fd427a6e45b23543251449e1d520471fdf5f6c8a11c55c56bfc24553dc2b02db7ace28d9
-  data.tar.gz: 01d01863635a22c2d3c42ace2a34076c4094ece8ef9629f08ae0e8da7c0a98bbc5815db26e2e4063fa462619caf710938628a8cd086f62411d1cd885017665a4
+  metadata.gz: 8c20d4c63ffdf13b5903f2e5605d5296268613b7bd7cc3380f48e4405e7b4aabda8216775f6664b42e5886dffdac42cfcb66b13bc1a48068e19f3152e1fa9598
+  data.tar.gz: a2ff5b9076561cb0b43b798d4bc6471f7ee2a4387be99bd53b98b389b4344954fbf451ce41be341c6e3a945b12adc02ba531883466fbb46cde30d8f7e0651c02

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_hex] = 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.44'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
 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