spektrum-log 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9330857443ccd589a06d1f4875f59a668ce8ab27
-  data.tar.gz: ab6ad743c25f8dc939702cc4f57bbbdb18f64ceb
+  metadata.gz: 16e8299a9a5e5c9feef7434e6b06c31215be4d5d
+  data.tar.gz: ad822e2785f70364dca30e805f9f8b03d95be924
 SHA512:
-  metadata.gz: f40393fb43726714756d89ec8088a7f7ac5ab2e991f3b2710c7c9c20aa9208cefd26fa4c37fb617436fe11224dc7ec4b3c1dc3c874e0ec9aade02d9b712d2514
-  data.tar.gz: 45fbe2c0f2a386de2b2c0aa20cc7e35fd228081d7d77498588d949344d4b981753979f1866741a71aa23d1e01bce849ee51b42e3f966e2d16c05f3103f89c373
+  metadata.gz: d63ec8893c1647b5e231cfa208b7b4698d2d52bd23d9cf4ae37b69b3019814be57b7631f4ca2c5e371c1805d6ee94a3fb4f81cde5a21454d55b3bdf46912fb0a
+  data.tar.gz: 35794b8e3004dc3751a5657849214d997004e5f9d134011ff08f609348090412953627923a449ae31f6a2bf1062b6ed2f7042d4856b7753f6c1bc983fc28f8b6

data/lib/spektrum-log/flight.rb

@@ -11,7 +11,7 @@ module Spektrum
       end
 
       def duration
-        @records.empty? ? 0 : @records.last.timestamp - @records.first.timestamp
+        @duration ||= ((@records.empty? ? 0 : @records.last.timestamp - @records.first.timestamp) / 256)
       end
 
       def empty?
@@ -19,36 +19,36 @@ module Spektrum
       end
 
       def bind_type
-        case @headers.first.raw_data[2].unpack('C')[0]
-        when 0x01..0x02
-          'DSM2'
-        when 0x03..0x04
-          'DSMX'
-        else
-          'Unknown'
-        end
+        @bind_type ||= case @headers.first.raw_data[2].unpack('C')[0]
+                       when 0x01..0x02
+                         'DSM2'
+                       when 0x03..0x04
+                         'DSMX'
+                       else
+                         'Unknown'
+                       end
       end
 
       def model_name
-        @headers.first.raw_data[8..18].unpack('Z*')[0]
+        @model_name ||= @headers.first.raw_data[8..18].unpack('Z*')[0].strip
       end
 
       def model_number
-        @headers.first.raw_data[0].unpack('C')[0] + 1
+        @model_number ||= (@headers.first.raw_data[0].unpack('C')[0] + 1)
       end
 
       def model_type
-        case @headers.first.raw_data[1].unpack('C')[0]
-        when 0x00
-          'Fixed Wing'
-        when 0x01
-          'Helicopter'
-        else
-          'Unknown'
-        end
+        @model_type ||= case @headers.first.raw_data[1].unpack('C')[0]
+                        when 0x00
+                          'Fixed Wing'
+                        when 0x01
+                          'Helicopter'
+                        else
+                          'Unknown'
+                        end
       end
 
     end
 
   end
-end
+end

data/lib/spektrum-log/records.rb

@@ -40,7 +40,7 @@ module Spektrum
       end
 
       def altitude
-        two_byte_field(1..2)
+        @altitude ||= two_byte_field(1..2)
       end
 
     end
@@ -68,8 +68,7 @@ module Spektrum
       end
 
       def temperature
-        temp = two_byte_field(5..6)
-        temp
+        @temperature ||= two_byte_field(5..6)
       end
 
       def temperature?
@@ -79,13 +78,11 @@ module Spektrum
       private
 
       def raw_rpm
-        rpm = two_byte_field(1..2)
-        rpm
+        @raw_rpm ||= two_byte_field(1..2)
       end
 
       def raw_voltage
-        volt = two_byte_field(3..4)
-        volt
+        @raw_voltage ||= two_byte_field(3..4)
       end
 
     end
@@ -107,8 +104,7 @@ module Spektrum
       private
 
       def raw_rx_voltage
-        volt = two_byte_field(13..14)
-        volt
+        @raw_rx_voltage ||= two_byte_field(13..14)
       end
 
     end
@@ -120,33 +116,27 @@ module Spektrum
       end
 
       def x
-        x = two_byte_field(1..2)
-        x
+        @x ||= two_byte_field(1..2)
       end
 
       def y
-        y = two_byte_field(3..4)
-        y
+        @y ||= two_byte_field(3..4)
       end
 
       def z
-        z = two_byte_field(5..6)
-        z
+        @z ||= two_byte_field(5..6)
       end
 
       def x_max
-        x = two_byte_field(7..8)
-        x
+        @x_max ||= two_byte_field(7..8)
       end
 
       def y_max
-        y = two_byte_field(9..10)
-        y
+        @y_max ||= two_byte_field(9..10)
       end
 
       def z_max
-        z = two_byte_field(11..12)
-        z
+        @z_max ||= two_byte_field(11..12)
       end
 
     end
@@ -158,8 +148,7 @@ module Spektrum
       end
 
       def altitude
-        alt = two_byte_field(1..2, :little)
-        alt
+        @altitude ||= two_byte_field(1..2, :little)
       end
 
       def latitude
@@ -179,8 +168,7 @@ module Spektrum
       end
 
       def heading
-        head = two_byte_field(11..12, :little)
-        head / 10.0
+        @heading ||= (two_byte_field(11..12, :little) / 10.0)
       end
 
     end
@@ -215,8 +203,7 @@ module Spektrum
       end
 
       def sats
-        sats = byte_field(7)
-        sats
+        @sats ||= byte_field(7)
       end
 
     end
@@ -236,8 +223,7 @@ module Spektrum
       end
 
       def speed
-        speed = two_byte_field(1..2)
-        speed
+        @speed ||= two_byte_field(1..2)
       end
 
     end

data/lib/spektrum-log/version.rb

@@ -1,5 +1,5 @@
 module Spektrum
   module Log
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/flight_spec.rb

@@ -14,7 +14,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(191).records }
 
-      its(:duration) { should eql(1148) }
+      its(:duration) { should eql(4) }
 
       its(:bind_type) { should eql('DSMX') }
 
@@ -34,7 +34,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(634).records }
 
-      its(:duration) { should eql(3798) }
+      its(:duration) { should eql(14) }
 
     end
 
@@ -46,7 +46,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(641).records }
 
-      its(:duration) { should eql(3842) }
+      its(:duration) { should eql(15) }
 
     end
 
@@ -64,7 +64,17 @@ describe Spektrum::Log::Flight do
 
       it { should have(260).records }
 
-      its(:duration) { should eql(570) }
+      it { should_not be_empty }
+
+      its(:duration) { should eql(2) }
+
+      its(:bind_type) { should eql('DSMX') }
+
+      its(:model_name) { should eql('Voodoo 600') }
+
+      its(:model_number) { should eql(1) }
+
+      its(:model_type) { should eql('Helicopter') }
 
     end
 
@@ -194,7 +204,7 @@ describe Spektrum::Log::Flight do
 
       it { should have(23155).records }
 
-      its(:duration) { should eql(148365) }
+      its(:duration) { should eql(579) }
 
       it { should_not be_empty }
 
@@ -216,7 +226,7 @@ describe Spektrum::Log::Flight do
 
       it { should_not be_empty }
 
-      its(:duration) { should eql(16325) }
+      its(:duration) { should eql(63) }
 
       its(:bind_type) { should eql('DSMX') }
 

data/spektrum-log.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rspec', '~> 2.12'
   gem.add_development_dependency 'rake', '~> 10.0'
+  gem.add_development_dependency 'ci_reporter', '= 1.8.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Nick Veys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 description: Read and interpret Spektrum TLM log files.
 email:
 - nick@codelever.com