spektrum-log 0.0.13 → 0.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3273a5b15027e4c72b4447bd283dc345dd4dc005
+  data.tar.gz: ed6cde1b8223a9cd2191c940a297c503748951c9
+SHA512:
+  metadata.gz: bcda6474caa68201bef60f8b99533b41a6b5d8ae10e3b562660930af6015b6b826f415f5b0cec0c1bd77659cc19f425f439fedc50e8854061c87e413081d50e6
+  data.tar.gz: 0a9ae4eec82b6792136d301e8435e29e14eee18de7158e0f6052b4fdc9c63075e8013dfcd4ba7c6d72f16b3735fc7568aca7f5188c984cbbafc84523c568ee90

data/lib/spektrum/log/records.rb

@@ -193,12 +193,17 @@ module Spektrum
       def longitude
         elements = 10.downto(7).map { |i| hex_byte_field(i) }
 
-        # 100+ longitude indicator guesses
-        #  - upper nybble of 13th byte seemed right, nope...
-        #  - current guess: 2nd bit of 14th byte...
-        elements = [((byte_field(14) & 0x04) == 0x04) ? 1 : 0, elements].flatten
+        # 100+ longitude indicator guesses (X marks proven invalid guess):
+        #  X upper nybble of 13th byte
+        #  - 2nd bit of 14th byte
+        hundreds = ((byte_field(14) & 0x04) == 0x04) ? 1 : 0
 
-        @longitude ||= convert_latlon(elements)
+        # +/- longitude indicator guesses (X marks proven invalid guess):
+        #  - 1st bit of 14th byte (1 - pos, 0 - neg)
+        multiplier = ((byte_field(14) & 0x02) == 0x02) ? 1 : -1
+
+        elements = [hundreds, elements].flatten
+        @longitude ||= multiplier * convert_latlon(elements)
       end
 
       def coordinate

data/lib/spektrum/log/version.rb

@@ -1,5 +1,5 @@
 module Spektrum
   module Log
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

data/spec/flight_spec.rb

@@ -390,4 +390,28 @@ describe Spektrum::Log::Flight do
 
   end
 
+  context 'data file X5-GPS1.TLM' do
+
+    let(:reader) { Spektrum::Log::Reader.new(data_file('X5-GPS1.TLM')) }
+
+    its 'flights should contain some gps coordinates' do
+
+      reader.flights.select { |f| f.gps1_records? }.should have(4).flights
+
+    end
+
+    its 'longitudes should all be negative' do
+
+      reader.flights.each do |flight|
+
+        flight.gps1_records.each do |gps1|
+          gps1.longitude.should be < 0.0
+        end
+
+      end
+
+    end
+
+  end
+
 end

data/spec/gps_record1_spec.rb

@@ -94,4 +94,40 @@ describe Spektrum::Log::GPSRecord1 do
 
   end
 
+  context 'data set 6' do
+
+    let(:raw_data) { ["007430561011417459009672350939"].pack('H*') }
+
+    its(:altitude) { should be_within(0.1).of(1008.5) }
+
+    it 'should allow altitude in meters' do
+      subject.altitude(:meters).should be_within(0.1).of(307.4)
+    end
+
+    its(:heading) { should be_within(0.1).of(357.2)}
+
+    its(:latitude) { should be_within(0.000001).of(41.185093) }
+
+    its(:longitude) { should be_within(0.000001).of(-96.009956) }
+
+  end
+
+  context 'data set 7' do
+
+    let(:raw_data) { ["005518231111415959009602100939"].pack('H*') }
+
+    its(:altitude) { should be_within(0.1).of(608.6) }
+
+    it 'should allow altitude in meters' do
+      subject.altitude(:meters).should be_within(0.1).of(185.5)
+    end
+
+    its(:heading) { should be_within(0.1).of(100.2)}
+
+    its(:latitude) { should be_within(0.000001).of(41.185205) }
+
+    its(:longitude) { should be_within(0.000001).of(-96.009932) }
+
+  end
+
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.0.13
-  prerelease: 
+  version: 0.0.14
 platform: ruby
 authors:
 - Nick Veys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,55 +83,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_kml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -175,6 +156,7 @@ files:
 - data/4.TLM
 - data/GPS.TLM
 - data/GPS2.TLM
+- data/X5-GPS1.TLM
 - lib/spektrum/log.rb
 - lib/spektrum/log/flight.rb
 - lib/spektrum/log/headers.rb
@@ -192,33 +174,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1818794528585278686
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1818794528585278686
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Spektrum TLM log file reader
 test_files:
 - spec/basic_data_record_spec.rb