spektrum-log 0.0.7 → 0.0.8

data/lib/spektrum/log/records.rb

@@ -154,37 +154,40 @@ module Spektrum
         super timestamp, raw_data
       end
 
-      def altitude
-        @altitude ||= two_byte_field(1..2, :little)
-      end
-
-      def latitude_elements
-        6.downto(3).map { |i| hex_byte_field(i) }
+      # :feet, :meters
+      def altitude unit = :feet
+        @altitude ||= (hex_byte_field(2) * 100) + hex_byte_field(1)
+        case unit
+        when :feet
+          @altitude * 0.32808399
+        when :meters
+          @altitude / 10.0
+        else
+          @altitude
+        end
       end
 
       def latitude
-        @latitude ||= mindec_to_degdec latitude_elements
-      end
-
-      def longitude_elements
-        10.downto(7).map { |i| hex_byte_field(i) }
+        elements = 6.downto(3).map { |i| hex_byte_field(i) }
+        @latitude ||= convert_latlon(elements)
       end
 
       def longitude
-        @longitude ||= mindec_to_degdec longitude_elements
+        elements = 10.downto(7).map { |i| hex_byte_field(i) }
+        @longitude ||= convert_latlon(elements)
       end
 
       def coordinate
-        [longitude, latitude, altitude]
+        [longitude, latitude, altitude(:meters)]
       end
 
       def heading
-        @heading ||= (two_byte_field(11..12, :little) / 10.0)
+        @heading ||= (hex_byte_field(12) * 10) + (hex_byte_field(11) / 10.0)
       end
 
       private
 
-      def mindec_to_degdec elts
+      def convert_latlon elts
         raise ArgumentError unless elts.length == 4
         elts[0] + ("#{elts[1]}.#{elts[2]}#{elts[3]}".to_f / 60.0)
       end
@@ -199,21 +202,22 @@ module Spektrum
 
       # :knots, :mph, :kph
       def speed unit = :knots
-        speed = two_byte_field(1..2, :little)
-        speed = case unit
+        @speed ||= (hex_byte_field(2) * 100) + hex_byte_field(1)
+        case unit
         when :knots
-          speed / 10.0
+          @speed / 10.0
         when :mph
-          speed * 0.115
+          @speed * 0.115078
         when :kph
-          speed * 0.185
+          @speed * 0.1852
+        else
+          @speed
         end
-        speed.round(2)
       end
 
       def time
-        t = 3.upto(6).map { |i| hex_byte_field(i).to_s.rjust(2, '0') }
-        @time ||= "#{t[3]}:#{t[2]}:#{t[1]}.#{t[0]}"
+        elements = 6.downto(3).map { |i| hex_byte_field(i) }
+        @time ||= "%.2i:%.2i:%.2i.%.2i" % elements
       end
 
       def satellites

data/lib/spektrum/log/version.rb

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

data/spec/gps_record1_spec.rb

@@ -4,14 +4,40 @@ describe Spektrum::Log::GPSRecord1 do
 
   let(:timestamp) { 0x00010E8D }
 
-  let(:raw_data) { ["00870084214054886918094633093B"].pack('H*') }
-
   subject { Spektrum::Log::GPSRecord1.new(timestamp, raw_data) }
 
-  its(:timestamp) { should eql(0x00010E8D) }
+  context 'data set 1' do
+
+    let(:raw_data) { ["00870084214054886918094633093B"].pack('H*') }
+
+    its(:timestamp) { should eql(0x00010E8D) }
+
+    its(:altitude) { should be_within(0.1).of(28.5) }
+
+    it 'should allow altitude in meters' do
+      subject.altitude(:meters).should be_within(0.1).of(8.7)
+    end
+
+    its(:heading) { should be_within(0.01).of(334.6)}
+
+    its(:latitude) { should be_within(0.000001).of(54.670307) }
+
+    its(:longitude) { should be_within(0.000001).of(9.311646) }
+
+  end
+
+  context 'data set 2' do
+
+    let(:raw_data) { ["00660221234054966218093030103B"].pack('H*') }
+
+    its(:altitude) { should be_within(0.1).of(87.3) }
+
+    it 'should allow altitude in meters' do
+      subject.altitude(:meters).should be_within(0.1).of(26.6)
+    end
 
-  its(:latitude) { should be_within(0.000001).of(54.670307) }
+    its(:heading) { should be_within(0.01).of(303.0)}
 
-  its(:longitude) { should be_within(0.000001).of(9.311646) }
+  end
 
 end

data/spec/gps_record2_spec.rb

@@ -4,14 +4,48 @@ 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) }
+  context 'data set 1' do
+
+    let(:raw_data) { ["00500000184412110018099909073B"].pack('H*') }
+
+    its(:timestamp) { should eql(0x0002C8D5) }
+
+    its(:satellites) { should eql(11) }
+
+    its(:speed) { should be_within(0.1).of(5.0) }
+
+    it 'should allow speed in mph' do
+      subject.speed(:mph).should be_within(0.1).of(5.8)
+    end
+
+    it 'should allow speed in kph' do
+      subject.speed(:kph).should be_within(0.1).of(9.3)
+    end
+
+    its(:time) { should eq('12:44:18.00') }
+
+  end
+
+  context 'data set 2' do
+
+    let(:raw_data) { ["00270300011013080018093030103B"].pack('H*') }
+
+    its(:satellites) { should eql(8) }
+
+    its(:speed) { should be_within(0.1).of(32.7) }
+
+    it 'should allow speed in mph' do
+      subject.speed(:mph).should be_within(0.1).of(37.6)
+    end
+
+    it 'should allow speed in kph' do
+      subject.speed(:kph).should be_within(0.1).of(60.6)
+    end
 
-  its(:satellites) { should eql(11) }
+    its(:time) { should eq('13:10:01.00') }
 
-  its(:time) { should eq('12:44:18.00') }
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors: