gps_pvt 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2eb20de6303a24b0e5b134c7c78cd1edb043ff38d823181e596b4626b6bc536
-  data.tar.gz: 183ae6e8cfd2577132113bb3684e6e225989ce444d6647820496b13ddd3a4903
+  metadata.gz: 5bccc645ba148e24c0d8b43c1663ed245a6306eedfd376bdccf0f817977d5964
+  data.tar.gz: 13b461cf2ce59b7064f4c69f13969f3e758974ae6dd331bf3628a901f76b3762
 SHA512:
-  metadata.gz: a35228704032066f682e15f5abf6f8a2238d90424e6b50182e07b8fc342a1f4150ba6747ca88a9fcaef163e0ce8149a68edf087e6c0f5525a2c7a09553beb504
-  data.tar.gz: 10ace25d753123375bf8ad46cbd4d7490b13219522b39ee5774a1df6d3ba1fd3fd9f318364a19253981f24a3b83998e5df9bb82700b37d6d7f17bd1ad27ad14d
+  metadata.gz: cebbb365561e4a2a56cadde92d69f03490313d56baa33ed5e14749220385a85813ee91cbdb93cb3980f66d69d95e1a63fb2852fb8441992767b64e7a80558ec5
+  data.tar.gz: 251feae90231587a9e1c720ab20675084573b6ef1fc50429ad04223a1ad269eccc16d0e79cb7f4ffa547be95c1129a83e12e3edb5dc1495d20245cb1afc39693

data/README.md

@@ -32,7 +32,7 @@ An attached executable is useful. After installation, type
 
     $ gps_pvt file_or_URI(s)
 
-The format of file is automatically determined with its extension, such as .ubx will be treated as UBX format. A compressed file of .gz or .Z can be specified directly (decompression is internally performed), and URI such as http(s)://... and ftp:// is also acceptable. If you want to specify the file format, instead of file_or_URI(s), use the following arguments:
+The format of file is automatically determined with its extension, such as .ubx will be treated as UBX format. A compressed file of .gz or .Z can be specified directly (decompression is internally performed). URI such as http(s)://... and ftp://, and serial port (COMn for Windows and /dev/tty* for *NIX, version >= 0.8.0) are also acceptable. If you want to specify the file format, instead of file_or_URI(s), use the following arguments:
 
 | specification | recoginized as |
 ----|----

data/exe/gps_pvt

@@ -14,7 +14,7 @@ If you want to specify its format manually, command options like --rinex_nav=fil
 Other than --rinex_nav, --rinex_obs, -rinex_clk, --ubx, --sp3 or --antex are supported. 
 Supported RINEX versions are 2 and 3.
 A file having additional ".gz" or ".Z" extension is recognized as a compressed file.
-Major URL such as http(s)://... or ftp://... is acceptable as an input file name. 
+Major URL such as http(s)://... or ftp://..., and serial port (COMn for Windows, /dev/tty* for *NIX) is acceptable as an input file name.
 __STRING__
 
 options = []
@@ -80,6 +80,7 @@ files.collect!{|fname, ftype|
   end
   fname = proc{
     next fname if File::exist?(fname)
+    next fname if ((fname =~ Serial::SPEC) rescue false)
     if uri = URI::parse(fname) and !uri.instance_of?(URI::Generic) then
       next uri
     end

data/gps_pvt.gemspec

@@ -58,6 +58,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_dependency "rubyserial"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rake-compiler"
 

data/lib/gps_pvt/receiver.rb

@@ -154,6 +154,7 @@ class Receiver
       :skip_exclusion => true, # default is to skip fault exclusion calculation
     }
     @debug = {}
+    @semaphore = Mutex::new
     solver_opts = [:gps_options, :sbas_options, :glonass_options].collect{|target|
       @solver.send(target)
     }
@@ -298,6 +299,24 @@ class Receiver
       :meas => Receiver::meas_items(output_options),
     }
   end
