spektrum-log 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dec4a1dd92edda247f52253077d7250e8c75ee85
+  data.tar.gz: 2fb34f2061464fded588dad071da60f6e8ebfc85
+SHA512:
+  metadata.gz: 962ebb95317415c1e7493fd3a9309f02019387fc5eb9858b61ef54177f6d279882c073b49367fa9e656e13e947b6ac774727d37dc2910818318accfee30c1944
+  data.tar.gz: e1055ef8478a79ea14fc67a94d23a25c7e64142d398641609e4e6378deb6b156758b61a4a5ccb4d70bfbb458d7a64ad84ccbbe7825a53f5c076ee16856c95185

data/lib/spektrum/log/flight.rb

@@ -51,7 +51,7 @@ module Spektrum
       #
       # @return [String] model name
       def model_name
-        @model_name ||= @headers.first.raw_data[8..18].unpack('Z*')[0].strip
+        @model_name ||= @headers.first.raw_data[8..27].unpack('Z*')[0].strip
       end
 
       # Gets the model's index from the transmitter.

data/lib/spektrum/log/records.rb

@@ -175,13 +175,20 @@ module Spektrum
         end
       end
 
+      # + N, - S
       def latitude
         elements = 6.downto(3).map { |i| hex_byte_field(i) }
-        @latitude ||= convert_latlon(elements)
+        @latitude ||= convert_latlon([0, elements].flatten)
       end
 
+      # + E, - W
       def longitude
         elements = 10.downto(7).map { |i| hex_byte_field(i) }
+
+        # upper nybble of 13th byte seems to change when 100+ longitude
+        # is encountered...  this is a guess!!!
+        elements = [byte_field(13) >> 4, elements].flatten
+
         @longitude ||= convert_latlon(elements)
       end
 
@@ -196,8 +203,8 @@ module Spektrum
       private
 
       def convert_latlon elts
-        raise ArgumentError unless elts.length == 4
-        elts[0] + ("#{elts[1]}.#{elts[2]}#{elts[3]}".to_f / 60.0)
+        raise ArgumentError unless elts.length == 5
+        elts[0] * 100 + elts[1] + ("#{elts[2]}.#{elts[3]}#{elts[4]}".to_f / 60.0)
       end
 
     end

data/lib/spektrum/log/version.rb

@@ -1,5 +1,5 @@
 module Spektrum
   module Log
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/spec/flight_spec.rb

@@ -82,12 +82,54 @@ describe Spektrum::Log::Flight do
 
       its(:bind_type) { should eql('DSMX') }
 
-      its(:model_name) { should eql('Voodoo 600') }
+      its(:model_name) { should eql('Voodoo 600 SK540') }
 
       its(:model_number) { should eql(1) }
 
       its(:model_type) { should eql('Helicopter') }
 
+      its(:to_kml?) { should be_false }
+
+    end
+
+    context 'flight 305' do
+
+      subject { reader.flights[304] }
+
+      its(:model_name) { should eql('ERW|N XL ULTRALIGHT') }
+
+      its(:to_kml?) { should be_true }
+
+    end
+
+    context 'flight 306' do
+
+      subject { reader.flights[305] }
+
+      its(:model_name) { should eql('ERW|N XL ULTRALIGHT') }
+
+      its(:to_kml?) { should be_true }
+
+    end
+
+    context 'flight 308' do
+
+      subject { reader.flights[307] }
+
+      its(:model_name) { should eql('ERW|N XL ULTRALIGHT') }
+
+      its(:to_kml?) { should be_true }
+
+    end
+
+    context 'flight 312' do
+
+      subject { reader.flights[311] }
+
+      its(:model_name) { should eql('ERW|N XL ULTRALIGHT') }
+
+      its(:to_kml?) { should be_true }
+
     end
 
   end

data/spec/gps_record1_spec.rb

@@ -18,7 +18,7 @@ describe Spektrum::Log::GPSRecord1 do
       subject.altitude(:meters).should be_within(0.1).of(8.7)
     end
 
-    its(:heading) { should be_within(0.01).of(334.6)}
+    its(:heading) { should be_within(0.1).of(334.6)}
 
     its(:latitude) { should be_within(0.000001).of(54.670307) }
 
@@ -36,7 +36,43 @@ describe Spektrum::Log::GPSRecord1 do
       subject.altitude(:meters).should be_within(0.1).of(26.6)
     end
 
-    its(:heading) { should be_within(0.01).of(303.0)}
+    its(:heading) { should be_within(0.1).of(303.0)}
+
+  end
+
+  context 'data set 3' do
+
+    let(:raw_data) { ["00130052242101046851036804153F"].pack('H*') }
+
+    its(:altitude) { should be_within(0.1).of(4.3) }
+
+    it 'should allow altitude in meters' do
+      subject.altitude(:meters).should be_within(0.1).of(1.3)
+    end
+
+    its(:heading) { should be_within(0.1).of(46.8)}
+
+    its(:latitude) { should be_within(0.000001).of(1.354086) }
+
+    its(:longitude) { should be_within(0.000001).of(103.861399) }
+
+  end
+
+  context 'data set 4' do
+
+    let(:raw_data) { ["00560359222101676651038623141F"].pack('H*') }
+
+    its(:altitude) { should be_within(0.1).of(116.8) }
+
+    it 'should allow altitude in meters' do
+      subject.altitude(:meters).should be_within(0.1).of(35.6)
+    end
+
+    its(:heading) { should be_within(0.1).of(238.6)}
+
+    its(:latitude) { should be_within(0.000001).of(1.353765) }
+
+    its(:longitude) { should be_within(0.000001).of(103.861111) }
 
   end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - Nick Veys
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !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,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !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
@@ -191,27 +172,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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+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
@@ -221,3 +201,4 @@ test_files:
 - spec/gps_record2_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb
+has_rdoc: