spektrum-log 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80e40d14225d2fc99ad38744cbf85752aca4832b
-  data.tar.gz: a15dc90df0edd293bd38bfc852e596063e88ddb8
+  metadata.gz: cff8b2a019a2b6e62da86cd1420d3b252022b3b6
+  data.tar.gz: 6b3631843d9548a9632df6f4afa2684e6d3d5330
 SHA512:
-  metadata.gz: 46d5b8afdaefe491852f77fbacc85cf48fb20a93ef33cd437e130ae324dd3c3391819f34a23beacdf129327da13735c27de8caef9a4dab046b1a9ceda24f822c
-  data.tar.gz: 4f46200e10324cf7024f440b1f8430265923aeb212b54c2539ec8716c477756efb0ca0a217ded1c98b08aea300243cdfe51dc571b396dcf2255a77f67e75b389
+  metadata.gz: e1cefbc0896b3c301ab52d91e44bbfa7fe465b54a90e68e54b53daeff4073412d6464e726ea4228e37ac7e5ed779b177351f654fd3c3677484ce4dad6b167f41
+  data.tar.gz: 7e9568705a713a1039e65e3da9d6f30972bafffad5378649961b41ab415540e745996b4a061fad2f835733504ef4eabcd0abeace1a5768b19238cda6febb1276

data/lib/spektrum-log/records.rb

@@ -6,6 +6,9 @@ module Spektrum
       attr_reader :timestamp
 
       def initialize timestamp, raw_data
+        if raw_data.length != 15
+          raise ArgumentError, "raw_data incorrectly sized (#{raw_data.length})"
+        end
         @timestamp = timestamp
         @raw_data = raw_data
       end
@@ -42,15 +45,70 @@ module Spektrum
 
     end
 
+    class BasicDataRecord < Record
+
+      def initialize timestamp, raw_data
+        super timestamp, raw_data
+      end
+
+      def rpm pole_count
+        raw_rpm * pole_count
+      end
+
+      def rpm?
+        raw_rpm != 0xFFFF
+      end
+
+      def voltage
+        raw_voltage / 100.0
+      end
+
+      def voltage?
+        raw_voltage != 0xFFFF
+      end
+
+      def temperature
+        temp = two_byte_field(5..6)
+        temp
+      end
+
+      def temperature?
+        self.temperature != 0x7FFF
+      end
+
+      private
+
+      def raw_rpm
+        rpm = two_byte_field(1..2)
+        rpm
+      end
+
+      def raw_voltage
+        volt = two_byte_field(3..4)
+        volt
+      end
+
+    end
+
     class FlightLogRecord < Record
 
       def initialize timestamp, raw_data
         super timestamp, raw_data
       end
 
-      def receiver_voltage
+      def rx_voltage
+        raw_rx_voltage / 100.0
+      end
+
+      def rx_voltage?
+        raw_rx_voltage != 0x7FFF
+      end
+
+      private
+
+      def raw_rx_voltage
         volt = two_byte_field(13..14)
-        volt / 100.0
+        volt
       end
 
     end
@@ -184,29 +242,6 @@ module Spektrum
 
     end
 
-    class VoltsTemperatureRPMRecord < Record
-
-      def initialize timestamp, raw_data
-        super timestamp, raw_data
-      end
-
-      def rpms pole_count
-        rpm = two_byte_field(1..2)
-        rpm * pole_count
-      end
-
-      def voltage
-        volt = two_byte_field(3..4)
-        volt / 100.0
-      end
-
-      def temperature
-        temp = two_byte_field(5..6)
-        temp
-      end
-
-    end
-
     class Records
 
       @@types = {
@@ -215,9 +250,9 @@ module Spektrum
           0x14 => GForceRecord,
           0x16 => GPSRecord1,
           0x17 => GPSRecord2,
-          0x7E => VoltsTemperatureRPMRecord,
+          0x7E => BasicDataRecord,
           0x7F => FlightLogRecord,
-          0xFE => VoltsTemperatureRPMRecord,
+          0xFE => BasicDataRecord,
           0xFF => FlightLogRecord,
       }
 

data/lib/spektrum-log/version.rb

@@ -1,5 +1,5 @@
 module Spektrum
   module Log
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/basic_data_record_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe Spektrum::Log::BasicDataRecord do
+
+  let(:timestamp) { 0xC67C0100 }
+
+  let(:raw_data) { ["00FFFF13897FFF0000000000000000"].pack('H*') }
+
+  subject { Spektrum::Log::BasicDataRecord.new(timestamp, raw_data) }
+
+  its(:timestamp) { should eql(0xC67C0100) }
+
+  context 'with only rpm' do
+
+    let(:raw_data) { ["000123FFFF7FFF0000000000000000"].pack('H*') }
+
+    its(:rpm?) { should be_true }
+
+    it 'calculates RPMs appropriately' do
+      subject.rpm(6).should eq(1746)
+    end
+
+    its(:temperature?) { should be_false }
+
+    its(:voltage?) { should be_false }
+
+  end
+
+  context 'with only temperature' do
+
+    let(:raw_data) { ["00FFFFFFFF00A10000000000000000"].pack('H*') }
+
+    its(:rpm?) { should be_false }
+
+    its(:temperature?) { should be_true }
+
+    its(:temperature) { should eq(161) }
+
+    its(:voltage?) { should be_false }
+
+  end
+
+  context 'with only voltage' do
+
+    let(:raw_data) { ["00FFFF13897FFF0000000000000000"].pack('H*') }
+
+    its(:rpm?) { should be_false }
+
+    its(:temperature?) { should be_false }
+
+    its(:voltage?) { should be_true }
+
+    its(:voltage) { should eq(50.01) }
+
+  end
+
+  context 'with everything' do
+
+    let(:raw_data) { ["0000A6138900A60000000000000000"].pack('H*') }
+
+    its(:rpm?) { should be_true }
+
+    it 'calculates RPMs appropriately' do
+      subject.rpm(12).should eq(1992)
+    end
+
+    its(:temperature?) { should be_true }
+
+    its(:temperature) { should eq(166) }
+
+    its(:voltage?) { should be_true }
+
+    its(:voltage) { should eq(50.01) }
+
+  end
+
+end

data/spec/flight_log_record_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Spektrum::Log::FlightLogRecord do
+
+  let(:timestamp) { 0xC67C0101 }
+
+  let(:raw_data) { ["00FFFF13897FFF0000000000000347"].pack('H*') }
+
+  subject { Spektrum::Log::FlightLogRecord.new(timestamp, raw_data) }
+
+  its(:timestamp) { should eql(0xC67C0101) }
+
+  context 'with voltage' do
+
+    let(:raw_data) { ["00FFFF13897FFF0000000000000347"].pack('H*') }
+
+    its(:rx_voltage?) { should be_true }
+
+    its(:rx_voltage) { should eq(8.39) }
+
+  end
+
+  context 'without voltage' do
+
+    let(:raw_data) { ["00FFFF13897FFF0000000000007FFF"].pack('H*') }
+
+    its(:rx_voltage?) { should be_false }
+
+  end
+
+end

data/spektrum-log.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/spektrum-log/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Nick Veys"]
-  gem.email         = ["nveys@aramisgroup.com"]
+  gem.email         = ["nick@codelever.com"]
   gem.description   = %q{Read and interpret Spektrum TLM log files.}
   gem.summary       = %q{Spektrum TLM log file reader}
   gem.homepage      = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spektrum-log
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nick Veys
@@ -40,7 +40,7 @@ dependencies:
         version: '10.0'
 description: Read and interpret Spektrum TLM log files.
 email:
-- nveys@aramisgroup.com
+- nick@codelever.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -62,6 +62,8 @@ files:
 - lib/spektrum-log/reader.rb
 - lib/spektrum-log/records.rb
 - lib/spektrum-log/version.rb
+- spec/basic_data_record_spec.rb
+- spec/flight_log_record_spec.rb
 - spec/flight_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb
@@ -90,6 +92,8 @@ signing_key:
 specification_version: 4
 summary: Spektrum TLM log file reader
 test_files:
+- spec/basic_data_record_spec.rb
+- spec/flight_log_record_spec.rb
 - spec/flight_spec.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb