spektrum-log 0.0.6 → 0.0.7

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) / 256.0)
+        @duration ||= ((@records.empty? ? 0.0 : @records.last.timestamp - @records.first.timestamp) / 1000.0)
       end
 
       # Determines if this flight has any data.  Models without telemetry

data/lib/spektrum/log/records.rb

@@ -159,11 +159,7 @@ module Spektrum
       end
 
       def latitude_elements
-        a = hex_byte_field(6) # degrees
-        b = hex_byte_field(5) # degree-minutes
-        c = hex_byte_field(4) # degree-minutes / 10
-        d = hex_byte_field(3) # degree-minutes / 1000
-        [a, b, c, d]
+        6.downto(3).map { |i| hex_byte_field(i) }
       end
 
       def latitude
@@ -171,11 +167,7 @@ module Spektrum
       end
 
       def longitude_elements
-        a = hex_byte_field(10) # degrees
-        b = hex_byte_field(9)  # degree-minutes
-        c = hex_byte_field(8)  # degree-minutes / 10
-        d = hex_byte_field(7)  # degree-minutes / 1000
-        [a, b, c, d]
+        10.downto(7).map { |i| hex_byte_field(i) }
       end
 
       def longitude
@@ -220,16 +212,12 @@ module Spektrum
       end
 
       def time
-        ax = hex_byte_field(3) # hundredths
-        bx = hex_byte_field(4) # seconds
-        cx = hex_byte_field(5) # minutes
-        dx = hex_byte_field(6) # hours
-
-        [dx, cx, bx + (ax / 100.0)] # hh:mm:ss.sss
+        t = 3.upto(6).map { |i| hex_byte_field(i).to_s.rjust(2, '0') }
+        @time ||= "#{t[3]}:#{t[2]}:#{t[1]}.#{t[0]}"
       end
 
-      def sats
-        @sats ||= byte_field(7)
+      def satellites
+        @satellites ||= hex_byte_field(7)
       end
 
     end

data/lib/spektrum/log/version.rb

@@ -1,5 +1,5 @@
 module Spektrum
   module Log
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

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(4.5) }
+      its(:duration) { should be_within(0.1).of(1.1) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -38,7 +38,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(634).records }
 
-      its(:duration) { should be_within(0.1).of(14.8) }
+      its(:duration) { should be_within(0.1).of(3.8) }
 
       its(:gps1_records?) { should be_true }
 
@@ -54,7 +54,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(641).records }
 
-      its(:duration) { should be_within(0.1).of(15.0) }
+      its(:duration) { should be_within(0.1).of(3.8) }
 
       its(:gps1_records?) { should be_true }
 
@@ -78,7 +78,7 @@ describe Spektrum::Log::Flight do
 
       it { should_not be_empty }
 
-      its(:duration) { should be_within(0.1).of(2.2) }
+      its(:duration) { should be_within(0.1).of(0.6) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -216,7 +216,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(23155).records }
 
-      its(:duration) { should be_within(0.1).of(579.5) }
+      its(:duration) { should be_within(1).of(148) }
 
       it { should_not be_empty }
 
@@ -238,7 +238,7 @@ describe Spektrum::Log::Flight do
 
       it { should_not be_empty }
 
-      its(:duration) { should be_within(0.1).of(63.7) }
+      its(:duration) { should be_within(0.1).of(16.3) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -274,6 +274,8 @@ describe Spektrum::Log::Flight do
 
       subject { reader.flights[0] }
 
+      its(:duration) { should be_within(1).of(179) }
+
       its(:gps1_records?) { should be_true }
 
       its(:gps2_records?) { should be_true }
@@ -286,6 +288,8 @@ describe Spektrum::Log::Flight do
 
       subject { reader.flights[1] }
 
+      its(:duration) { should be_within(1).of(188) }
+
       its(:gps1_records?) { should be_true }
 
       its(:gps2_records?) { should be_true }

data/spec/gps_record2_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Spektrum::Log::GPSRecord2 do
+
+  let(:timestamp) { 0x0002C8D5 }
+
+  let(:raw_data) { ["00500000184412110018099909073B"].pack('H*') }
+
+  subject { Spektrum::Log::GPSRecord2.new(timestamp, raw_data) }
+
+  its(:timestamp) { should eql(0x0002C8D5) }
+
+  its(:satellites) { should eql(11) }
+
+  its(:time) { should eq('12:44:18.00') }
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -184,6 +184,7 @@ files:
 - spec/flight_log_record_spec.rb
 - spec/flight_spec.rb
 - spec/gps_record1_spec.rb
+- spec/gps_record2_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb
 - spektrum-log.gemspec
@@ -217,5 +218,6 @@ test_files:
 - spec/flight_log_record_spec.rb
 - spec/flight_spec.rb
 - spec/gps_record1_spec.rb
+- spec/gps_record2_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb