cycle_analyst_logger 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b86d3ddae10152675800b27ac5f8bf912ea5ac
-  data.tar.gz: 270d41a27b722386113154d05fc89c32740375c5
+  metadata.gz: 3e885a854ee604b2fcc3de0f076020ad88e30972
+  data.tar.gz: 938b370409f465698bbd7f2bde1706c4280b13b8
 SHA512:
-  metadata.gz: 5401db314c8ef3b9721834c8a02005bd52041891e394c22fa8a328e52456e12ff2182a3ed836e8faf6f32b41cddac57298b6dc075e0cd9e8c6771d947de291ef
-  data.tar.gz: b1504aef4be175e8a9226a2e0785aef2badbc6d4c15d06dd63b02c2284c2d954dac07816c6c577ffca3a0e14c727bc1cce79e7879700756b86e899eed5c9bd98
+  metadata.gz: ebbdd12998582bdce46f83954b3972efd2b94279d2e54386723cd75eb3e73d034b4a0a81ef59c75f775284d15242b09b7cc01678010c163811b280b4294e7eb9
+  data.tar.gz: d63f206c042bce110754866f846cd2b68b306741082bbcdca8eb06650a6ec8bc8ce983e069cc455fccfca97ab93f31c64b2eb9362c6e6c0389d09718460e72f7

data/.gitignore

@@ -37,3 +37,4 @@ Gemfile.lock
 
 *.csv
 *.log
+nmea.*.txt

data/lib/cycle_analyst_logger/cli.rb

@@ -71,9 +71,12 @@ module CycleAnalystLogger
 
       desc 'Log the Cycle Analyst and optionally GPS and Phaserunner to a file'
       command :log do |log|
+        log.desc 'Disable writing raw nmea to its own file'
+        log.default_value false
+        log.switch [:disable_nmea_out]
         log.action do |global_options, options, args|
           cycle_analyst = CycleAnalyst.new(global_options)
-          cycle_analyst.get_logs(loop_count, quiet)
+          cycle_analyst.get_logs(loop_count, quiet, options[:disable_nmea_out])
         end
       end
 

data/lib/cycle_analyst_logger/cycle_analyst.rb

@@ -97,11 +97,20 @@ module CycleAnalystLogger
     # @param output_fd [File] File Descriptor of the output file to write to. Don't write to file if nil
     # @param loop_count [Integer, Symbol] Number of lines to output, or forever if :forever
     # @param quite [Boolean] Don't output to stdout if true
-    def get_logs(loop_count, quiet)
-      filename = "cycle_analyst.#{Time.now.strftime('%Y-%m-%d_%H-%M-%S')}.csv"
+    def get_logs(loop_count, quiet, disable_nmea_out)
+      timestamp = Time.now.strftime('%Y-%m-%d_%H-%M-%S')
+      filename = "cycle_analyst.#{timestamp}.csv"
       output_fd = File.open(filename, 'w')
 
-      gps_thread = Thread.new { gps.run } if enable_gps
+      if enable_gps
+        unless disable_nmea_out
+          nmea_filename = "nmea.#{timestamp}.txt"
+          nmea_fd = File.open(nmea_filename, 'w')
+        else
+          nmea_fd = nil
+        end
+        gps_thread = Thread.new { gps.run(nmea_fd, disable_nmea_out) }
+      end
 
       line_number = 0
       hdr = %Q(Timestamp,#{log_header})

data/lib/cycle_analyst_logger/gps.rb

@@ -41,10 +41,11 @@ module CycleAnalystLogger
       @source_decoder = NMEAPlus::SourceDecoder.new(@serial_io)
     end
 
-    def run
+    def run(fd = nil, disable_nmea_out = false)
       source_decoder.each_complete_message do |message|
-        case message.data_type
-        when 'GNGGA'
+        fd.puts message.original.strip unless disable_nmea_out
+        case message.data_type[2..-1] # Ignore the first two letters
+        when 'GGA'
           pre_data[:time] = message.fix_time
           pre_data[:latitude] = message.latitude
           pre_data[:longitude] = message.longitude
@@ -55,7 +56,7 @@ module CycleAnalystLogger
           pre_data[:horizontal_dilution] = message.horizontal_dilution
           pre_data[:satellites] = message.satellites
           pre_data[:seconds_since_last_update] = message.seconds_since_last_update
-        when 'GNVTG'
+        when 'VTG'
           pre_data[:speed_kmh] = message.speed_kmh
           pre_data[:speed_knots] = message.speed_knots
           pre_data[:faa_mode] = message.faa_mode

data/lib/cycle_analyst_logger/version.rb

@@ -1,3 +1,3 @@
 module CycleAnalystLogger
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cycle_analyst_logger
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Robert J. Berger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli