meshtastic 0.0.120 → 0.0.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f33af1590a9b5568820e0d0c8cfc94ec2a649ceb58b23a28de9bb95ffc27d4f
-  data.tar.gz: '08d5ba9b1189304d9f3944f8b773f77858c72c40106f29daa6c04d34e17ae17c'
+  metadata.gz: 59a276ebe667397899dace2501542a43bd69484add6c2d3ea8b305ff2050b156
+  data.tar.gz: bac49dfeae853e2d4efae41e02668f1dc9c500044795bbc24ceb657cfffff1bd
 SHA512:
-  metadata.gz: e7076e6d5e2ac9600dc3616455f8048e9d908e48bef63f36caa5be563f7be52150db282e90587d7e8c8ca9212f4765d332c0bfef147c47f7d7697f27f710458c
-  data.tar.gz: b35d74b95b10e56c65542efa76a5a36efc591da98268075537c612dcc03da95770a8765f66addbe5d34c8d770fc5e14ab198519d0b719e0b41f7362a9e044044
+  metadata.gz: c27efa0eea1961ff43418279fb80d108256619dd46028554ae6382f11cdb4359fc8b4a22aae3ff41d2848385c39e8a2f74e1e7015d8fb372d2cbfe17c37953b1
+  data.tar.gz: d1b794462a3fb53b538a469e3d01050a3bb525e7496d32064aaf1314979b7a3105e6d6dfa8fcacb8760b55b277512428fa6095e01bca8521b01b3d2b9d427b2d

data/Gemfile

@@ -6,17 +6,17 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'bundler', '>=2.6.3'
+gem 'bundler', '>=2.6.8'
 gem 'bundle-audit', '0.1.0'
 gem 'geocoder', '1.8.5'
 gem 'google-protobuf', '3.21.12'
 gem 'mqtt', '0.6.0'
 gem 'rake', '13.2.1'
-gem 'rdoc', '6.12.0'
+gem 'rdoc', '6.13.1'
 gem 'rspec', '3.13.0'
-gem 'rubocop', '>=1.72.1'
+gem 'rubocop', '>=1.75.2'
 gem 'rubocop-rake', '>=0.7.1'
-gem 'rubocop-rspec', '>=3.5.0'
+gem 'rubocop-rspec', '>=3.6.0'
 gem 'rvm', '1.11.3.9'
 gem 'uart', '1.0.0'
 gem 'yard', '0.9.37'

data/lib/meshtastic/admin_pb.rb

@@ -37,6 +37,9 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
         optional :enter_dfu_mode_request, :bool, 21
         optional :delete_file_request, :string, 22
         optional :set_scale, :uint32, 23
+        optional :backup_preferences, :enum, 24, "meshtastic.AdminMessage.BackupLocation"
+        optional :restore_preferences, :enum, 25, "meshtastic.AdminMessage.BackupLocation"
+        optional :remove_backup_preferences, :enum, 26, "meshtastic.AdminMessage.BackupLocation"
         optional :set_owner, :message, 32, "meshtastic.User"
         optional :set_channel, :message, 33, "meshtastic.Channel"
         optional :set_config, :message, 34, "meshtastic.Config"
@@ -92,6 +95,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       value :DETECTIONSENSOR_CONFIG, 11
       value :PAXCOUNTER_CONFIG, 12
     end
+    add_enum "meshtastic.AdminMessage.BackupLocation" do
+      value :FLASH, 0
+      value :SD, 1
+    end
     add_message "meshtastic.HamParameters" do
       optional :call_sign, :string, 1
       optional :tx_power, :int32, 2
@@ -108,6 +115,7 @@ module Meshtastic
   AdminMessage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.AdminMessage").msgclass
   AdminMessage::ConfigType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.AdminMessage.ConfigType").enummodule
   AdminMessage::ModuleConfigType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.AdminMessage.ModuleConfigType").enummodule
+  AdminMessage::BackupLocation = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.AdminMessage.BackupLocation").enummodule
   HamParameters = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.HamParameters").msgclass
   NodeRemoteHardwarePinsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.NodeRemoteHardwarePinsResponse").msgclass
 end

data/lib/meshtastic/config_pb.rb