+  
+  def critical(&b)
+    begin
+      @semaphore.synchronize{b.call}
+    rescue ThreadError # recovery from deadlock
+      b.call
+    end
+  end
+  
+  class << self
+    def make_critical(fname)
+      f_orig = instance_method(fname)
+      define_method(fname){|*args, &b|
+        critical{f_orig.bind(self).call(*args, &b)}
+      }
+    end
+    private :make_critical
+  end
 
   GPS::Measurement.class_eval{
     proc{
@@ -331,7 +350,7 @@ class Receiver
 =end
 
     #@solver.gps_space_node.update_all_ephemeris(t_meas) # internally called in the following solver.solve
-    pvt = @solver.solve(meas, t_meas)
+    pvt = critical{@solver.solve(meas, t_meas)}
     pvt.define_singleton_method(:rel_ENU){
       Coordinate::ENU::relative(xyz, ref_pos)
     } if (ref_pos && pvt.position_solved?)
@@ -378,60 +397,59 @@ class Receiver
     }
   }
   
-  proc{
-    eph_list = Hash[*((1..32).to_a + (193..202).to_a).collect{|prn|
+  def register_ephemeris(t_meas, sys, prn, bcast_data, *options)
+    @eph_list ||= Hash[*((1..32).to_a + (193..202).to_a).collect{|prn|
       eph = GPS::Ephemeris::new
       eph.svid = prn
       [prn, eph]
     }.flatten(1)]
-    eph_glonass_list = Hash[*(1..24).collect{|num|
+    @eph_glonass_list ||= Hash[*(1..24).collect{|num|
       eph = GPS::Ephemeris_GLONASS::new
       eph.svid = num
       [num, eph]
     }.flatten(1)]
-    define_method(:register_ephemeris){|t_meas, sys, prn, bcast_data, *options|
-      opt = options[0] || {}
-      case sys
-      when :GPS, :QZSS
-        next unless eph = eph_list[prn]
-        sn = @solver.gps_space_node
-        subframe, iodc_or_iode = eph.parse(bcast_data)
-        if iodc_or_iode < 0 then
-          begin
-            sn.update_iono_utc(
-                GPS::Ionospheric_UTC_Parameters::parse(bcast_data))
-            [:alpha, :beta].each{|k|
-              $stderr.puts "Iono #{k}: #{sn.iono_utc.send(k)}"
-            } if false
-          rescue
-          end
-          next
-        end
-        if t_meas and eph.consistent? then
-          eph.WN = ((t_meas.week / 1024).to_i * 1024) + (eph.WN % 1024)
-          sn.register_ephemeris(prn, eph)
-          eph.invalidate
+    opt = options[0] || {}
+    case sys
+    when :GPS, :QZSS
+      return unless eph = @eph_list[prn]
+      sn = @solver.gps_space_node
+      subframe, iodc_or_iode = eph.parse(bcast_data)
+      if iodc_or_iode < 0 then
+        begin
+          sn.update_iono_utc(
+              GPS::Ionospheric_UTC_Parameters::parse(bcast_data))
+          [:alpha, :beta].each{|k|
+            $stderr.puts "Iono #{k}: #{sn.iono_utc.send(k)}"
+          } if false
+        rescue
         end
-      when :SBAS
-        case @solver.sbas_space_node.decode_message(bcast_data[0..7], prn, t_meas)
-        when 26
-          ['', "IGP broadcasted by PRN#{prn} @ #{Time::utc(*t_meas.c_tm)}",
-              @solver.sbas_space_node.ionospheric_grid_points(prn)].each{|str|
-            $stderr.puts str
-          } if @debug[:SBAS_IGP] 
-        end if t_meas
-      when :GLONASS
-        next unless eph = eph_glonass_list[prn]
-        leap_sec = @solver.gps_space_node.is_valid_utc ? 
-            @solver.gps_space_node.iono_utc.delta_t_LS :
-            GPS::Time::guess_leap_seconds(t_meas)
-        next unless eph.parse(bcast_data[0..3], leap_sec)
-        eph.freq_ch = opt[:freq_ch] || 0
-        @solver.glonass_space_node.register_ephemeris(prn, eph)
+        return
+      end
+      if t_meas and eph.consistent? then
+        eph.WN = ((t_meas.week / 1024).to_i * 1024) + (eph.WN % 1024)
+        sn.register_ephemeris(prn, eph)
         eph.invalidate
       end
-    }
-  }.call
+    when :SBAS
+      case @solver.sbas_space_node.decode_message(bcast_data[0..7], prn, t_meas)
+      when 26
+        ['', "IGP broadcasted by PRN#{prn} @ #{Time::utc(*t_meas.c_tm)}",
+            @solver.sbas_space_node.ionospheric_grid_points(prn)].each{|str|
+          $stderr.puts str
+        } if @debug[:SBAS_IGP]
+      end if t_meas
+    when :GLONASS
+      return unless eph = @eph_glonass_list[prn]
+      leap_sec = @solver.gps_space_node.is_valid_utc ? 
+          @solver.gps_space_node.iono_utc.delta_t_LS :
+          GPS::Time::guess_leap_seconds(t_meas)
+      return unless eph.parse(bcast_data[0..3], leap_sec)
+      eph.freq_ch = opt[:freq_ch] || 0
+      @solver.glonass_space_node.register_ephemeris(prn, eph)
+      eph.invalidate
+    end
+  end
+  make_critical :register_ephemeris
   
   def parse_ubx(ubx_fname, &b)
     $stderr.print "Reading UBX file (%s) "%[ubx_fname]
@@ -564,7 +582,7 @@ class Receiver
       @solver.sbas_space_node,
       @solver.glonass_space_node,
     ].inject(0){|res, sn|
-      loaded_items = sn.send(:read, fname)
+      loaded_items = critical{sn.send(:read, fname)}
       raise "Format error! (Not RINEX) #{src}" if loaded_items < 0
       res + loaded_items
     }
@@ -648,7 +666,7 @@ class Receiver
       next unless /^SYS_(?!SYSTEMS)(.*)/ =~ sys.to_s
       idx, sys_name = [@sp3.class.const_get(sys), $1]
       next unless sats[idx] > 0
-      next unless @sp3.push(@solver, idx)
+      next unless critical{@sp3.push(@solver, idx)}
       $stderr.puts "Change ephemeris source of #{sys_name} to SP3" 
     }
   end
@@ -656,7 +674,7 @@ class Receiver
   def attach_antex(src)
     fname = Util::get_txt(src)
     raise "Specify SP3 before ANTEX application!" unless @sp3
-    applied_items = @sp3.apply_antex(fname)
+    applied_items = critical{@sp3.apply_antex(fname)}
     raise "Format error! (Not ANTEX) #{src}" unless applied_items >= 0
     $stderr.puts "SP3 correction with ANTEX file (%s): %d items have been processed."%[src, applied_items]
   end
@@ -672,7 +690,7 @@ class Receiver
       next unless /^SYS_(?!SYSTEMS)(.*)/ =~ sys.to_s
       idx, sys_name = [@clk.class.const_get(sys), $1]
       next unless sats[idx] > 0
-      next unless @clk.push(@solver, idx)
+      next unless critical{@clk.push(@solver, idx)}
       $stderr.puts "Change clock error source of #{sys_name} to RINEX clock" 
     }
   end

data/lib/gps_pvt/util.rb

@@ -1,7 +1,39 @@
-require 'open-uri'
 require 'tempfile'
 require 'uri'
 
+proc{
+  # port[:baudrate], baudrate default is 115200
+  Serial.class_eval{
+    const_set(:SPEC, 
+        if RubySerial::ON_WINDOWS then
+          %r{^(?:\\\\.\\)?(COM\d+)(?::(\d+))?$}
+        elsif RubySerial::ON_LINUX then
+          %r{^(/dev/tty[^:]+)(?::(\d+))?$}
+        else
+          nil
+        end)
+  }
+  Serial.class_eval{
+    read_orig = instance_method(:read)
+    define_method(:read){|len|
+      buf = ''
+      f = read_orig.bind(self)
+      buf += f.call(len - buf.size) while buf.size < len
+      buf
+    }
+    def eof?; false; end
+  }
+  Kernel.instance_eval{
+    open_orig = method(:open)
+    define_method(:open){|*args, &b|
+      return open_orig.call(*args, &b) unless Serial::SPEC =~ args[0]
+      Serial::new($1, $2 ? $2.to_i : 115200)
+    }
+  }
+}.call if require 'rubyserial'
+
+require 'open-uri'
+
 module GPS_PVT
 module Util
   class << self

data/lib/gps_pvt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GPS_PVT
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gps_pvt
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - fenrir(M.Naruoka)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubyserial
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement