cosmos 4.2.4-java → 4.5.0-java

data/lib/cosmos/system/target.rb

@@ -9,9 +9,9 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'cosmos/config/config_parser'
+require 'pathname'
 
 module Cosmos
-
   # Target encapsulates the information about a COSMOS target. Targets are
   # accessed through interfaces and have command and telemetry definition files
   # which define their access.
@@ -66,6 +66,12 @@ module Cosmos
     # @return [Integer] The number of telemetry packets received from this target
     attr_accessor :tlm_cnt
 
+    # @return [Boolean] Indicates if all command packets identify using different fields
+    attr_accessor :cmd_unique_id_mode
+
+    # @return [Boolean] Indicates if telemetry packets identify using different fields
+    attr_accessor :tlm_unique_id_mode
+
     # Creates a new target by processing the target.txt file in the directory
     # given by the path joined with the target_name. Records all the command
     # and telemetry definition files found in the targets cmd_tlm directory.
@@ -90,6 +96,8 @@ module Cosmos
       @routers = []
       @cmd_cnt = 0
       @tlm_cnt = 0
+      @cmd_unique_id_mode = false
+      @tlm_unique_id_mode = false
 
       # Determine the target name using substitution if given
       @original_name = target_name.clone.upcase.freeze
@@ -123,16 +131,18 @@ module Cosmos
         when 'REQUIRE'
           usage = "#{keyword} <FILENAME>"
           parser.verify_num_parameters(1, 1, usage)
+          filename = File.join(@dir, 'lib', parameters[0])
           begin
-            # Require absolute path to file in target lib folder.  Prevents name
+            # Require absolute path to file in target lib folder. Prevents name
             # conflicts at the require step
             Cosmos.disable_warnings do
-              Cosmos.require_file(File.join(@dir, 'lib', parameters[0]), false)
+              Cosmos.require_file(filename, false)
             end
           rescue LoadError
             begin
               # If we couldn't load at the target/lib level check everywhere
               Cosmos.disable_warnings do
+                filename = parameters[0]
                 Cosmos.require_file(parameters[0])
               end
             rescue Exception => err
@@ -141,7 +151,19 @@ module Cosmos
           rescue Exception => err
             raise parser.error(err.message)
           end
-          @requires << parameters[0]
+          
+          # This code resolves any relative paths to absolute before putting into the @requires array
+          unless Pathname.new(filename).absolute?
+            $:.each do |search_path|
+              test_filename = File.join(search_path, filename).gsub("\\", "/")
+              if File.exist?(test_filename)
+                filename = test_filename
+                break
+              end
+            end
+          end
+          
+          @requires << filename
 
         when 'IGNORE_PARAMETER', 'IGNORE_ITEM'
           usage = "#{keyword} <#{keyword.split('_')[1]} NAME>"
@@ -161,6 +183,16 @@ module Cosmos
           parser.verify_num_parameters(0, 0, usage)
           @auto_screen_substitute = true
 
+        when 'CMD_UNIQUE_ID_MODE'
+          usage = "#{keyword}"
+          parser.verify_num_parameters(0, 0, usage)
+          @cmd_unique_id_mode = true
+
+        when 'TLM_UNIQUE_ID_MODE'
+          usage = "#{keyword}"
+          parser.verify_num_parameters(0, 0, usage)
+          @tlm_unique_id_mode = true
+
         else
           # blank lines will have a nil keyword and should not raise an exception
           raise parser.error("Unknown keyword '#{keyword}'") if keyword
@@ -213,7 +245,7 @@ module Cosmos
       cmd_tlm_files.sort!
     end
 
-    # Make sure all partials are included in the cmd_tlm list for the MD5 calculation
+    # Make sure all partials are included in the cmd_tlm list for the hashing sum calculation
     def add_cmd_tlm_partials(dir)
       partial_files = []
       if Dir.exist?(File.join(dir, 'cmd_tlm'))
@@ -226,7 +258,5 @@ module Cosmos
       @cmd_tlm_files.concat(partial_files)
       @cmd_tlm_files.uniq!
     end
-
-  end # class Target
-
-end # module Cosmos
+  end
+end

data/lib/cosmos/tools/cmd_extractor/cmd_extractor.rb

@@ -62,25 +62,36 @@ module Cosmos
       super()
 
       # File Menu Actions
-      @analyze_log = Qt::Action.new(tr('&Analyze Logs'), self)
-      @analyze_log.statusTip = tr('Analyze log file packet counts')
+      @analyze_log = Qt::Action.new('&Analyze Logs', self)
+      @analyze_log.statusTip = 'Analyze log file packet counts'
       @analyze_log.connect(SIGNAL('triggered()')) { analyze_log_files() }
 
       # Mode Menu Actions
-      @include_raw = Qt::Action.new(tr('Include &Raw Data'), self)
-      @include_raw_keyseq = Qt::KeySequence.new(tr('Ctrl+R'))
+      @csv_output = Qt::Action.new('&CSV Output', self)
+      @csv_output.statusTip = 'Output as CSV based on Packet Time'
+      @csv_output.setCheckable(true)
+      @csv_output.connect(SIGNAL('triggered()')) { change_callback(:INPUT_FILES) }
+
+      @skip_ignored = Qt::Action.new('&Skip Ignored Items', self)
+      @skip_ignored.statusTip = "Skip ignored items in the command when building output"
+      @skip_ignored.setCheckable(true)
+
+      @include_raw = Qt::Action.new('Include &Raw Data', self)
+      @include_raw_keyseq = Qt::KeySequence.new('Ctrl+R')
       @include_raw.shortcut = @include_raw_keyseq
-      @include_raw.statusTip = tr('Include raw packet data in the text output')
+      @include_raw.statusTip = 'Include raw packet data in the text output'
       @include_raw.setCheckable(true)
     end
 
     # Create the File and Mode menus and initialize the Help menu
     def initialize_menus
-      @file_menu = menuBar.addMenu(tr('&File'))
+      @file_menu = menuBar.addMenu('&File')
       @file_menu.addAction(@analyze_log)
       @file_menu.addSeparator()
       @file_menu.addAction(@exit_action)
-      @mode_menu = menuBar.addMenu(tr('&Mode'))
+      @mode_menu = menuBar.addMenu('&Mode')
+      @mode_menu.addAction(@csv_output)
+      @mode_menu.addAction(@skip_ignored)
       @mode_menu.addAction(@include_raw)
       @about_string = "Command Extractor extracts commands from a binary command log file into a human readable text file."
       initialize_help_menu()
@@ -102,20 +113,20 @@ module Cosmos
       @data_source_layout.addWidget(label)
       @log_file_radio = Qt::RadioButton.new("Log File", self)
       @log_file_radio.setChecked(true)
-      @log_file_radio.connect(SIGNAL('clicked()')) do 
+      @log_file_radio.connect(SIGNAL('clicked()')) do
         @packet_log_frame.show_log_fields(true)
         @packet_log_frame.output_filename = ""
-        @dart_meta_frame.hide        
+        @dart_meta_frame.hide
         @resize_timer.start(100)
       end
       @data_source_layout.addWidget(@log_file_radio)
       @dart_radio = Qt::RadioButton.new("DART Database", self)
-      @dart_radio.connect(SIGNAL('clicked()')) do 
+      @dart_radio.connect(SIGNAL('clicked()')) do
         @packet_log_frame.show_log_fields(false)
         @packet_log_frame.output_filename = ""
         @dart_meta_frame.show
         @resize_timer.start(100)
-      end      
+      end
       @data_source_layout.addWidget(@dart_radio)
       @data_source_layout.addStretch()
       @top_layout.addLayout(@data_source_layout)
@@ -144,6 +155,14 @@ module Cosmos
       @open_button.connect(SIGNAL('clicked()')) { open_button() }
       @open_button.setEnabled(false)
       @button_layout.addWidget(@open_button)
+
+      if Kernel.is_windows?
+        @open_excel_button = Qt::PushButton.new('&Open in Excel')
+        @open_excel_button.connect(SIGNAL('clicked()')) { open_excel_button() }
+        @open_excel_button.setEnabled(false)
+        @button_layout.addWidget(@open_excel_button)
+      end
+
       @top_layout.addLayout(@button_layout)
     end
 
@@ -176,14 +195,16 @@ module Cosmos
       @time_start = @packet_log_frame.time_start
       @time_end = @packet_log_frame.time_end
       @packet_log_reader = @packet_log_frame.packet_log_reader
-      @input_filenames = @packet_log_frame.filenames.sort      
+      @input_filenames = @packet_log_frame.filenames.sort
       @output_filename = @packet_log_frame.output_filename
       @output_filename = nil if @output_filename.strip.empty?
       @meta_filters = @dart_meta_frame.meta_filters
 
       return unless pre_process_tests()
+      csv_output = @csv_output.isChecked
+      skip_ignored = @skip_ignored.isChecked
+      include_raw = @include_raw.isChecked
 
-      include_raw = @include_raw.isChecked      
       if @log_file_radio.isChecked
         begin
           ProgressDialog.execute(self, # parent
@@ -196,13 +217,14 @@ module Cosmos
             begin
               Cosmos.set_working_dir do
                 File.open(@output_filename, 'w') do |output_file|
-                  process_files(output_file, include_raw, progress_dialog)
+                  process_files(output_file, progress_dialog, csv_output, skip_ignored, include_raw)
                 end
               end
             ensure
               progress_dialog.complete
               Qt.execute_in_main_thread(true) do
                 @open_button.setEnabled(true)
+                @open_excel_button.setEnabled(true) if Kernel.is_windows?
               end
             end
           end
@@ -214,8 +236,8 @@ module Cosmos
           ProgressDialog.execute(self, # parent
                                 'Log File Progress', # title
                                 600, # width, height
-                                300, 
-                                true, # Overall progress, no step progress 
+                                300,
+                                true, # Overall progress, no step progress
                                 false) do |progress_dialog|
             progress_dialog.cancel_callback = method(:cancel_callback)
             progress_dialog.enable_cancel_button
@@ -227,7 +249,7 @@ module Cosmos
                   @interface.disconnect
                   request_packet = Cosmos::Packet.new('DART', 'DART')
                   request_packet.define_item('REQUEST', 0, 0, :BLOCK)
-                  
+
                   @time_start ||= Time.utc(1970, 1, 1)
                   @time_end ||= Time.now
                   @time_delta = @time_end - @time_start
@@ -239,13 +261,15 @@ module Cosmos
                   request['cmd_tlm'] = 'CMD'
                   request['meta_filters'] = @meta_filters unless @meta_filters.empty?
                   request_packet.write('REQUEST', JSON.dump(request))
-                
+
                   progress_dialog.append_text("Connecting to DART Database...")
                   @interface.connect
                   progress_dialog.append_text("Sending DART Database Query...")
                   @interface.write(request_packet)
                   progress_dialog.append_text("Receiving Packets...")
 
+                  write_output_file_DART_header(output_file, request, csv_output)
+
                   first = true
                   while true
                     break if @cancel
@@ -260,31 +284,22 @@ module Cosmos
                     # Switch to correct configuration from SYSTEM META when needed
                     if packet.target_name == 'SYSTEM'.freeze and packet.packet_name == 'META'.freeze
                       meta_packet = System.commands.packet('SYSTEM', 'META')
-                      meta_packet.buffer = packet.buffer                                  
+                      meta_packet.buffer = packet.buffer
                       Cosmos::System.load_configuration(meta_packet.read('CONFIG'))
                     elsif first
                       first = false
-                      @time_start = packet.received_time
+                      @time_start = packet.packet_time
                       @time_delta = @time_end - @time_start
                     end
 
                     defined_packet = System.commands.packet(packet.target_name, packet.packet_name)
                     defined_packet.buffer = packet.buffer
                     defined_packet.received_time = packet.received_time
-
-                    output_file.puts "#{defined_packet.target_name} #{defined_packet.packet_name}"
-                    output_file.puts "  RECEIVED_TIMEFORMATTED: #{defined_packet.received_time.formatted}"
-                    output_file.puts defined_packet.formatted(:WITH_UNITS, 2)
-                    if include_raw or !defined_packet.identified? or !defined_packet.defined?
-                      output_file.puts "  RAW PACKET DATA (#{defined_packet.length} bytes):"
-                      output_file.puts defined_packet.buffer.formatted(1, 16, ' ', 4)
-                    end
-                    output_file.puts
-
-                    progress = ((@time_delta - (@time_end - defined_packet.received_time)).to_f / @time_delta.to_f)
+                    write_output_file_packet(output_file, defined_packet, csv_output, skip_ignored, include_raw)
+                    progress = ((@time_delta - (@time_end - defined_packet.packet_time)).to_f / @time_delta.to_f)
                     progress_dialog.set_overall_progress(progress) if !@cancel
                   end
-            
+
                 end
               end
 
@@ -293,14 +308,15 @@ module Cosmos
               progress_dialog.complete
               Qt.execute_in_main_thread(true) do
                 @open_button.setEnabled(true)
+                @open_excel_button.setEnabled(true) if Kernel.is_windows?
               end
             end
-          end            
+          end
         rescue => error
           Qt::MessageBox.critical(self, 'Error!', "Error Querying DART Database\n#{error.formatted}")
         ensure
           @interface.disconnect
-        end          
+        end
       end
     end # def process_data
 
@@ -308,11 +324,15 @@ module Cosmos
       Cosmos.open_in_text_editor(@output_filename)
     end
 
+    def open_excel_button
+      system("start Excel.exe \"#{@output_filename}\"")
+    end
+
     ###############################################################################
     # Helper Methods
     ###############################################################################
 
-    def process_files(output_file, include_raw, progress_dialog)
+    def process_files(output_file, progress_dialog, csv_output, skip_ignored, include_raw)
       log_file_count = 1
       @input_filenames.each do |log_file|
         break if @cancel
@@ -321,10 +341,7 @@ module Cosmos
           file_size = File.size(log_file).to_f
           progress_dialog.append_text("Processing File #{log_file_count}/#{@input_filenames.length}: #{log_file}")
           progress_dialog.set_step_progress(0.0)
-          output_file.puts '-' * (log_file.length * 1.4).to_i
-          output_file.puts log_file
-          output_file.puts '-' * (log_file.length * 1.4).to_i
-          output_file.puts
+          write_output_file_header(output_file, log_file, csv_output)
           @packet_log_reader.each(
             log_file, # log filename
             true,     # identify and define packet
@@ -333,16 +350,7 @@ module Cosmos
 
             break if @cancel
             progress_dialog.set_step_progress(@packet_log_reader.bytes_read / file_size)
-            if packet.received_time
-              output_file.puts "#{packet.target_name} #{packet.packet_name}"
-              output_file.puts "  RECEIVED_TIMEFORMATTED: #{packet.received_time.formatted}"
-            end
-            output_file.puts packet.formatted(:WITH_UNITS, 2)
-            if include_raw or !packet.identified? or !packet.defined?
-              output_file.puts "  RAW PACKET DATA (#{packet.length} bytes):"
-              output_file.puts packet.buffer.formatted(1, 16, ' ', 4)
-            end
-            output_file.puts
+            write_output_file_packet(output_file, packet, csv_output, skip_ignored, include_raw)
           end
           progress_dialog.set_step_progress(1.0) if !@cancel
           progress_dialog.set_overall_progress(log_file_count.to_f / @input_filenames.length.to_f) if !@cancel
@@ -357,6 +365,57 @@ module Cosmos
     # Helper Methods
     ###############################################################################
 
+    def write_output_file_header(output_file, log_file, csv_output)
+      if csv_output
+        output_file.puts "Filename,#{log_file}"
+        output_file.puts "PACKET_TIMEFORMATTED,Target,Packet,Parameters"
+      else
+        output_file.puts '-' * (log_file.length * 1.4).to_i
+        output_file.puts log_file
+        output_file.puts '-' * (log_file.length * 1.4).to_i
+        output_file.puts
+      end
+    end
+
+    def write_output_file_DART_header(output_file, request, csv_output)
+      if csv_output
+        output_file.puts "DART Request"
+        output_file.puts "start secs,#{request['start_time_sec']},start usec,#{request['start_time_usec']}"
+        output_file.puts "end secs,#{request['end_time_sec']},end usec,#{request['end_time_usec']}"
+        output_file.puts "meta_filter,#{request['meta_filters']}" unless @meta_filters.empty?
+      else
+        output_file.puts "DART Request"
+        output_file.puts "start secs:#{request['start_time_sec']} start usec:#{request['start_time_usec']}"
+        output_file.puts "end secs:#{request['end_time_sec']} end usec:#{request['end_time_usec']}"
+        output_file.puts "meta_filter:#{request['meta_filters']}" unless @meta_filters.empty?
+      end
+    end
+
+    def write_output_file_packet(output_file, packet, csv_output, skip_ignored, include_raw)
+      if csv_output
+        items_string = ""
+        packet.read_all.each do |name, value|
+          next if skip_ignored && System.targets[packet.target_name].ignored_items.include?(name)
+          items_string << "#{name},#{value},"
+        end
+        output_file.puts "#{packet.packet_time.formatted},#{packet.target_name},#{packet.packet_name},#{items_string}"
+        output_file.puts "#{packet.buffer.formatted}" if include_raw
+      else
+        output_file.puts "#{packet.target_name} #{packet.packet_name}"
+        if packet.received_time
+          output_file.puts "  PACKET_TIMEFORMATTED: #{packet.packet_time.formatted}"
+          output_file.puts "  RECEIVED_TIMEFORMATTED: #{packet.received_time.formatted}"
+        end
+        ignored = skip_ignored ? System.targets[packet.target_name].ignored_items : nil
+        output_file.puts packet.formatted(:WITH_UNITS, 2, packet.buffer, ignored)
+        if include_raw or !packet.identified? or !packet.defined?
+          output_file.puts "  RAW PACKET DATA (#{packet.length} bytes):"
+          output_file.puts packet.buffer.formatted(1, 16, ' ', 4)
+        end
+        output_file.puts
+      end
+    end
+
     def pre_process_tests
       if @log_file_radio.isChecked
         unless @input_filenames and @input_filenames[0]
@@ -370,7 +429,7 @@ module Cosmos
           Qt::MessageBox.critical(self, 'Error', 'No Output File Selected')
           return false
         else
-          @packet_log_frame.output_filename = File.join(System.paths['LOGS'], File.build_timestamped_filename(['cmd_extractor', 'dart']))
+          @packet_log_frame.output_filename = File.join(System.paths['LOGS'], File.build_timestamped_filename(['cmd_extractor', 'dart'], get_output_file_extension()))
           @output_filename = @packet_log_frame.output_filename
         end
       end
@@ -383,6 +442,10 @@ module Cosmos
       true
     end
 
+    def get_output_file_extension
+      @csv_output.isChecked ? '.csv' : '.txt'
+    end
+
     ###############################################################################
     # Additional Callbacks
     ###############################################################################
@@ -398,12 +461,10 @@ module Cosmos
         if filename
           extension = File.extname(filename)
           filename_no_extension = filename[0..-(extension.length + 1)]
-          filename = filename_no_extension << '.txt'
-          @packet_log_frame.output_filename = filename
+          @packet_log_frame.output_filename = "#{filename_no_extension}#{get_output_file_extension}"
         end
       end
     end
 
-  end # class CmdExtractor
-
-end # module Cosmos
+  end
+end