@@ -156,6 +156,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       value :OLED_SSD1306, 1
       value :OLED_SH1106, 2
       value :OLED_SH1107, 3
+      value :OLED_SH1107_128_64, 4
     end
     add_enum "meshtastic.Config.DisplayConfig.DisplayMode" do
       value :DEFAULT, 0

data/lib/meshtastic/device_ui_pb.rb

@@ -20,6 +20,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :node_filter, :message, 12, "meshtastic.NodeFilter"
       optional :node_highlight, :message, 13, "meshtastic.NodeHighlight"
       optional :calibration_data, :bytes, 14
+      optional :map_data, :message, 15, "meshtastic.Map"
     end
     add_message "meshtastic.NodeFilter" do
       optional :unknown_switch, :bool, 1
@@ -37,6 +38,16 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :iaq_switch, :bool, 4
       optional :node_name, :string, 5
     end
+    add_message "meshtastic.GeoPoint" do
+      optional :zoom, :int32, 1
+      optional :latitude, :int32, 2
+      optional :longitude, :int32, 3
+    end
+    add_message "meshtastic.Map" do
+      optional :home, :message, 1, "meshtastic.GeoPoint"
+      optional :style, :string, 2
+      optional :follow_gps, :bool, 3
+    end
     add_enum "meshtastic.Theme" do
       value :DARK, 0
       value :LIGHT, 1
@@ -59,6 +70,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       value :GREEK, 13
       value :NORWEGIAN, 14
       value :SLOVENIAN, 15
+      value :UKRAINIAN, 16
       value :SIMPLIFIED_CHINESE, 30
       value :TRADITIONAL_CHINESE, 31
     end
@@ -69,6 +81,8 @@ module Meshtastic
   DeviceUIConfig = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.DeviceUIConfig").msgclass
   NodeFilter = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.NodeFilter").msgclass
   NodeHighlight = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.NodeHighlight").msgclass
+  GeoPoint = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.GeoPoint").msgclass
+  Map = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.Map").msgclass
   Theme = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.Theme").enummodule
   Language = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.Language").enummodule
 end

data/lib/meshtastic/deviceonly_pb.rb

@@ -7,6 +7,7 @@ require 'meshtastic/channel_pb'
 require 'meshtastic/mesh_pb'
 require 'meshtastic/telemetry_pb'
 require 'meshtastic/config_pb'
+require 'meshtastic/localonly_pb'
 require 'nanopb_pb'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
@@ -51,12 +52,23 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :did_gps_reset, :bool, 11
       optional :rx_waypoint, :message, 12, "meshtastic.MeshPacket"
       repeated :node_remote_hardware_pins, :message, 13, "meshtastic.NodeRemoteHardwarePin"
-      repeated :node_db_lite, :message, 14, "meshtastic.NodeInfoLite"
+    end
+    add_message "meshtastic.NodeDatabase" do
+      optional :version, :uint32, 1
+      repeated :nodes, :message, 2, "meshtastic.NodeInfoLite"
     end
     add_message "meshtastic.ChannelFile" do
       repeated :channels, :message, 1, "meshtastic.Channel"
       optional :version, :uint32, 2
     end
+    add_message "meshtastic.BackupPreferences" do
+      optional :version, :uint32, 1
+      optional :timestamp, :fixed32, 2
+      optional :config, :message, 3, "meshtastic.LocalConfig"
+      optional :module_config, :message, 4, "meshtastic.LocalModuleConfig"
+      optional :channels, :message, 5, "meshtastic.ChannelFile"
+      optional :owner, :message, 6, "meshtastic.User"
+    end
   end
 end
 
@@ -65,5 +77,7 @@ module Meshtastic
   UserLite = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.UserLite").msgclass
   NodeInfoLite = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.NodeInfoLite").msgclass
   DeviceState = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.DeviceState").msgclass
+  NodeDatabase = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.NodeDatabase").msgclass
   ChannelFile = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.ChannelFile").msgclass
+  BackupPreferences = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("meshtastic.BackupPreferences").msgclass
 end

data/lib/meshtastic/mesh_pb.rb

@@ -386,6 +386,16 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       value :ROUTASTIC, 85
       value :MESH_TAB, 86
       value :MESHLINK, 87
+      value :XIAO_NRF52_KIT, 88
+      value :THINKNODE_M1, 89
+      value :THINKNODE_M2, 90
+      value :T_ETH_ELITE, 91
+      value :HELTEC_SENSOR_HUB, 92
+      value :RESERVED_FRIED_CHICKEN, 93
+      value :HELTEC_MESH_POCKET, 94
+      value :SEEED_SOLAR_NODE, 95
+      value :NOMADSTAR_METEOR_PRO, 96
+      value :CROWPANEL, 97
       value :PRIVATE_HW, 255
     end
     add_enum "meshtastic.Constants" do
@@ -423,6 +433,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       value :AMBIENTLIGHTING_CONFIG, 1024
       value :DETECTIONSENSOR_CONFIG, 2048
       value :PAXCOUNTER_CONFIG, 4096
+      value :BLUETOOTH_CONFIG, 8192
+      value :NETWORK_CONFIG, 16384
     end
   end
 end

data/lib/meshtastic/portnums_pb.rb

@@ -32,6 +32,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       value :ATAK_PLUGIN, 72
       value :MAP_REPORT_APP, 73
       value :POWERSTRESS_APP, 74
+      value :RETICULUM_TUNNEL_APP, 76
       value :PRIVATE_APP, 256
       value :ATAK_FORWARDER, 257
       value :MAX, 511

data/lib/meshtastic/{serial.rb → serial_interface.rb}

@@ -10,46 +10,21 @@ require 'uart'
 
 # Plugin used to interact with Meshtastic nodes
 module Meshtastic
-  module Serial
+  module SerialInterface
     @console_data = []
     @proto_data = []
 
     # Supported Method Parameters::
-    # console_thread = init_console_thread(
-    #   serial_conn: 'required - SerialPort.new object'
+    # proto_thread = init_stdout_thread(
+    #   serial_conn: 'required - serial_conn object returned from UART.open method',
+    #   type: 'required - :proto or :console'
     # )
 
-    private_class_method def self.init_console_thread(opts = {})
-      serial_conn = opts[:serial_conn]
-
-      # Spin up a serial_obj console_thread
-      Thread.new do
-        # serial_conn.read_timeout = -1
-        serial_conn.flush
-
-        loop do
-          serial_conn.wait_readable
-          # Read raw chars into @console_data,
-          # convert to readable bytes if need-be
-          # later.
-          @console_data << serial_conn.readchar.force_encoding('UTF-8')
-        end
-      end
-    rescue StandardError => e
-      console_thread&.terminate
-      serial_conn&.close
-      serial_conn = nil
-
-      raise e
-    end
-
-    # Supported Method Parameters::
-    # proto_thread = init_proto_thread(
-    #   serial_conn: 'required - SerialPort.new object'
-    # )
-
-    private_class_method def self.init_proto_thread(opts = {})
+    private_class_method def self.init_stdout_thread(opts = {})
       serial_conn = opts[:serial_conn]
+      type = opts[:type]
+      valid_types = %i[proto console]
+      raise "ERROR: Invalid type: #{type}. Supported types are :proto or :console" unless valid_types.include?(type)
 
       # Spin up a serial_obj console_thread
       Thread.new do
@@ -62,27 +37,24 @@ module Meshtastic
           # Read raw chars into @console_data,
           # convert to readable bytes if need-be
           # later.
-          @proto_data << from_radio.to_h
+          @proto_data << from_radio.to_h if type == :proto
+          @console_data << serial_conn.readchar.force_encoding('UTF-8') if type == :console
         end
       end
     rescue StandardError => e
-      proto_thread&.terminate
-      serial_conn&.close
-      serial_conn = nil
-
       raise e
     end
 
     # Supported Method Parameters::
-    # Meshtastic::Serial.request(
+    # Meshtastic::SerialInterface.request(
     #   serial_obj: 'required serial_obj returned from #connect method',
-    #   payload: 'required - array of bytes OR string to write to serial device (e.g. [0x00, 0x41, 0x90, 0x00] OR "ATDT+15555555\r\n"'
+    #   payload: 'required - array of bytes OR string to write to serial device (e.g. [0x00, 0x41, 0x90, 0x00] OR "\x00\x41\c90\x00\r\n"'
     # )
 
     public_class_method def self.request(opts = {})
       serial_obj = opts[:serial_obj]
-      payload = opts[:payload]
       serial_conn = serial_obj[:serial_conn]
+      payload = opts[:payload]
 
       byte_arr = nil
       byte_arr = payload if payload.instance_of?(Array)
@@ -101,7 +73,7 @@ module Meshtastic
     end
 
     # Supported Method Parameters::
-    # serial_obj = Meshtastic::Serial.connect(
+    # serial_obj = Meshtastic::SerialInterface.connect(
     #   block_dev: 'optional - serial block device path (defaults to /dev/ttyUSB0)',
     #   baud: 'optional - (defaults to 115200)',
     #   data_bits: 'optional - (defaults to 8)',
@@ -138,16 +110,16 @@ module Meshtastic
 
       serial_obj = {}
       serial_obj[:serial_conn] = serial_conn
-      serial_obj[:console_thread] = init_console_thread(
-        serial_conn: serial_conn
+      serial_obj[:console_thread] = init_stdout_thread(
+        serial_conn: serial_conn,
+        type: :console
       )
-      serial_obj[:proto_thread] = init_proto_thread(
-        serial_conn: serial_conn
+      serial_obj[:proto_thread] = init_stdout_thread(
+        serial_conn: serial_conn,
+        type: :proto
       )
 
-      # 32 bytes of start2_byte in a byte array
-      start2_byte_arr = [START2].pack('C') * 32
-      request(serial_obj: serial_obj, payload: start2_byte_arr)
+      wake_up_device(serial_obj: serial_obj)
 
       mui = Meshtastic::MeshInterface.new
       mui.start_config
@@ -157,91 +129,73 @@ module Meshtastic
       disconnect(serial_obj: serial_obj) unless serial_obj.nil?
       raise e
     end
-
+    #
     # Supported Method Parameters::
-    # console_data = Meshtastic::Serial.dump_console_data
+    # wake_up_device(
+    #   serial_obj: 'required - serial_obj returned from #connect method'
+    # )
+    public_class_method def self.wake_up_device(opts = {})
+      serial_obj = opts[:serial_obj]
 
-    public_class_method def self.dump_console_data
-      if block_given?
-        @console_data.join.split("\n").each { |data| yield data }
-      else
-        @console_data.join
-      end
+      start2_byte_arr = [START2].pack('C') * 32
+      request(serial_obj: serial_obj, payload: start2_byte_arr)
     rescue StandardError => e
+      disconnect(serial_obj: serial_obj) unless serial_obj.nil?
       raise e
     end
 
     # Supported Method Parameters::
-    # console_data = Meshtastic::Serial.dump_proto_data
+    # stdout_data = Meshtastic::SerialInterface.dump_stdout_data(
+    #   type: 'required - :proto or :console'
+    # )
+
+    public_class_method def self.dump_stdout_data(opts = {})
+      type = opts[:type]
+      valid_types = %i[proto console]
+      raise "ERROR: Invalid type: #{type}. Supported types are :proto or :console" unless valid_types.include?(type)
 
-    public_class_method def self.dump_proto_data
       if block_given?
-        @proto_data.each { |proto_hash| yield proto_hash }
+        @proto_data.each { |proto_hash| yield proto_hash } if type == :proto
+        @console_data.join.split("\n").each{ |line| yield line.force_encoding('UTF-8') } if type == :console
       else
-        @proto_data
-      end
-    rescue StandardError => e
-      raise e
-    end
-
-    # Supported Method Parameters::
-    # console_data = Meshtastic::Serial.flush_data(opts = {})
+        stdout_data = @proto_data if type == :proto
+        stdout_data = @console_data.join if type == :console
 
-    public_class_method def self.flush_data(opts = {})
-      target = opts[:target]
-      case target
-      when :console
-        @console_data.clear
-      when :proto
-        @proto_data.clear
-      else
-        raise "ERROR: supported targets are :console or :proto"
+        stdout_data
       end
     rescue StandardError => e
       raise e
     end
 
     # Supported Method Parameters::
-    # console_data = Meshtastic::Serial.monitor_console(
-    #   refresh: 'optional - refresh interval (default: 3)',
-    #   include: 'optional - comma-delimited string(s) to include in message (default: nil)',
-    #   exclude: 'optional - comma-delimited string(s) to exclude in message (default: nil)'
-    # )
+    # console_data = Meshtastic::SerialInterface.flush_data(opts = {})
 
-    public_class_method def self.monitor_console(opts = {})
-      refresh = opts[:refresh] ||= 3
-      include = opts[:include]
-      exclude = opts[:exclude]
-
-      loop do
-        exclude_arr = exclude.to_s.split(',').map(&:strip)
-        include_arr = include.to_s.split(',').map(&:strip)
+    public_class_method def self.flush_data(opts = {})
+      type = opts[:type]
+      valid_types = %i[proto console]
+      raise "ERROR: Invalid type: #{type}. Supported types are :proto or :console" unless valid_types.include?(type)
 
-        dump_console_data do |data|
-          disp = false
-          disp = true if exclude_arr.none? { |exclude| data.include?(exclude) } && (
-                           include_arr.empty? ||
-                           include_arr.all? { |include| data.include?(include) }
-                         )
-          puts data if disp
-          flush_data(target: :console)
-        end
-        sleep refresh
-      end
-    rescue Interrupt
-      puts "\nCTRL+C detected. Breaking out of console mode..."
+      @console_data.clear if type == :console
+      @proto_data.clear if type == :proto
     rescue StandardError => e
       raise e
     end
 
     # Supported Method Parameters::
-    # console_data = Meshtastic::Serial.monitor_proto(
+    # console_data = Meshtastic::SerialInterface.monitor_stdout(
+    #   serial_obj: 'required - serial_obj returned from #connect method',
+    #   type: 'required - :proto or :console',
     #   refresh: 'optional - refresh interval (default: 3)',
     #   include: 'optional - comma-delimited string(s) to include in message (default: nil)',
     #   exclude: 'optional - comma-delimited string(s) to exclude in message (default: nil)'
     # )
 
-    public_class_method def self.monitor_proto(opts = {})
+    public_class_method def self.monitor_stdout(opts = {})
+      serial_obj = opts[:serial_obj]
+      type = opts[:type]
+      valid_types = %i[proto console]
+      raise "ERROR: Invalid type: #{type}. Supported types are :proto or :console" unless valid_types.include?(type)
+
       refresh = opts[:refresh] ||= 3
       include = opts[:include]
       exclude = opts[:exclude]
@@ -250,25 +204,27 @@ module Meshtastic
         exclude_arr = exclude.to_s.split(',').map(&:strip)
         include_arr = include.to_s.split(',').map(&:strip)
 
-        dump_proto_data do |data|
+        dump_stdout_data(type: type) do |data|
           disp = false
           disp = true if exclude_arr.none? { |exclude| data.include?(exclude) } && (
                            include_arr.empty? ||
                            include_arr.all? { |include| data.include?(include) }
                          )
           puts data if disp
-          flush_data(target: :proto)
+          flush_data(type: type)
         end
         sleep refresh
       end
     rescue Interrupt
-      puts "\nCTRL+C detected. Breaking out of proto mode..."
+      puts "\nCTRL+C detected. Breaking out of console mode..."
+      disconnect(serial_obj: serial_obj) unless serial_obj.nil?
     rescue StandardError => e
+      disconnect(serial_obj: serial_obj) unless serial_obj.nil?
       raise e
     end
 
     # Supported Method Parameters::
-    # Meshtastic::Serial.subscribe(
+    # Meshtastic::SerialInterface.subscribe(
     #   serial_obj: 'required - serial_obj returned from #connect method'
     #   root_topic: 'optional - root topic (default: msh)',
     #   region: 'optional - region e.g. 'US/VA', etc (default: US)',
@@ -451,14 +407,14 @@ module Meshtastic
       end
     rescue Interrupt
       puts "\nCTRL+C detected. Exiting..."
+      serial_obj = disconnect(serial_obj: serial_obj) unless serial_obj.nil?
     rescue StandardError => e
+      serial_obj = disconnect(serial_obj: serial_obj) unless serial_obj.nil?
       raise e
-    ensure
-      serial_obj.disconnect if serial_obj
     end
 
     # Supported Method Parameters::
-    # Meshtastic::Serial.send_text(
+    # Meshtastic::SerialInterface.send_text(
     #   serial_obj: 'required - serial_obj returned from #connect method',
     #   from: 'required - From ID (String or Integer) (Default: "!00000b0b")',
     #   to: 'optional - Destination ID (Default: "!ffffffff")',
@@ -472,17 +428,18 @@ module Meshtastic
     #   psks: 'optional - hash of :channel_id => psk key value pairs (default: { LongFast: "AQ==" })'
     # )
     public_class_method def self.send_text(opts = {})
-      serial_obj = opts[:serial_obj]
-      topic = opts[:topic] ||= 'msh/US/2/e/LongFast/#'
+      # serial_obj = opts[:serial_obj]
+      # topic = opts[:topic] ||= 'msh/US/2/e/LongFast/#'
       opts[:via] = :radio
 
       # TODO: Implement chunked message to deal with large messages
       mui = Meshtastic::MeshInterface.new
-      protobuf_text = mui.send_text(opts)
+      mui.send_text(opts)
 
       # TODO: serial equivalent of publish
       # serial_obj.publish(topic, protobuf_text)
     rescue StandardError => e
+      serial_obj = disconnect(serial_obj: serial_obj) unless serial_obj.nil?
       raise e
     end
 
@@ -493,7 +450,16 @@ module Meshtastic
     public_class_method def self.disconnect(opts = {})
       serial_obj = opts[:serial_obj]
 
-      serial_obj.disconnect if serial_obj
+      if serial_obj
+        console_thread = serial_obj[:console_thread]
+        proto_thread = serial_obj[:proto_thread]
+        serial_conn = serial_obj[:serial_conn]
+
+        console_thread&.terminate
+        proto_thread&.terminate
+        serial_conn&.close
+      end
+
       nil
     rescue StandardError => e
       raise e
@@ -522,16 +488,28 @@ module Meshtastic
           ack_timeout: 'optional - acknowledgement timeout (default: 30)'
         )
 
-        #{self}.monitor_console(
-          refresh: 'optional - refresh interval (default: 3)',
-          include: 'optional - comma-delimited string(s) to include in message (default: nil)',
-          exclude: 'optional - comma-delimited string(s) to exclude in message (default: nil)'
+        #{self}.wake_up_device(
+          serial_obj: 'required - serial_obj returned from #connect method'
+        )
+
+        #{self}.request(
+          serial_obj: 'required serial_obj returned from #connect method',
+          payload: 'required - array of bytes OR string to write to serial device (e.g. [0x00, 0x41, 0x90, 0x00] OR \"\\x00\\x41\\c90\\x00\\r\\n\"'
         )
 
-        #{self}.monitor_proto(
+        stdout_data = #{self}.dump_stdout_data(
+          type: 'required - :proto or :console'
+        )
+
+        #{self}.flush_data(
+          type: 'optional - :console or :proto (default: nil)'
+        )
+
+        #{self}.monitor_stdout(
+          type: 'required - :proto or :console',
           refresh: 'optional - refresh interval (default: 3)',
           include: 'optional - comma-delimited string(s) to include in message (default: nil)',
-          exclude: 'optional - comma-delimited string(s) to exclude in message (default: nil)'
+          exclude: 'optional - comma-delimited string(s) to exclude in message (default: nil)',
         )
 
         #{self}.subscribe(

data/lib/meshtastic/stream_interface.rb

@@ -58,7 +58,7 @@ module Meshtastic
       sleep(0.1) # wait 100ms to give device time to start running
 
       @rx_thread.start
-      mui = Meshtastic::MeshInfoUser.new
+      mui = Meshtastic::MeshInterface.new
       mui.start_config
     rescue StandardError => e
       raise e
@@ -67,10 +67,50 @@ module Meshtastic
     # Supported Method Parameters::
     # Meshtastic::StreamInterface.reader
     def reader
+      loop do
+        break if @want_exit
+        # Read from stream and handle data
+        # This should be implemented based on how you handle reading from @stream
+        data = @stream.read(1) # Example: read one byte at a time
+        @rx_buf << data if data
+
+        # Here you would parse the data according to your protocol
+        # This is just a placeholder for the actual reading logic
+
+        # Yield for other threads
+        sleep(0.01)
+      end
     rescue StandardError => e
       raise e
     end
 
+    def write_bytes(opts = {})
+      bytes = opts[:bytes]
+      @stream.write(bytes) if @stream
+      @stream.flush if @stream
+    end
+
+    def read_bytes(opts = {})
+      length = opts[:length]
+      @stream.read(length) if @stream
+    end
+
+    def send_to_radio_impl(opts = {})
+      to_radio = opts[:to_radio]
+      # Convert to_radio to bytes, assuming it's a proto message in Ruby
+      # This example assumes `to_radio` has a method to serialize to string
+      b = to_radio.to_s
+      buf_len = b.length
+      header = [0x94, 0xC3, (buf_len >> 8) & 0xFF, buf_len & 0xFF].pack('C*')
+      write_bytes(header + b)
+    end
+
+    def close
+      @want_exit = true
+      @rx_thread.join if @rx_thread && @rx_thread != Thread.current
+      @stream&.close
+    end
+
     # Author(s):: 0day Inc. <support@0dayinc.com>
 
     def authors

data/lib/meshtastic/telemetry_pb.rb

@@ -33,6 +33,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       proto3_optional :radiation, :float, 18
       proto3_optional :rainfall_1h, :float, 19
       proto3_optional :rainfall_24h, :float, 20
+      proto3_optional :soil_moisture, :uint32, 21
+      proto3_optional :soil_temperature, :float, 22
     end
     add_message "meshtastic.PowerMetrics" do
       proto3_optional :ch1_voltage, :float, 1
@@ -127,6 +129,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       value :RADSENS, 33
       value :INA226, 34
       value :DFROBOT_RAIN, 35
+      value :DPS310, 36
+      value :RAK12035, 37
     end
   end
 end

data/lib/meshtastic/version.rb

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

data/lib/meshtastic.rb

@@ -45,7 +45,7 @@ module Meshtastic
   autoload :Portnums, 'meshtastic/portnums'
   autoload :RemoteHardware, 'meshtastic/remote_hardware'
   autoload :RTTTL, 'meshtastic/rtttl'
-  autoload :Serial, 'meshtastic/serial'
+  autoload :SerialInterface, 'meshtastic/serial_interface'
   autoload :Storeforward, 'meshtastic/storeforward'
   autoload :StreamInterface, 'meshtastic/stream_interface'
   autoload :Telemetry, 'meshtastic/telemetry'

data/spec/lib/meshtastic/{serial_spec.rb → serial_interface_spec.rb}

@@ -2,5 +2,5 @@
 
 require 'spec_helper'
 
-describe Meshtastic::Serial do
+describe Meshtastic::SerialInterface do
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: meshtastic
 version: !ruby/object:Gem::Version
-  version: 0.0.120
+  version: 0.0.121
 platform: ruby
 authors:
 - 0day Inc.
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.6.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.6.8
 - !ruby/object:Gem::Dependency
   name: bundle-audit
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.12.0
+        version: 6.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.12.0
+        version: 6.13.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -127,14 +127,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: 1.75.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: 1.75.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -155,14 +155,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rvm
   requirement: !ruby/object:Gem::Requirement
@@ -267,7 +267,7 @@ files:
 - lib/meshtastic/remote_hardware_pb.rb
 - lib/meshtastic/rtttl.rb
 - lib/meshtastic/rtttl_pb.rb
-- lib/meshtastic/serial.rb
+- lib/meshtastic/serial_interface.rb
 - lib/meshtastic/storeforward.rb
 - lib/meshtastic/storeforward_pb.rb
 - lib/meshtastic/stream_interface.rb
@@ -317,7 +317,7 @@ files:
 - spec/lib/meshtastic/remote_hardware_spec.rb
 - spec/lib/meshtastic/rtttl_pb_spec.rb
 - spec/lib/meshtastic/rtttl_spec.rb
-- spec/lib/meshtastic/serial_spec.rb
+- spec/lib/meshtastic/serial_interface_spec.rb
 - spec/lib/meshtastic/storeforward_pb_spec.rb
 - spec/lib/meshtastic/storeforward_spec.rb
 - spec/lib/meshtastic/stream_interface_spec.rb
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Ruby gem for Meshtastic
 test_files: []