px4_log_reader 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4866bef24e75e23430bf53f0d79860ce51179031
-  data.tar.gz: 99c4506ee9f1324a75be0967a1e4d0e16b92410b
+  metadata.gz: b6071ae755e8bf6039fffcfddd4f08d38396509a
+  data.tar.gz: 1407b35a16ba00b5e2def9f4d2869269c7caaad4
 SHA512:
-  metadata.gz: 4fbfd8dfa77d550d8bc7139fdae14600d50d5450d017b881b2a45c478f35fff60fa835b77cbd3697dcf5b2d6d19ce66182e0ee2204e6eb4ce21c77752aa35487
-  data.tar.gz: e5d5c1eb3fa33137568d1908c40cd68249066809c61ca0a1b360f59fe69f9ec7f1b49dadf08f802084d8ceacb6f34b83ff4eed44e188ba01aae096777df7fd8e
+  metadata.gz: 1378a7bc49c3a8dc49acd0977712b8e696641b8d64f162a895097911c325b6648abc4f5c07e2be093c7b4708281d3493215d83a543091e12cb172a21e3633f50
+  data.tar.gz: 3818474002ba766ed277d0e98b39de6eef9d46211f4a2c921c30f02729e3068a50958e60008085e8c7c564497b619ab13b9b190ed0458a03b139de694a48694e

data/.gitignore

@@ -1,4 +1,4 @@
 *.sublime-*
 .DS_Store
 *.gem
-*.txt
+default_log_path.txt

data/LICENSE.txt

@@ -0,0 +1,23 @@
+Copyright (c) 2016, Robert Glissmann
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -25,9 +25,9 @@ or add this to your Gemfile if you use [Bundler](http://gembundler.com/):
      Px4LogReader.open( 'a_test_log.px4log' ) do |reader|
         reader.each_message( { with: [ 'ATT' ] } ) do |message,context|
 
-           att = [ messaged.get('roll'), message.get('pitch'), message.get('yaw') ]
+           att = [ messaged.get('Roll'), message.get('Pitch'), message.get('Yaw') ]
 
-           puts "ATT( @ #{context.find_by_name('GPS').get('time')} ): roll=#{att[0]}, pitch=#{att[1]}, yaw=#{att[2]}"
+           puts "ATT( @ #{context.find_by_name('GPS').get('GPSTime')} ): roll=#{att[0]}, pitch=#{att[1]}, yaw=#{att[2]}"
 
         end
      end

data/Rakefile

@@ -1,3 +1,35 @@
+#
+# Copyright (c) 2016, Robert Glissmann
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# %% license-end-token %%
+# 
+# Author: Robert.Glissmann@gmail.com (Robert Glissmann)
+# 
+# 
+
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
@@ -10,10 +42,10 @@ task :default => :test
 def read_default_log_filename
 	log_filename = ''
 	File.open( 'default_log_path.txt', 'r' ) do |input|
-		log_filename = input.readline
+		log_filename = input.readline.strip
 	end
 
-	unless File.exist? log_filename
+	unless File.exist?( log_filename )
 		raise "Failed to find '#{log_filename}'"
 	end
 

data/lib/px4_log_reader/error.rb

@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2016, Robert Glissmann
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# %% license-end-token %%
+# 
+# Author: Robert.Glissmann@gmail.com (Robert Glissmann)
+# 
+# 
+
+module Px4LogReader
+
+	class Error < StandardError
+
+		def initialize( message='' )
+			super( message )
+		end
+
+	end
+
+end

data/lib/px4_log_reader/file_not_found_error.rb

@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2016, Robert Glissmann
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# %% license-end-token %%
+# 
+# Author: Robert.Glissmann@gmail.com (Robert Glissmann)
+# 
+# 
+
+module Px4LogReader
+
+	class FileNotFoundError < Error
+		def initialize( filename )
+			super( "Failed to find '#{filename}'" )
+		end
+	end
+
+end

data/lib/px4_log_reader/invalid_descriptor_error.rb

@@ -1,12 +1,36 @@
-module Px4LogReader
-
-	class Error < StandardError
-
-		def initialize( message='' )
-			super( message )
-		end
+#
+# Copyright (c) 2016, Robert Glissmann
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# %% license-end-token %%
+# 
+# Author: Robert.Glissmann@gmail.com (Robert Glissmann)
+# 
+# 
 
-	end
+module Px4LogReader
 
 	class InvalidDescriptorError < Error
 
@@ -16,10 +40,4 @@ module Px4LogReader
 
 	end
 
-	class FileNotFoundError < Error
-		def initialize( filename )
-			super( "Failed to find '#{filename}'" )
-		end
-	end
-
 end

data/lib/px4_log_reader/log_buffer.rb

@@ -1,3 +1,35 @@
+#
+# Copyright (c) 2016, Robert Glissmann
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# %% license-end-token %%
+# 
+# Author: Robert.Glissmann@gmail.com (Robert Glissmann)
+# 
+# 
+
 module Px4LogReader
 
 	class LogBuffer

data/lib/px4_log_reader/log_file.rb

@@ -1,11 +1,42 @@
+#
+# Copyright (c) 2016, Robert Glissmann
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# %% license-end-token %%
+# 
+# Author: Robert.Glissmann@gmail.com (Robert Glissmann)
+# 
+# 
 
 module Px4LogReader
 
 	module LogFile
 
 		HEADER_MARKER = [0xA3,0x95]
-	   HEADER_LENGTH = 3
-	   FORMAT_DESCRIPTOR_TABLE = { FORMAT_MESSAGE.type => FORMAT_MESSAGE }.freeze
+		HEADER_LENGTH = 3
+		FORMAT_DESCRIPTOR_TABLE = { FORMAT_MESSAGE.type => FORMAT_MESSAGE }.freeze
 
 		def self.read_descriptors( buffered_io, descriptor_cache=nil )
 
@@ -29,7 +60,7 @@ module Px4LogReader
 
 			message_descriptor = nil
 
-		   	begin
+			begin
 
 				descriptor_message = read_message( buffered_io, FORMAT_DESCRIPTOR_TABLE )
 
@@ -54,9 +85,9 @@ module Px4LogReader
 			end
 
 			return message_descriptor
-	   end
+		end
 
-	   def self.read_message( buffered_io, message_descriptors )
+		def self.read_message( buffered_io, message_descriptors )
 
 			message = nil
 			while message.nil? do
@@ -77,48 +108,48 @@ module Px4LogReader
 			end
 
 			return message
-	   end
+		end
 
-	   def self.read_message_header( buffered_io )
-	      message_type = nil
+		def self.read_message_header( buffered_io )
+			message_type = nil
 
-	      begin
+			begin
 
-	         data = buffered_io.read(2)
+				data = buffered_io.read(2)
 
-	         if data && data.length == 2
+				if data && data.length == 2
 
-	            while !data.empty? && message_type.nil? do
+					while !data.empty? && message_type.nil? do
 
-	            	if ( byte = buffered_io.read(1) )
-		               data << byte
-		            end
+						if ( byte = buffered_io.read(1) )
+							data << byte
+						end
 
-	               if data.unpack('CCC')[0,2] == HEADER_MARKER
-	                  message_type = data.unpack('CCC').last & 0xFF
-	               else
-	                  data = data[1..-1]
-	               end
+						if data.unpack('CCC')[0,2] == HEADER_MARKER
+							message_type = data.unpack('CCC').last & 0xFF
+						else
+							data = data[1..-1]
+						end
 
-	            end
-	         end
+					end
+				end
 
-	      rescue EOFError => error
-	         # Nothing to do.
-	      rescue StandardError => error
-	         puts error.message
-	         puts error.backtrace.join("\n")
-	      end
+			rescue EOFError => error
+				# Nothing to do.
+			rescue StandardError => error
+				puts error.message
+				puts error.backtrace.join("\n")
+			end
 
-	      return message_type
-	   end
+			return message_type
+		end
 
 
-	   def self.write_message( io, message )
-	   	io.write HEADER_MARKER.pack('CC')
-	   	io.write [ message.descriptor.type ].pack('C')
-	   	io.write message.pack
-	   end
+		def self.write_message( io, message )
+			io.write HEADER_MARKER.pack('CC')
+			io.write [ message.descriptor.type ].pack('C')
+			io.write message.pack
+		end
 
 	end
 

data/lib/px4_log_reader/log_message.rb

@@ -1,8 +1,42 @@
+#
+# Copyright (c) 2016, Robert Glissmann
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# %% license-end-token %%
+# 
+# Author: Robert.Glissmann@gmail.com (Robert Glissmann)
+# 
+# 
+
 module Px4LogReader
 
 	class LogMessage
+
 		attr_reader :descriptor
 		attr_reader :fields
+
 		def initialize( descriptor, fields )
 			@descriptor = descriptor
 			@fields     = fields
@@ -10,21 +44,18 @@ module Px4LogReader
 
 		def get( index )
 
-			index = index
 			if index.class == String
 				index = descriptor.field_list[ index ]
 			end
 
-			return @fields[ index ]
+			return @fields[ index ] if index
+			return nil
 		end
 
 		def pack
 			return @descriptor.pack_message( @fields )
 		end
 
-		def to_s
-			return to_csv_line( Time.now )
-		end
 	end
 
 end

data/lib/px4_log_reader/message_descriptor.rb

@@ -1,16 +1,47 @@
+#
+# Copyright (c) 2016, Robert Glissmann
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# %% license-end-token %%
+# 
+# Author: Robert.Glissmann@gmail.com (Robert Glissmann)
+# 
+# 
 
 module Px4LogReader
 
 	class MessageDescriptor
 
-	   attr_reader :name
-	   attr_reader :type
-	   attr_reader :length
-	   attr_reader :format
-	   attr_reader :field_list
-	   attr_reader :format_specifier
+		attr_reader :name
+		attr_reader :type
+		attr_reader :length
+		attr_reader :format
+		attr_reader :field_list
+		attr_reader :format_specifier
 
-	   def initialize(attrs={})
+		def initialize(attrs={})
 			if attrs.keys.uniq.sort == [:name,:type,:length,:format,:fields].uniq.sort
 				@name = attrs[:name]
 				@type = attrs[:type]
@@ -30,7 +61,7 @@ module Px4LogReader
 
 				@field_list = {}
 			end
-	   end
+		end
 
 		def from_message( message )
 
@@ -65,9 +96,9 @@ module Px4LogReader
 			
 	   end
 
-	   def to_message
-	   	return LogMessage.new( FORMAT_MESSAGE, [ @type, @length, @name, @format, @fields_string ] )
-	   end
+		def to_message
+			return LogMessage.new( FORMAT_MESSAGE, [ @type, @length, @name, @format, @fields_string ] )
+		end
 
 		class << self
 
@@ -156,12 +187,12 @@ module Px4LogReader
 					corrected_fields[index] /= 1.0E-2
 				else
 				end
-	   	end
+			end
 
-	   	return corrected_fields.pack( @format_specifier )
-	   end
+			return corrected_fields.pack( @format_specifier )
+		end
 
-	   def to_s
+		def to_s
 			puts "#{@name}( #{@type} ):"
 			puts "   length = #{@length}"
 			puts "   format = #{@format}"

data/lib/px4_log_reader/message_descriptor_cache.rb

@@ -1,3 +1,35 @@
+#
+# Copyright (c) 2016, Robert Glissmann
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# %% license-end-token %%
+# 
+# Author: Robert.Glissmann@gmail.com (Robert Glissmann)
+# 
+# 
+
 module Px4LogReader
 
 	class MessageDescriptorCache
@@ -16,27 +48,27 @@ module Px4LogReader
 
 			message_descriptors = {}
 
-         if File.exist?( cache_filename )
-            File.open( cache_filename, 'r' ) do |input|
-               begin
-               	while ( ( data = input.read(4) ) && ( data.length == 4 ) ) do
-                     descriptor_size = data.unpack('L').first
-                     descriptor = Marshal.load( input.read( descriptor_size ) )
-
-                     message_descriptors[ descriptor.type ] = descriptor
-                  end
-               rescue EOFError => error
-                  puts "Parsed #{@message_descriptions.size} cached message descriptions"
-               rescue StandardError => error
-                  puts "#{error.class}: #{error.message}"
-                  puts error.backtrace.join("\n")
-               end
-            end
-         else
-            puts "Cache file '#{cache_filename}' not found"
-         end
-
-         return message_descriptors
+			if File.exist?( cache_filename )
+				File.open( cache_filename, 'r' ) do |input|
+					begin
+						while ( ( data = input.read(4) ) && ( data.length == 4 ) ) do
+							descriptor_size = data.unpack('L').first
+							descriptor = Marshal.load( input.read( descriptor_size ) )
+
+							message_descriptors[ descriptor.type ] = descriptor
+							end
+					rescue EOFError => error
+						puts "Parsed #{@message_descriptions.size} cached message descriptions"
+					rescue StandardError => error
+						puts "#{error.class}: #{error.message}"
+						puts error.backtrace.join("\n")
+					end
+				end
+			else
+				puts "Cache file '#{cache_filename}' not found"
+			end
+
+			return message_descriptors
 		end
 
 		def write_descriptors( message_descriptors )