cycle_analyst_logger 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 271a460b2211a9d5021cc3994a43ed5380cbeb43
-  data.tar.gz: 3ad2cd453f30f2f6809864578967d0f6cbe3f368
+  metadata.gz: 1367340367d973de5b63973f2af651b5a907d048
+  data.tar.gz: 6c14e4394c0e0eb83294253cfdb6bac485d33dd3
 SHA512:
-  metadata.gz: a49ee57ab3196de2b29bcfad840a932ad17640490da5434cff0ee52ca85b3e4e7e262b29033709deb15803f01c01c25d04e8fcf6724b7b7438f25b77b26745d4
-  data.tar.gz: 59882320fe416ab40be3170d398c38598025ff454565d463d49b30f797138f0bcf2a2dbe0fc8f3fcbfb79b2a54f3f3abf73d7af6405e4d38251b0e3aab62ce44
+  metadata.gz: 3f56db0c688121fcf5380f92a72aa43aed397f0ef8ce68637a7e833ae0062a482d770fb74e7478578fbd67e5fd3522cca96729b71dc0a60a8a2ec13cf7203835
+  data.tar.gz: 162e630601963320a6d64203f91ee9b5516cc6171d47019d00b7c97abb77455bee3c3624aab70a3a4b1e78270e45af916620aa953d16bd7f62e44ff32e30b118

data/.gitignore

@@ -38,4 +38,5 @@ Gemfile.lock
 *.csv
 *.log
 nmea.*.txt
-/LOCAL/
+/LOCAL/
+.DS_Store

data/README.rdoc

@@ -8,9 +8,16 @@
 == SYNOPSIS
     cycle_analyst_logger [global options] command [command options] [arguments...]
     cycle_analyst_logger [global options] log [tty] [baudrate] [enable_phaserunner] [tty] [baudrate]
+    cycle_analyst_logger [global options] to_ca_file log_filename
 
 == Notes
-Only tested with {Navspark-BD GPS}[http://navspark.mybigcommerce.com/navspark-bd-arduino-compatible-development-board-with-gps-beidou/]
+
+* Only tested with {Navspark-BD GPS}[http://navspark.mybigcommerce.com/navspark-bd-arduino-compatible-development-board-with-gps-beidou/]
+* Does not yet apply scaling factors to the Phaserunner data
+* Log output file is CSV with CA, Phaserunner and GPS Data per line
+* Also outputs the raw NMEA GPS file so that it can be read into {Grin Trip Analyzer}[http://www.ebikes.ca/tools/trip-analyzer.html]
+* The +to_ca_file+ command  converts the default log output file to a CALog file suitable for inputing to {Grin Trip Analyzer}[http://www.ebikes.ca/tools/trip-analyzer.html]
+* Sometimes the Trip Analyzer barfs on the NMEA file
 
 == GLOBAL OPTIONS
     -t, --tty_ca=arg          - Cycle Analyst Serial (USB) device (default: /dev/cycle_analyst)
@@ -29,6 +36,7 @@ Only tested with {Navspark-BD GPS}[http://navspark.mybigcommerce.com/navspark-bd
 == COMMANDS
     help - Shows a list of commands or help for one command
     log  - Capture the logging output of the Cycle Analyst and optionally Phaserunner to a file
+    to_ca_file - Transform logs to CA format
 
 === Attributes that are Logged
 
@@ -75,7 +83,7 @@ Only tested with {Navspark-BD GPS}[http://navspark.mybigcommerce.com/navspark-bd
 
 == Udev set up
 
-A sampe udev rules file is in +resources/99-cycle_analyst.rules+. It is based on
+A sample udev rules file is in +resources/99-cycle_analyst.rules+. It is based on
 the information from {Persistent names for usb-serial
 devices}[http://hintshop.ludvig.co.nz/show/persistent-names-usb-serial-devices/]
 

data/cycle_analyst_logger.rdoc

@@ -1,6 +1,6 @@
 == cycle_analyst_logger - Store the streaming data log output of a Grin Cycle Analyst V3 and optionally a Phaserunner
 
-v0.3.3
+v0.3.5
 
 === Global Options
 === -b|--baud_ca arg
@@ -98,3 +98,7 @@ Disable writing raw nmea to its own file
 
 
 
+==== Command: <tt>to_ca_file  log_filename</tt>
+Transform logs to CA format
+
+

data/lib/cycle_analyst_logger/cycle_analyst.rb

@@ -2,6 +2,12 @@ require 'time'
 require 'serialport'
 require 'phaserunner'
 
+class String
+  def is_number?
+    true if Float(self) rescue false
+  end
+end
+
 module CycleAnalystLogger
   class CycleAnalyst
     # Cycle Analyst serial port Baudrate
@@ -128,7 +134,6 @@ module CycleAnalystLogger
         )
 
         output += phaserunner.bulk_log_data if enable_phaserunner
-        #puts "gps_data: #{gps.log_data.inspect}"
         output += gps.log_data if enable_gps
 
         output_line = output.flatten.join(',')
@@ -148,6 +153,16 @@ module CycleAnalystLogger
       end
     end
 
+    # Very basic test that the record is valid
+    def self.validate_log_record(log_record)
+      return false unless valid_timestamp log_record[0]
+      log_record.each.with_index do |element, idx|
+        next if [0,14,29,38].any? { |i| idx == i } #Skip Timestamps and CA Limit value
+        return false unless element.is_number? || element.empty?
+      end
+      true
+    end
+
     def self.log_to_ca_file(log_filename)
       output_filename = log_filename.sub(
         /cycle_analyst\.(\d\d\d\d\-\d\d\-\d\d_\d\d\-\d\d\-\d\d).csv/,
@@ -156,16 +171,15 @@ module CycleAnalystLogger
       out_fd = File.open(output_filename, 'w')
 
       File.readlines(log_filename).each.with_index do |log_line, idx|
-        log_record = log_line.split(',')
+        log_record = log_line.strip.split(',')
         if idx == 0
           out_fd.puts CA_STD_HEADER.join("\t")
           next
         end
 
-        # Check that the line has a valid timestamp, skip this line if it isn't
-        next unless (timestamp = valid_timestamp log_record[0])
-
-        out_fd.puts log_record[1..CA_STD_HEADER.length].join("\t")
+        log_end = CA_STD_HEADER.length
+        log_segment = log_record[1..log_end]
+        out_fd.puts log_segment.join("\t") if validate_log_record(log_record)
       end
     end
   end

data/lib/cycle_analyst_logger/version.rb

@@ -1,3 +1,3 @@
 module CycleAnalystLogger
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cycle_analyst_logger
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Robert J. Berger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli