spektrum-log 0.0.14 → 0.0.15

data/lib/spektrum/log/flight.rb

@@ -22,7 +22,7 @@ module Spektrum
       #
       # @return [Float] duration of the flight, in seconds
       def duration
-        @duration ||= ((@records.empty? ? 0.0 : @records.last.timestamp - @records.first.timestamp) / 1000.0)
+        @duration ||= timestamp_delta / time_divisor
       end
 
       # Determines if this flight has any data.  Models without telemetry
@@ -75,6 +75,32 @@ module Spektrum
                         end
       end
 
+      # Gets the type of telemetry unit that sent the data.
+      #
+      # @return [String] telemetry unit
+      def telemetry_unit
+        @telemetry_unit ||= derive_telemetry_unit
+      end
+
+      def time_divisor
+        @time_divisor ||= case telemetry_unit
+                          when 'TM1000'
+                            256.0
+                          when 'TM1100'
+                            1024.0
+                          else
+                            1.0
+                          end
+      end
+
+      # Gets the difference between the last and the first timestamps.  May
+      # be zero if no records exist.
+      #
+      # @return [Number] difference between the last and first timestamp
+      def timestamp_delta
+        @timestamp_delta ||= @records.empty? ? 0.0 : (@records.last.timestamp - @records.first.timestamp)
+      end
+
       def altimeter_records?
         any_records? AltimeterRecord
       end
@@ -178,6 +204,13 @@ module Spektrum
         @records.any? { |rec| rec.is_a?(type) && rec.valid? }
       end
 
+      def derive_telemetry_unit
+        return "None" unless basic_data_records? && flight_log_records?
+        key = [basic_data_records.first.type, flight_log_records.first.type]
+        types = { [0x7E, 0x7F] => 'TM1000', [0xFE, 0xFF] => 'TM1100' }
+        types.fetch(key, 'Unknown')
+      end
+
       def select_records(type)
         @records.select { |rec| rec.is_a?(type) && rec.valid? }
       end

data/lib/spektrum/log/reader.rb

@@ -41,9 +41,9 @@ module Spektrum
 
               headers_complete = rest.unpack('S')[0] == 0x1717
             else
-              type = file.read(1).unpack('C')[0]
-              rest = file.read(15)
-              records << Records.create(type, first, rest)
+              data = file.read(16)
+              type = data[0].unpack('C')[0]
+              records << Records.create(type, first, data)
             end
           end
         end

data/lib/spektrum/log/records.rb

@@ -7,13 +7,17 @@ module Spektrum
       attr_reader :timestamp
 
       def initialize timestamp, raw_data
-        if raw_data.length != 15
+        if raw_data.length != 16
           raise ArgumentError, "raw_data incorrectly sized (#{raw_data.length})"
         end
         @timestamp = timestamp
         @raw_data = raw_data
       end
 
+      def type
+        @type ||= byte_field(0)
+      end
+
       # Determines if this record should be considered valid.  Definitions of valid
       # will vary by the type of record.
       #
@@ -49,7 +53,7 @@ module Spektrum
       end
 
       def altitude
-        @altitude ||= two_byte_field(1..2)
+        @altitude ||= two_byte_field(2..3)
       end
 
     end
@@ -77,7 +81,7 @@ module Spektrum
       end
 
       def temperature unit = :f
-        @temperature ||= two_byte_field(5..6)
+        @temperature ||= two_byte_field(6..7)
         case unit
         when :f
           @temperature
@@ -95,11 +99,11 @@ module Spektrum
       private
 
       def raw_rpm
-        @raw_rpm ||= two_byte_field(1..2)
+        @raw_rpm ||= two_byte_field(2..3)
       end
 
       def raw_voltage
-        @raw_voltage ||= two_byte_field(3..4)
+        @raw_voltage ||= two_byte_field(4..5)
       end
 
     end
@@ -127,7 +131,7 @@ module Spektrum
       private
 
       def raw_rx_voltage
-        @raw_rx_voltage ||= two_byte_field(13..14)
+        @raw_rx_voltage ||= two_byte_field(14..15)
       end
 
     end
@@ -139,27 +143,27 @@ module Spektrum
       end
 
       def x
-        @x ||= two_byte_field(1..2)
+        @x ||= two_byte_field(2..3)
       end
 
       def y
-        @y ||= two_byte_field(3..4)
+        @y ||= two_byte_field(4..5)
       end
 
       def z
-        @z ||= two_byte_field(5..6)
+        @z ||= two_byte_field(6..7)
       end
 
       def x_max
-        @x_max ||= two_byte_field(7..8)
+        @x_max ||= two_byte_field(8..9)
       end
 
       def y_max
-        @y_max ||= two_byte_field(9..10)
+        @y_max ||= two_byte_field(10..11)
       end
 
       def z_max
-        @z_max ||= two_byte_field(11..12)
+        @z_max ||= two_byte_field(12..13)
       end
 
     end
@@ -172,7 +176,7 @@ module Spektrum
 
       # :feet, :meters
       def altitude unit = :feet
-        @altitude ||= (hex_byte_field(2) * 100) + hex_byte_field(1)
+        @altitude ||= (hex_byte_field(3) * 100) + hex_byte_field(2)
         case unit
         when :feet
           @altitude * 0.32808399
@@ -185,22 +189,22 @@ module Spektrum
 
       # + N, - S
       def latitude
-        elements = 6.downto(3).map { |i| hex_byte_field(i) }
+        elements = 7.downto(4).map { |i| hex_byte_field(i) }
         @latitude ||= convert_latlon([0, elements].flatten)
       end
 
       # + E, - W
       def longitude
-        elements = 10.downto(7).map { |i| hex_byte_field(i) }
+        elements = 11.downto(8).map { |i| hex_byte_field(i) }
 
         # 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
+        hundreds = ((byte_field(15) & 0x04) == 0x04) ? 1 : 0
 
         # +/- 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
+        multiplier = ((byte_field(15) & 0x02) == 0x02) ? 1 : -1
 
         elements = [hundreds, elements].flatten
         @longitude ||= multiplier * convert_latlon(elements)
@@ -211,7 +215,7 @@ module Spektrum
       end
 
       def heading
-        @heading ||= (hex_byte_field(12) * 10) + (hex_byte_field(11) / 10.0)
+        @heading ||= (hex_byte_field(13) * 10) + (hex_byte_field(12) / 10.0)
       end
 
       def valid?
@@ -235,7 +239,7 @@ module Spektrum
 
       # :knots, :mph, :kph
       def speed unit = :knots
-        @speed ||= (hex_byte_field(2) * 100) + hex_byte_field(1)
+        @speed ||= (hex_byte_field(3) * 100) + hex_byte_field(2)
         case unit
         when :knots
           @speed / 10.0
@@ -249,12 +253,12 @@ module Spektrum
       end
 
       def time
-        elements = 6.downto(3).map { |i| hex_byte_field(i) }
+        elements = 7.downto(4).map { |i| hex_byte_field(i) }
         @time ||= "%.2i:%.2i:%.2i.%.2i" % elements
       end
 
       def satellites
-        @satellites ||= hex_byte_field(7)
+        @satellites ||= hex_byte_field(8)
       end
 
     end
@@ -274,12 +278,11 @@ module Spektrum
       end
 
       def speed
-        @speed ||= two_byte_field(1..2)
+        @speed ||= two_byte_field(2..3)
       end
 
     end
 
-
     class Records
 
       @@types = {

data/lib/spektrum/log/version.rb

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

data/spec/basic_data_record_spec.rb

@@ -4,7 +4,7 @@ describe Spektrum::Log::BasicDataRecord do
 
   let(:timestamp) { 0xC67C0100 }
 
-  let(:raw_data) { ["00FFFF13897FFF0000000000000000"].pack('H*') }
+  let(:raw_data) { ["7E00FFFF13897FFF0000000000000000"].pack('H*') }
 
   subject { Spektrum::Log::BasicDataRecord.new(timestamp, raw_data) }
 
@@ -12,7 +12,7 @@ describe Spektrum::Log::BasicDataRecord do
 
   context 'with only rpm' do
 
-    let(:raw_data) { ["000123FFFF7FFF0000000000000000"].pack('H*') }
+    let(:raw_data) { ["FE000123FFFF7FFF0000000000000000"].pack('H*') }
 
     its(:rpm?) { should be_true }
 
@@ -28,7 +28,7 @@ describe Spektrum::Log::BasicDataRecord do
 
   context 'with only temperature' do
 
-    let(:raw_data) { ["00FFFFFFFF00A10000000000000000"].pack('H*') }
+    let(:raw_data) { ["7E00FFFFFFFF00A10000000000000000"].pack('H*') }
 
     its(:rpm?) { should be_false }
 
@@ -46,7 +46,7 @@ describe Spektrum::Log::BasicDataRecord do
 
   context 'with only voltage' do
 
-    let(:raw_data) { ["00FFFF13897FFF0000000000000000"].pack('H*') }
+    let(:raw_data) { ["FE00FFFF13897FFF0000000000000000"].pack('H*') }
 
     its(:rpm?) { should be_false }
 
@@ -60,7 +60,7 @@ describe Spektrum::Log::BasicDataRecord do
 
   context 'with everything' do
 
-    let(:raw_data) { ["0000A6138900A60000000000000000"].pack('H*') }
+    let(:raw_data) { ["7E0000A6138900A60000000000000000"].pack('H*') }
 
     its(:rpm?) { should be_true }
 

data/spec/flight_log_record_spec.rb

@@ -4,7 +4,7 @@ describe Spektrum::Log::FlightLogRecord do
 
   let(:timestamp) { 0xC67C0101 }
 
-  let(:raw_data) { ["00FFFF13897FFF0000000000000347"].pack('H*') }
+  let(:raw_data) { ["7F00FFFF13897FFF0000000000000347"].pack('H*') }
 
   subject { Spektrum::Log::FlightLogRecord.new(timestamp, raw_data) }
 
@@ -12,7 +12,7 @@ describe Spektrum::Log::FlightLogRecord do
 
   context 'with voltage' do
 
-    let(:raw_data) { ["00FFFF13897FFF0000000000000347"].pack('H*') }
+    let(:raw_data) { ["FF00FFFF13897FFF0000000000000347"].pack('H*') }
 
     its(:rx_voltage?) { should be_true }
 
@@ -22,7 +22,7 @@ describe Spektrum::Log::FlightLogRecord do
 
   context 'without voltage' do
 
-    let(:raw_data) { ["00FFFF13897FFF0000000000007FFF"].pack('H*') }
+    let(:raw_data) { ["7F00FFFF13897FFF0000000000007FFF"].pack('H*') }
 
     its(:rx_voltage?) { should be_false }
 

data/spec/flight_spec.rb

@@ -14,7 +14,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(191).records }
 
-      its(:duration) { should be_within(0.1).of(1.1) }
+      its(:duration) { should be_within(0.1).of(4.5) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -24,6 +24,8 @@ describe Spektrum::Log::Flight do
 
       its(:model_type) { should eql('Fixed Wing') }
 
+      its(:telemetry_unit) { should == 'TM1000' }
+
       its(:gps1_records?) { should be_false }
 
       its(:gps2_records?) { should be_true }
@@ -38,7 +40,9 @@ describe Spektrum::Log::Flight do
 
       it { should have(634).records }
 
-      its(:duration) { should be_within(0.1).of(3.8) }
+      its(:duration) { should be_within(0.1).of(14.8) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
 
       its(:gps1_records?) { should be_true }
 
@@ -54,7 +58,9 @@ describe Spektrum::Log::Flight do
 
       it { should have(641).records }
 
-      its(:duration) { should be_within(0.1).of(3.8) }
+      its(:duration) { should be_within(0.1).of(15.0) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
 
       its(:gps1_records?) { should be_true }
 
@@ -88,6 +94,8 @@ describe Spektrum::Log::Flight do
 
       its(:model_type) { should eql('Helicopter') }
 
+      its(:telemetry_unit) { should == 'TM1100' }
+
       its(:to_kml?) { should be_false }
 
     end
@@ -98,6 +106,8 @@ describe Spektrum::Log::Flight do
 
       its(:model_name) { should eql('ERW|N XL ULTRALIGHT') }
 
+      its(:telemetry_unit) { should == 'TM1000' }
+
       its(:to_kml?) { should be_true }
 
     end
@@ -148,6 +158,8 @@ describe Spektrum::Log::Flight do
 
       its(:duration) { should eql(0.0) }
 
+      its(:telemetry_unit) { should == 'None' }
+
       it { should be_empty }
 
     end
@@ -162,6 +174,8 @@ describe Spektrum::Log::Flight do
 
       its(:duration) { should eql(0.0) }
 
+      its(:telemetry_unit) { should == 'None' }
+
       it { should be_empty }
 
     end
@@ -176,6 +190,8 @@ describe Spektrum::Log::Flight do
 
       its(:duration) { should eql(0.0) }
 
+      its(:telemetry_unit) { should == 'None' }
+
       it { should be_empty }
 
     end
@@ -190,6 +206,8 @@ describe Spektrum::Log::Flight do
 
       its(:duration) { should eql(0.0) }
 
+      its(:telemetry_unit) { should == 'None' }
+
       it { should be_empty }
 
     end
@@ -204,6 +222,8 @@ describe Spektrum::Log::Flight do
 
       its(:duration) { should eql(0.0) }
 
+      its(:telemetry_unit) { should == 'None' }
+
       it { should be_empty }
 
     end
@@ -218,6 +238,8 @@ describe Spektrum::Log::Flight do
 
       its(:duration) { should eql(0.0) }
 
+      its(:telemetry_unit) { should == 'None' }
+
       it { should be_empty }
 
     end
@@ -232,6 +254,8 @@ describe Spektrum::Log::Flight do
 
       its(:duration) { should eql(0.0) }
 
+      its(:telemetry_unit) { should == 'None' }
+
       it { should be_empty }
 
     end
@@ -246,6 +270,8 @@ describe Spektrum::Log::Flight do
 
       its(:duration) { should eql(0.0) }
 
+      its(:telemetry_unit) { should == 'None' }
+
       it { should be_empty }
 
     end
@@ -258,7 +284,9 @@ describe Spektrum::Log::Flight do
 
       it { should have(23155).records }
 
-      its(:duration) { should be_within(1).of(148) }
+      its(:duration) { should be_within(0.1).of(144.8) }
+
+      its(:telemetry_unit) { should == 'TM1100' }
 
       it { should_not be_empty }
 
@@ -280,7 +308,7 @@ describe Spektrum::Log::Flight do
 
       it { should_not be_empty }
 
-      its(:duration) { should be_within(0.1).of(16.3) }
+      its(:duration) { should be_within(0.1).of(15.9) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -290,6 +318,8 @@ describe Spektrum::Log::Flight do
 
       its(:model_type) { should eql('Helicopter') }
 
+      its(:telemetry_unit) { should == 'TM1100' }
+
       its(:altimeter_records?) { should be_false }
 
       its(:basic_data_records?) { should be_true }
@@ -316,7 +346,9 @@ describe Spektrum::Log::Flight do
 
       subject { reader.flights[0] }
 
-      its(:duration) { should be_within(1).of(179) }
+      its(:duration) { should be_within(1).of(697) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
 
       its(:gps1_records?) { should be_true }
 
@@ -334,7 +366,9 @@ describe Spektrum::Log::Flight do
 
       subject { reader.flights[1] }
 
-      its(:duration) { should be_within(1).of(188) }
+      its(:duration) { should be_within(1).of(733) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
 
       its(:gps1_records?) { should be_true }
 
@@ -358,7 +392,9 @@ describe Spektrum::Log::Flight do
 
       subject { reader.flights[0] }
 
-      its(:duration) { should be_within(1).of(129) }
+      its(:duration) { should be_within(1).of(503) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
 
       its(:gps1_records?) { should be_true }
 
@@ -376,7 +412,9 @@ describe Spektrum::Log::Flight do
 
       subject { reader.flights[1] }
 
-      its(:duration) { should be_within(1).of(89) }
+      its(:duration) { should be_within(1).of(347) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
 
       it { should have(4792).gps1_records }
 
@@ -412,6 +450,100 @@ describe Spektrum::Log::Flight do
 
     end
 
+    context 'flight 1' do
+
+      subject { reader.flights[0] }
+
+      its(:duration) { should be_within(0.1).of(318.6) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
+
+    end
+
+    context 'flight 2' do
+
+      subject { reader.flights[1] }
+
+      its(:duration) { should be_within(0.1).of(327.5) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
+
+    end
+
+    context 'flight 3' do
+
+      subject { reader.flights[2] }
+
+      its(:duration) { should be_within(0.1).of(326.5) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
+
+    end
+
+    context 'flight 4' do
+
+      subject { reader.flights[3] }
+
+      its(:duration) { should eql(0.0) }
+
+      its(:telemetry_unit) { should == 'None' }
+
+    end
+
+    context 'flight 5' do
+
+      subject { reader.flights[4] }
+
+      its(:duration) { should be_within(0.1).of(332.6) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
+
+    end
+
+  end
+
+  context 'data file X5-GPS2.TLM' do
+
+    let(:reader) { Spektrum::Log::Reader.new(data_file('X5-GPS2.TLM')) }
+
+    its 'flights should contain some gps coordinates' do
+
+      reader.flights.select { |f| f.gps1_records? }.should have(2).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
+
+    context 'flight 1' do
+
+      subject { reader.flights[0] }
+
+      its(:duration) { should be_within(0.1).of(328.6) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
+
+    end
+
+    context 'flight 2' do
+
+      subject { reader.flights[1] }
+
+      its(:duration) { should be_within(0.1).of(299.1) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
+
+    end
+
   end
 
 end

data/spec/gps_record1_spec.rb

@@ -8,7 +8,7 @@ describe Spektrum::Log::GPSRecord1 do
 
   context 'data set 1' do
 
-    let(:raw_data) { ["00870084214054886918094633093B"].pack('H*') }
+    let(:raw_data) { ["1600870084214054886918094633093B"].pack('H*') }
 
     its(:timestamp) { should eql(0x00010E8D) }
 
@@ -28,7 +28,7 @@ describe Spektrum::Log::GPSRecord1 do
 
   context 'data set 2' do
 
-    let(:raw_data) { ["00660221234054966218093030103B"].pack('H*') }
+    let(:raw_data) { ["1600660221234054966218093030103B"].pack('H*') }
 
     its(:altitude) { should be_within(0.1).of(87.3) }
 
@@ -42,7 +42,7 @@ describe Spektrum::Log::GPSRecord1 do
 
   context 'data set 3' do
 
-    let(:raw_data) { ["00130052242101046851036804153F"].pack('H*') }
+    let(:raw_data) { ["1600130052242101046851036804153F"].pack('H*') }
 
     its(:altitude) { should be_within(0.1).of(4.3) }
 
@@ -60,7 +60,7 @@ describe Spektrum::Log::GPSRecord1 do
 
   context 'data set 4' do
 
-    let(:raw_data) { ["00560359222101676651038623141F"].pack('H*') }
+    let(:raw_data) { ["1600560359222101676651038623141F"].pack('H*') }
 
     its(:altitude) { should be_within(0.1).of(116.8) }
 
@@ -78,7 +78,7 @@ describe Spektrum::Log::GPSRecord1 do
 
   context 'data set 5' do
 
-    let(:raw_data) { ["00142125250249434045084625183B"].pack('H*') }
+    let(:raw_data) { ["1600142125250249434045084625183B"].pack('H*') }
 
     its(:altitude) { should be_within(0.1).of(693.6) }
 
@@ -96,7 +96,7 @@ describe Spektrum::Log::GPSRecord1 do
 
   context 'data set 6' do
 
-    let(:raw_data) { ["007430561011417459009672350939"].pack('H*') }
+    let(:raw_data) { ["16007430561011417459009672350939"].pack('H*') }
 
     its(:altitude) { should be_within(0.1).of(1008.5) }
 
@@ -114,7 +114,7 @@ describe Spektrum::Log::GPSRecord1 do
 
   context 'data set 7' do
 
-    let(:raw_data) { ["005518231111415959009602100939"].pack('H*') }
+    let(:raw_data) { ["16005518231111415959009602100939"].pack('H*') }
 
     its(:altitude) { should be_within(0.1).of(608.6) }
 

data/spec/gps_record2_spec.rb

@@ -8,7 +8,7 @@ describe Spektrum::Log::GPSRecord2 do
 
   context 'data set 1' do
 
-    let(:raw_data) { ["00500000184412110018099909073B"].pack('H*') }
+    let(:raw_data) { ["1700500000184412110018099909073B"].pack('H*') }
 
     its(:timestamp) { should eql(0x0002C8D5) }
 
@@ -30,7 +30,7 @@ describe Spektrum::Log::GPSRecord2 do
 
   context 'data set 2' do
 
-    let(:raw_data) { ["00270300011013080018093030103B"].pack('H*') }
+    let(:raw_data) { ["1700270300011013080018093030103B"].pack('H*') }
 
     its(:satellites) { should eql(8) }
 

data/spec/reader_spec.rb

@@ -8,7 +8,7 @@ describe Spektrum::Log::Reader do
 
     it { should have(3).flights }
 
-    its(:duration) { should be_within(0.1).of(8.8) }
+    its(:duration) { should be_within(0.1).of(34.3) }
 
   end
 
@@ -18,7 +18,7 @@ describe Spektrum::Log::Reader do
 
     it { should have(312).flights }
 
-    its(:duration) { should be_within(0.1).of(878.8) }
+    its(:duration) { should be_within(0.1).of(1570.7) }
 
   end
 
@@ -28,7 +28,7 @@ describe Spektrum::Log::Reader do
 
     it { should have(12).flights }
 
-    its(:duration) { should be_within(0.1).of(148.4) }
+    its(:duration) { should be_within(0.1).of(144.8) }
 
   end
 
@@ -38,7 +38,7 @@ describe Spektrum::Log::Reader do
 
     it { should have(1).flights }
 
-    its(:duration) { should be_within(0.1).of(16.3) }
+    its(:duration) { should be_within(0.1).of(15.9) }
 
   end
 
@@ -48,7 +48,7 @@ describe Spektrum::Log::Reader do
 
     it { should have(2).flights }
 
-    its(:duration) { should be_within(0.1).of(366.4) }
+    its(:duration) { should be_within(0.1).of(1431.4) }
 
   end
 
@@ -58,7 +58,27 @@ describe Spektrum::Log::Reader do
 
     it { should have(2).flights }
 
-    its(:duration) { should be_within(0.1).of(217.8) }
+    its(:duration) { should be_within(0.1).of(851.0) }
+
+  end
+
+  context 'data file X5-GPS1.TLM' do
+
+    subject { Spektrum::Log::Reader.new(data_file('X5-GPS1.TLM')) }
+
+    it { should have(5).flights }
+
+    its(:duration) { should be_within(0.1).of(1305.2) }
+
+  end
+
+  context 'data file X5-GPS2.TLM' do
+
+    subject { Spektrum::Log::Reader.new(data_file('X5-GPS2.TLM')) }
+
+    it { should have(2).flights }
+
+    its(:duration) { should be_within(0.1).of(627.7) }
 
   end
 

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
+  prerelease: 
 platform: ruby
 authors:
 - Nick Veys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-04 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
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,48 +94,55 @@ 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
@@ -132,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -157,6 +176,7 @@ files:
 - data/GPS.TLM
 - data/GPS2.TLM
 - data/X5-GPS1.TLM
+- data/X5-GPS2.TLM
 - lib/spektrum/log.rb
 - lib/spektrum/log/flight.rb
 - lib/spektrum/log/headers.rb
@@ -174,26 +194,33 @@ 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: -2804857274968739668
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2804857274968739668
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Spektrum TLM log file reader
 test_files:
 - spec/basic_data_record_spec.rb

checksums.yaml

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