gps_pvt 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2eb20de6303a24b0e5b134c7c78cd1edb043ff38d823181e596b4626b6bc536
-  data.tar.gz: 183ae6e8cfd2577132113bb3684e6e225989ce444d6647820496b13ddd3a4903
+  metadata.gz: fb3abd803cfe1b0b5199c4187fe17c2595eb603ab27e09f71b66fde11eeafce0
+  data.tar.gz: 351d46d74583346750aec426c087c33bc13f9e9e9adff746567e40df7eb1e39e
 SHA512:
-  metadata.gz: a35228704032066f682e15f5abf6f8a2238d90424e6b50182e07b8fc342a1f4150ba6747ca88a9fcaef163e0ce8149a68edf087e6c0f5525a2c7a09553beb504
-  data.tar.gz: 10ace25d753123375bf8ad46cbd4d7490b13219522b39ee5774a1df6d3ba1fd3fd9f318364a19253981f24a3b83998e5df9bb82700b37d6d7f17bd1ad27ad14d
+  metadata.gz: 0fb78d49675fbbcb3fcfeb80debd7ca15f351be478ed5716f94a61b23f26af7ff957ee446a5ab6c4cc2e67abf2f251cf62845a347ea3810282987da04fa9a2e8
+  data.tar.gz: ac74ba61920cad427d6e848f4621227d150bfe9a30a2f1465bd6d87681cfdd935e20e8e141575306b87c770b485f8dad1555766b7281980ba1f412adddff4e7c

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/Rakefile

@@ -45,6 +45,7 @@ namespace :git do
               + (<<-__SPARSE_PATTERNS__).lines.collect{|str| str.chomp.gsub(/^ */, ' ')}.join,
             tool/param/
             tool/util/text_helper.h
+            tool/util/bit_counter.h
             tool/algorithm/integral.h
             tool/algorithm/interpolate.h
             tool/navigation/GPS*

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
@@ -91,23 +92,7 @@ files.collect!{|fname, ftype|
 rcv = GPS_PVT::Receiver::new(options)
 
 proc{|src|
-  next unless src
-  loader = proc{|t_meas|
-    utc = Time::utc(*t_meas.c_tm)
-    y, yday = [:year, :yday].collect{|f| utc.send(f)}
-    uri = URI::parse(
-        "ftp://gssc.esa.int/gnss/data/daily/" + 
-          "%04d/brdc/BRDC00IGS_R_%04d%03d0000_01D_MN.rnx.gz"%[y, y, yday])
-    rcv.parse_rinex_nav(uri)
-    uri
-  }
-  run_orig = rcv.method(:run)
-  eph_list = {}
-  rcv.define_singleton_method(:run){|meas, t_meas, *args|
-    w_d = [t_meas.week, (t_meas.seconds.to_i / 86400)]
-    eph_list[w_d] ||= loader.call(t_meas)
-    run_orig.call(meas, t_meas, *args)
-  }
+  rcv.attach_online_ephemeris(src) if src
 }.call(misc_options[:online_ephemeris])
 
 proc{

data/exe/to_ubx

@@ -21,7 +21,9 @@ __STRING__
 
 options = []
 misc_options = {
-  :ubx_rawx => false
+  :broadcast_data => false,
+  :ubx_rawx => false,
+  :eph_interval => 60 * 5,
 }
 
 # check options and file format
@@ -53,7 +55,7 @@ files.collect!{|fname, ftype|
 
 options.reject!{|opt|
   case opt[0]
-  when :ubx_rawx
+  when :ubx_rawx, :online_ephemeris, :broadcast_data, :eph_interval
     misc_options[opt[0]] = opt[1]
     true
   else
@@ -68,6 +70,10 @@ rcv.define_singleton_method(:run){|meas, t_meas, *args|
   obs << [t_meas, meas]
 }
 
+proc{|src|
+  rcv.attach_online_ephemeris(src) if src
+}.call(misc_options[:online_ephemeris])
+
 # parse RINEX NAV
 files.each{|fname, ftype|
   case ftype
@@ -84,6 +90,92 @@ files.each{|fname, ftype|
 
 obs.sort!{|a, b| a[0] <=> b[0]} # Sort by measurement time
 
+# Add dummy before actual first observation in order to notify time to solver
+obs.unshift([obs[0][0] - 1, GPS_PVT::GPS::Measurement::new])
+
+gen_sfrb, gen_sfrbx = proc{
+  cache = {}
+  sfrb_tmpl = [0xB5, 0x62, 0x02, 0x11, 0, 0]
+  sfrb_tmpl += [0, 0] # ch, id
+  sfrbx_tmpl = [0xB5, 0x62, 0x02, 0x13, 0, 0]
+  sfrbx_tmpl += [0, 0, 0, 0, 0, 0, 2, 0] # version = 2
+  iono_utc = rcv.solver.gps_space_node.iono_utc.instance_eval{
+    f_orig = method(:dump)
+    define_singleton_method(:dump){|t_meas|
+      rcv.solver.gps_space_node.is_valid_iono_utc ? f_orig.call(t_meas) : []
+    }
+    self
+  }
+  [proc{|t_meas, meas| # Convert to RXM-SFRB(0x11)
+    meas.collect{|sat, items|
+      t_prv, eph, ch = cache.include?(sat) ? cache[sat] : []
+      next nil if t_prv && (t_meas - t_prv < misc_options[:eph_interval])
+      sfrb = sfrb_tmpl.clone
+      sfrb[6] = (ch ||= (cache.size % 0x100))
+      sfrb[7] = sat
+      res = case sat
+      when 1..32 # GPS
+        next nil unless (eph = rcv.ephemeris(t_meas, :GPS, sat))
+        (eph.dump(t_meas) + iono_utc.dump(t_meas)).each_slice(10).collect{|subframe|
+          ubx = sfrb + subframe.collect{|word|
+            word >> 6
+          }.pack("V*").unpack("C*") + [0, 0]
+          GPS_PVT::UBX::update(ubx)
+        }
+      when 120..158 # SBAS
+        next nil unless (eph = rcv.ephemeris(t_meas, :SBAS, sat))
+        ubx = sfrb + proc{|msg|
+            msg[7] >>= 6
+            msg
+          }.call(eph.dump + [0, 0]).pack("V*").unpack("C*") + [0, 0]
+        GPS_PVT::UBX::update(ubx)
+      else
+        next nil
+      end
+      cache[sat] = [t_meas, eph, ch]
+      res
+    }.compact.flatten.pack("C*")
+  },
+  proc{|t_meas, meas| # Convert to RXM-SFRBX(0x13)
+    meas.collect{|sat, items|
+      t_prv, eph, ch = cache.include?(sat) ? cache[sat] : []
+      next nil if t_prv && (t_meas - t_prv < misc_options[:eph_interval])
+      sfrbx = sfrbx_tmpl.clone
+      
+      res = case sat
+      when 1..32, 193..202 # GPS, QZSS
+        sys = sat <= 32 ? :GPS : :QZSS
+        next nil unless (eph = rcv.ephemeris(t_meas, sys, sat))
+        sfrbx[6..7] = [GPS_PVT::UBX::GNSS_ID[sys], sys == :QZSS ? (sat - 192) : sat] # sys, id
+        sfrbx[10] = 10 # words
+        sfrbx[11] = (ch ||= (cache.size % 0x100)) # ch
+        (eph.dump(t_meas) + iono_utc.dump(t_meas)).each_slice(10).collect{|subframe|
+          GPS_PVT::UBX::update(sfrbx + subframe.pack("V*").unpack("C*") + [0, 0])
+        }
+      when 120..158 # SBAS
+        next nil unless (eph = rcv.ephemeris(t_meas, :SBAS, sat))
+        sfrbx[6..7] = [GPS_PVT::UBX::GNSS_ID[:SBAS], sat] # sys, id
+        sfrbx[10] = 8 # words
+        sfrbx[11] = (ch ||= (cache.size % 0x100)) # ch
+        GPS_PVT::UBX::update(sfrbx + eph.dump.pack("V*").unpack("C*") + [0, 0])
+      when (0x100 + 1)..(0x100 + 32) # GLONASS
+        svid = sat - 0x100
+        next nil unless (eph = rcv.ephemeris(t_meas, :GLONASS, svid))
+        sfrbx[6..7] = [GPS_PVT::UBX::GNSS_ID[:GLONASS], svid] # sys, id
+        sfrbx[10] = 4 # words
+        sfrbx[11] = (ch ||= (cache.size % 0x100)) # ch
+        eph.dump(t_meas).each_slice(3).collect{|str|
+          GPS_PVT::UBX::update(sfrbx + (str + [0]).pack("V*").unpack("C*") + [0, 0])
+        }
+      else
+        next nil
+      end
+      cache[sat] = [t_meas, eph, ch]
+      res
+    }.compact.flatten.pack("C*")
+  }]
+}.call
+
 glonass_freq_ch = proc{
   freq0, delta = [:L1_frequency_base, :L1_frequency_gap].collect{|k|
     GPS_PVT::GPS::SpaceNode_GLONASS.send(k)
@@ -92,7 +184,6 @@ glonass_freq_ch = proc{
 }.call
 
 gen_raw = proc{|t_meas, meas| # Convert to RXM-RAW(0x10)
-  meas = meas.to_hash
   ubx = [0xB5, 0x62, 0x02, 0x10, 0, 0]
   ubx += [(t_meas.seconds * 1E3).to_i, t_meas.week].pack("Vv").unpack("C*")
   ubx += [0] * 2
@@ -142,7 +233,6 @@ gen_raw = proc{|t_meas, meas| # Convert to RXM-RAW(0x10)
 }
 
 gen_rawx = proc{|t_meas, meas| # Convert to RXM-RAWX(0x15)
-  meas = meas.to_hash
   ubx = [0xB5, 0x62, 0x02, 0x15, 0, 0]
   ubx += [t_meas.seconds, t_meas.week].pack("Ev").unpack("C*")
   ubx += [0] * 6
@@ -170,7 +260,7 @@ gen_rawx = proc{|t_meas, meas| # Convert to RXM-RAWX(0x15)
       [5, sat]
     when (0x100 + 1)..(0x100 + 32) # GLONASS
       setter.call(:L1_FREQUENCY,
-          39, 1, nil, proc{|v| v.replace(v[0] ? glonass_freq_ch.call(v[0]) : [7])})
+          39, 1, nil, proc{|v| v.replace([(v[0] ? glonass_freq_ch.call(v[0]) : 0) + 7])} )
       [6, sat - 0x100]
     else
       next nil # TODO Galileo, Beidou, ...
@@ -185,7 +275,7 @@ gen_rawx = proc{|t_meas, meas| # Convert to RXM-RAWX(0x15)
           b = (Math::log2(v[0] / 1E-2).to_i & 0xF) rescue 0x8
           v.replace((trk_stat & 0x1 == 0x1) ? [b] : [])
         })
-    setter.call(:L1_DOPPLER, 32, 4, "e")
+    setter.call(:L1_DOPPLER, 32, 4, "e") rescue next nil
     setter.call(:L1_DOPPLER_SIGMA,
         45, 1, nil, proc{|v| v.replace(v[0] ? [Math::log2(v[0] / 2E-3).to_i & 0xF] : [0x8])})
     setter.call(:L1_CARRIER_PHASE,
@@ -209,6 +299,11 @@ gen_rawx = proc{|t_meas, meas| # Convert to RXM-RAWX(0x15)
   GPS_PVT::UBX::update(ubx).pack("C*")
 }
 
-gen = misc_options[:ubx_rawx] ? gen_rawx : gen_raw
+gen_list = []
+gen_list << (misc_options[:ubx_rawx] ? gen_sfrbx : gen_sfrb) if misc_options[:broadcast_data]
+gen_list << (misc_options[:ubx_rawx] ? gen_rawx : gen_raw)
 STDOUT.binmode
-obs.each{|*item| print gen.call(*item)}
+obs.each{|t_meas, meas|
+  meas2 = meas.to_hash
+  gen_list.each{|gen| print gen.call(t_meas, meas2)}
+}