spektrum-log 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39b8991bb1484d0c6653a5daf9b6ede696f58c57
-  data.tar.gz: fc5d7eefabe9d0ed60ccd877965031f064d25328
+  metadata.gz: c6188ae32b6bdefbaa76994caba0d77b099583f6
+  data.tar.gz: edbeefad5b51f3859e8e5f6de2facb66d83dd8d4
 SHA512:
-  metadata.gz: 81eb84a7a1da1ec0f88b46b56ec8a6e24e16085c8109bb93e05750803180f70e841aeba661bdfcd13c092f3d49220f0bb67855cecd9b5ff400228f2266efb202
-  data.tar.gz: 22579de242b974afbdcfad5002628b2245e09533b4b6c5ef5a3e7c8fed69b4f52dd4c91dbad05c8a64d6615c2ad03590d9a7d1a94669a2f656e01b5fa8e7c1aa
+  metadata.gz: c39118bbb18b3199986e8f27bcf7a903416013009ec8eed2e56102fb25e52b9e5cf4501b40e70e6e38f52e44b3d963cea3dbf828752fabd9cb9096370f7394d0
+  data.tar.gz: a3974ade56438c56911bd6bc6f2e53f7c23028815f4214753bf56edc948735be5dfe565d902733f506adf95f1cc09076d207f81acfa5aeb5f9c9c512135557e2

data/lib/spektrum/log/flight.rb

@@ -22,7 +22,7 @@ module Spektrum
       #
       # @return [Float] duration of the flight, in seconds
       def duration
-        @duration ||= timestamp_delta / time_divisor
+        @duration ||= timestamp_delta / 256.0
       end
 
       # Determines if this flight has any data.  Models without telemetry
@@ -82,17 +82,6 @@ module Spektrum
         @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.
       #

data/lib/spektrum/log/records.rb

@@ -14,6 +14,13 @@ module Spektrum
         @raw_data = raw_data
       end
 
+      # Gets the 32-bit segmented hex string of the raw data for this record.
+      #
+      # @return [String] raw hex string for the record
+      def raw_hex_string
+        @raw_hex_string ||= @raw_data.unpack('H*')[0].gsub(/(.{8})(?=.)/, '\1 \2')
+      end
+
       def type
         @type ||= byte_field(0)
       end
@@ -36,6 +43,10 @@ module Spektrum
         @raw_data[range].unpack('H*')[0].to_i
       end
 
+      def hex_string_field range
+        @raw_data[range].unpack('H*')[0]
+      end
+
       def two_byte_field range, endian = :big
         @raw_data[range].unpack(endian == :big ? 'n' : 'v')[0]
       end
@@ -174,7 +185,11 @@ module Spektrum
         super timestamp, raw_data
       end
 
-      # :feet, :meters
+      # Gets the altitude, in desired unit.
+      #
+      # @param unit one of :feet, :meters to define desired unit
+      # @return [Float] altitude in the desired unit
+      # @note This conversion has been verified via Spektrum STi
       def altitude unit = :feet
         @altitude ||= (hex_byte_field(3) * 100) + hex_byte_field(2)
         case unit
@@ -187,33 +202,38 @@ module Spektrum
         end
       end
 
-      # + N, - S
+      # Gets the latitude.  Positive values indicate North latitudes, negative
+      # values indicate South.
+      #
+      # @return [Float] latitude in decimal-degress
+      # @note This conversion has been verified via Spektrum STi
+      # @note XXX Negative values are currently not supported!! XXX
       def latitude
-        elements = 7.downto(4).map { |i| hex_byte_field(i) }
-        @latitude ||= convert_latlon([0, elements].flatten)
+        @latitude ||= build_latitude
       end
 
-      # + E, - W
+      # Gets the longitude.  Positive values indicate East longitudes, negative
+      # values indicate West.
+      #
+      # @return [Float] longitude in decimal-degress
+      # @note This conversion has been verified via Spektrum STi
       def longitude
-        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(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(15) & 0x02) == 0x02) ? 1 : -1
-
-        elements = [hundreds, elements].flatten
-        @longitude ||= multiplier * convert_latlon(elements)
+        @lontitude ||= build_longitude
       end
 
+      # Gets a composite coordinate value, containing longitude, latitude and
+      # altitude in an array.
+      #
+      # @param unit unit for altitude, see {#altitude} for options
+      # @return [Array] 3-element array of {#longitude}, {#latitude} and {#altitude}
       def coordinate
         [longitude, latitude, altitude(:meters)]
       end
 
+      # Gets the current heading, in degrees.
+      #
+      # @return [Float] current heading
+      # @note This conversion has been verified via Spektrum STi
       def heading
         @heading ||= (hex_byte_field(13) * 10) + (hex_byte_field(12) / 10.0)
       end
@@ -224,9 +244,29 @@ module Spektrum
 
       private
 
+      def build_latitude
+        elements = 7.downto(4).map { |i| hex_string_field(i) }
+        convert_latlon([0, elements].flatten)
+      end
+
+      def build_longitude
+        elements = 11.downto(8).map { |i| hex_string_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(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(15) & 0x02) == 0x02) ? 1 : -1
+
+        multiplier * convert_latlon([hundreds, elements].flatten)
+      end
+
       def convert_latlon elts
         raise ArgumentError unless elts.length == 5
-        elts[0] * 100 + elts[1] + ("#{elts[2]}.#{elts[3]}#{elts[4]}".to_f / 60.0)
+        elts[0] * 100 + elts[1].to_i + ("#{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.16"
+    VERSION = "0.0.17"
   end
 end

data/spec/file_spec.rb

@@ -20,7 +20,7 @@ describe Spektrum::Log::File do
 
       it { should have(312).flights }
 
-      its(:duration) { should be_within(0.1).of(1570.7) }
+      its(:duration) { should be_within(0.1).of(3433.1) }
 
     end
 
@@ -30,7 +30,7 @@ describe Spektrum::Log::File do
 
       it { should have(12).flights }
 
-      its(:duration) { should be_within(0.1).of(144.8) }
+      its(:duration) { should be_within(0.1).of(579.5) }
 
     end
 
@@ -40,7 +40,7 @@ describe Spektrum::Log::File do
 
       it { should have(1).flights }
 
-      its(:duration) { should be_within(0.1).of(15.9) }
+      its(:duration) { should be_within(0.1).of(63.8) }
 
     end
 
@@ -64,6 +64,16 @@ describe Spektrum::Log::File do
 
     end
 
+    context 'with data file X5-G700.TLM' do
+
+      subject { Spektrum::Log::File.new(data_file('X5-G700.TLM')) }
+
+      it { should have(3).flights }
+
+      its(:duration) { should be_within(0.1).of(972.9) }
+
+    end
+
     context 'with data file X5-GPS1.TLM' do
 
       subject { Spektrum::Log::File.new(data_file('X5-GPS1.TLM')) }
@@ -108,7 +118,7 @@ describe Spektrum::Log::File do
 
     it 'should be true for valid files' do
       files = data_files
-      files.should have(9).files
+      files.should have(10).files
 
       files.each do |f|
         Spektrum::Log::File.spektrum?(f).should be_true

data/spec/flight_spec.rb

@@ -84,7 +84,7 @@ describe Spektrum::Log::Flight do
 
       it { should_not be_empty }
 
-      its(:duration) { should be_within(0.1).of(0.6) }
+      its(:duration) { should be_within(0.1).of(2.2) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -284,7 +284,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(23155).records }
 
-      its(:duration) { should be_within(0.1).of(144.8) }
+      its(:duration) { should be_within(0.1).of(579.5) }
 
       its(:telemetry_unit) { should == 'TM1100' }
 
@@ -308,7 +308,7 @@ describe Spektrum::Log::Flight do
 
       it { should_not be_empty }
 
-      its(:duration) { should be_within(0.1).of(15.9) }
+      its(:duration) { should be_within(0.1).of(63.8) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -428,6 +428,42 @@ describe Spektrum::Log::Flight do
 
   end
 
+  context 'with data file X5-G700.TLM' do
+
+    let(:reader) { Spektrum::Log::File.new(data_file('X5-G700.TLM')) }
+
+    context 'flight 1' do
+
+      subject { reader.flights[0] }
+
+      its(:duration) { should be_within(0.1).of(323.6) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
+
+    end
+
+    context 'flight 2' do
+
+      subject { reader.flights[1] }
+
+      its(:duration) { should be_within(0.1).of(323.8) }
+
+      its(:telemetry_unit) { should == 'TM1100' }
+
+    end
+
+    context 'flight 3' do
+
+      subject { reader.flights[2] }
+
+      its(:duration) { should be_within(0.1).of(325.5) }
+
+      its(:telemetry_unit) { should == 'TM1000' }
+
+    end
+
+  end
+
   context 'with data file X5-GPS1.TLM' do
 
     let(:reader) { Spektrum::Log::File.new(data_file('X5-GPS1.TLM')) }

data/spec/gps_record1_spec.rb

@@ -54,7 +54,7 @@ describe Spektrum::Log::GPSRecord1 do
 
     its(:latitude) { should be_within(0.000001).of(1.354086) }
 
-    its(:longitude) { should be_within(0.000001).of(103.861399) }
+    its(:longitude) { should be_within(0.000001).of(103.861340) }
 
   end
 
@@ -130,4 +130,18 @@ describe Spektrum::Log::GPSRecord1 do
 
   end
 
+  context 'data set 8' do
+
+    let(:raw_data) { ["16004231071411418561009661130839"].pack('H*') }
+
+    its(:altitude) { should be_within(0.1).of(1030.8) }
+
+    its(:heading) { should be_within(0.1).of(136.1)}
+
+    its(:latitude) { should be_within(0.000001).of(41.185678) }
+
+    its(:longitude) { should be_within(0.000001).of(-96.010308) }
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Nick Veys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -163,6 +163,7 @@ files:
 - spec/data/4.TLM
 - spec/data/GPS.TLM
 - spec/data/GPS2.TLM
+- spec/data/X5-G700.TLM
 - spec/data/X5-GPS1.TLM
 - spec/data/X5-GPS2.TLM
 - spec/data/X5-GPS3.TLM
@@ -220,6 +221,7 @@ test_files:
 - spec/data/4.TLM
 - spec/data/GPS.TLM
 - spec/data/GPS2.TLM
+- spec/data/X5-G700.TLM
 - spec/data/X5-GPS1.TLM
 - spec/data/X5-GPS2.TLM
 - spec/data/X5-GPS3.TLM