spektrum-log 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d12a83ac543c601321ea4e302f68675bac9fe13c
-  data.tar.gz: e92ea2f69badd802397c35324fc7167edc4907d5
+  metadata.gz: 29e09913bbcf8a10fdf8ca401cdd3d8560eb76e5
+  data.tar.gz: 996e2b67693ebbf1a22dc68bafb074647c592cc9
 SHA512:
-  metadata.gz: 9fb5e5cad6d308a92031d7c2b90c77008eec37d401aa6f854f26eaac99510954fa9f7394eb0b9c8008e01578f59d52ae86bf1b19e0e23cc372713e94ef452bb0
-  data.tar.gz: 0d8c3a79b51fb6f9a38d8a0ddf391e61517e495adf433d295d9751bbb63937911c65cdf723d09650cc9a7d5133546f8ddce752dfd6a6203b3216990a6352ec48
+  metadata.gz: 01a4d6d4f016ce368b756cee96afcfe45df6dce84fdd49dd9a0a0ada5ecbc1452f3af1fb74db5bab44d0f419eee8e0c676d1376a6cddb61290586a46abc3f099
+  data.tar.gz: f2d43b65a285a547c89cbf4c2f60cfe4047f499b65144afc5f1fe25c96e7f8d40f223f83d747bf1a66ffedaa09fea2789993c8ee43517451024e172207e986ff

data/lib/spektrum/log/records.rb

@@ -185,9 +185,10 @@ module Spektrum
       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
+        # 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
 
         @longitude ||= convert_latlon(elements)
       end

data/lib/spektrum/log/version.rb

@@ -1,5 +1,5 @@
 module Spektrum
   module Log
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

data/spec/flight_spec.rb

@@ -342,4 +342,38 @@ describe Spektrum::Log::Flight do
 
   end
 
+  context 'data file GPS2.TLM' do
+
+    let(:reader) { Spektrum::Log::Reader.new(data_file('GPS2.TLM')) }
+
+    context 'flight 1' do
+
+      subject { reader.flights[0] }
+
+      its(:duration) { should be_within(1).of(129) }
+
+      its(:gps1_records?) { should be_true }
+
+      its(:gps2_records?) { should be_true }
+
+      its(:to_kml?) { should be_true }
+
+    end
+
+    context 'flight 2' do
+
+      subject { reader.flights[1] }
+
+      its(:duration) { should be_within(1).of(89) }
+
+      its(:gps1_records?) { should be_true }
+
+      its(:gps2_records?) { should be_true }
+
+      its(:to_kml?) { should be_true }
+
+    end
+
+  end
+
 end

data/spec/gps_record1_spec.rb

@@ -76,4 +76,22 @@ describe Spektrum::Log::GPSRecord1 do
 
   end
 
+  context 'data set 5' do
+
+    let(:raw_data) { ["00142125250249434045084625183B"].pack('H*') }
+
+    its(:altitude) { should be_within(0.1).of(693.6) }
+
+    it 'should allow altitude in meters' do
+      subject.altitude(:meters).should be_within(0.1).of(211.4)
+    end
+
+    its(:heading) { should be_within(0.1).of(254.6)}
+
+    its(:latitude) { should be_within(0.000001).of(49.037542) }
+
+    its(:longitude) { should be_within(0.000001).of(8.756738) }
+
+  end
+
 end

data/spec/reader_spec.rb

@@ -52,6 +52,16 @@ describe Spektrum::Log::Reader do
 
   end
 
+  context 'data file GPS2.TLM' do
+
+    subject { Spektrum::Log::Reader.new(data_file('GPS2.TLM')) }
+
+    it { should have(2).flights }
+
+    its(:duration) { should be_within(0.1).of(217.8) }
+
+  end
+
   it 'should raise on bad input' do
     expect { Spektrum::Log::Reader.new(__FILE__) }.to raise_error
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Nick Veys
@@ -155,6 +155,7 @@ files:
 - data/3.TLM
 - data/4.TLM
 - data/GPS.TLM
+- data/GPS2.TLM
 - lib/spektrum/log.rb
 - lib/spektrum/log/flight.rb
 - lib/spektrum/log/headers.rb