cosmos 3.9.2 → 4.0.0

data/lib/cosmos/tools/table_manager/table_config.rb

@@ -59,7 +59,7 @@ module Cosmos
       @proc_text = ''
       @building_generic_conversion = false
 
-      parser = ConfigParser.new("http://cosmosrb.com/docs/tools/#table-manager-configuration")
+      parser = ConfigParser.new("http://cosmosrb.com/docs/tools/#table-manager-configuration-cosmos--39")
       parser.parse_file(filename) do |keyword, params|
         if @building_generic_conversion
           case keyword
@@ -106,14 +106,20 @@ module Cosmos
           #######################################################################
           # All the following keywords must have a current packet defined
           #######################################################################
-          when 'SELECT_PARAMETER', 'PARAMETER', 'ID_PARAMETER', 'ARRAY_PARAMETER', 'APPEND_PARAMETER', 'APPEND_ID_PARAMETER', 'APPEND_ARRAY_PARAMETER', 'ALLOW_SHORT', 'HAZARDOUS', 'PROCESSOR', 'META', 'DISABLE_MESSAGES', 'DISABLED'
+          when 'SELECT_PARAMETER', 'PARAMETER', 'ID_PARAMETER', 'ARRAY_PARAMETER',
+            'APPEND_PARAMETER', 'APPEND_ID_PARAMETER', 'APPEND_ARRAY_PARAMETER',
+            'ALLOW_SHORT', 'HAZARDOUS', 'PROCESSOR', 'META', 'DISABLE_MESSAGES', 'DISABLED'
             raise parser.error("No current packet for #{keyword}") unless @current_packet
             process_current_packet(parser, keyword, params)
 
           #######################################################################
           # All the following keywords must have a current item defined
           #######################################################################
-          when 'STATE', 'READ_CONVERSION', 'WRITE_CONVERSION', 'POLY_READ_CONVERSION', 'POLY_WRITE_CONVERSION', 'SEG_POLY_READ_CONVERSION', 'SEG_POLY_WRITE_CONVERSION', 'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START', 'REQUIRED', 'LIMITS', 'LIMITS_RESPONSE', 'UNITS', 'FORMAT_STRING', 'DESCRIPTION', 'MINIMUM_VALUE', 'MAXIMUM_VALUE', 'DEFAULT_VALUE', 'OVERFLOW', 'UNEDITABLE', 'HIDDEN'
+          when 'STATE', 'READ_CONVERSION', 'WRITE_CONVERSION', 'POLY_READ_CONVERSION',
+            'POLY_WRITE_CONVERSION', 'SEG_POLY_READ_CONVERSION', 'SEG_POLY_WRITE_CONVERSION',
+            'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START', 'REQUIRED',
+            'LIMITS', 'LIMITS_RESPONSE', 'UNITS', 'FORMAT_STRING', 'DESCRIPTION', 'HIDDEN',
+            'MINIMUM_VALUE', 'MAXIMUM_VALUE', 'DEFAULT_VALUE', 'OVERFLOW', 'UNEDITABLE'
             raise parser.error("No current item for #{keyword}") unless @current_item
             process_current_item(parser, keyword, params)
 

data/lib/cosmos/tools/table_manager/table_manager.rb

@@ -738,13 +738,27 @@ module Cosmos
             else
               table.write(item.name, value)
             end
-            raise "out of range" if item.range && !item.range.include?(table.read(item.name, :RAW))
+            if item.range && !item.range.include?(table.read(item.name, :RAW))
+              if gui_table.item(r, c).text.upcase.start_with?("0X") # display as hex
+                min = "0x#{item.range.min.to_s(16).upcase}"
+                max = "0x#{item.range.max.to_s(16).upcase}"
+              else
+                min = item.range.min
+                max = item.range.max
+              end
+              raise "out of range. Minimum is #{min}. Maximum is #{max}"
+            end
 
           # if we have a problem casting the value it probably means the user put in garbage
           # in this case force the range check to fail
           rescue => error
             text = gui_table.item(r, c).text
-            result << "Error saving #{item.name} value of '#{text}' due to #{error.message}.\nDefault value is '#{item.default}'\n"
+            if text.upcase.start_with?("0X") # display as hex
+              default = "0x#{item.default.to_s(16).upcase}"
+            else
+              default = item.default
+            end
+            result << "Error saving #{item.name} value of #{text} due to #{error.message}. Default value is #{default}.\n\n"
           end
         end # end each table column
       end # end each table row
@@ -939,6 +953,8 @@ module Cosmos
     # Updates the table by setting the value in the table to the properly formatted value.
     def update_gui_item(table_name, table, gui_table, item, row, column)
       value = table.read(item.name, :FORMATTED)
+      # Handle binary strings
+      value = "0x" + value.simple_formatted unless value.is_printable?
 
       if item.states && item.states.keys.sort == %w(CHECKED UNCHECKED)
         table_item = create_checkable_table_item(item, value)
@@ -961,12 +977,16 @@ module Cosmos
           value = gui_item.text # convert_to_value?
         end
       else
-        text = gui_item.text
-        quotes_removed = text.remove_quotes
-        if text == quotes_removed
-          value = text.convert_to_value
+        if (item.data_type == :STRING || item.data_type == :BLOCK) && gui_item.text.upcase.start_with?("0X")
+          value = gui_item.text.hex_to_byte_string
         else
-          value = quotes_removed
+          text = gui_item.text
+          quotes_removed = text.remove_quotes
+          if text == quotes_removed
+            value = text.convert_to_value
+          else
+            value = quotes_removed
+          end
         end
       end
       value

data/lib/cosmos/tools/test_runner/results_writer.rb

@@ -40,7 +40,7 @@ module Cosmos
 
     def start(test_type, test_suite_class, test_class = nil, test_case = nil, settings = nil)
       @results = []
-      @start_time = Time.now
+      @start_time = Time.now.sys
       @filename = File.join(@path, File.build_timestamped_filename(['testrunner', 'results']))
       @data_package_filename = @filename[0..-5] + '.zip'
       Cosmos.set_working_dir do
@@ -111,7 +111,7 @@ module Cosmos
     end
 
     def complete
-      @stop_time = Time.now
+      @stop_time = Time.now.sys
       cycle_logs() if @auto_cycle_logs
       footer()
     ensure
@@ -126,7 +126,7 @@ module Cosmos
       @file.puts "Detailed Test Output Logged to: #{get_scriptrunner_message_log_filename()}"
       if @metadata
         begin
-          items = get_tlm_packet(@metadata[0], @metadata[1])
+          items = get_tlm_packet('SYSTEM', 'META')
           @file.puts ''
           @file.puts "Metadata:"
           items.each do |item_name, item_value, _|
@@ -243,12 +243,12 @@ module Cosmos
     end
 
     def write(string)
-      @file.write(Time.now.formatted + ': ' + string)
+      @file.write(Time.now.sys.formatted + ': ' + string)
       @file.flush
     end
 
     def puts(string)
-      @file.puts(Time.now.formatted + ': ' + string)
+      @file.puts(Time.now.sys.formatted + ': ' + string)
       @file.flush
     end
 
@@ -257,7 +257,7 @@ module Cosmos
       if @metadata
         Qt.execute_in_main_thread(true) do
           begin
-            success = SetTlmDialog.execute(parent, 'Enter Test Metadata', 'Start Test', 'Cancel Test', @metadata[0], @metadata[1])
+            success = SetTlmDialog.execute(parent, 'Enter Test Metadata', 'Start Test', 'Cancel Test', 'SYSTEM', 'META')
           rescue DRb::DRbConnError
             success = false
             Qt::MessageBox.critical(parent, 'Error', 'Error Connecting to Command and Telemetry Server')

data/lib/cosmos/tools/test_runner/test_runner.rb

@@ -977,7 +977,7 @@ module Cosmos
 
       # Ensure the file exists
       raise "Configuration File: #{filename} does not exist" unless test(?f, filename)
-      parser = ConfigParser.new
+      parser = ConfigParser.new("http://cosmosrb.com/docs/tools/#test-runner-configuration")
       parser.parse_file(filename) do |keyword, params|
         case keyword
         when 'REQUIRE_UTILITY'
@@ -1077,11 +1077,9 @@ module Cosmos
           parser.verify_num_parameters(0, 0, keyword)
           @@results_writer.auto_cycle_logs = true
 
-        # TODO: Deprecate COLLECT_META_DATA
-        when 'COLLECT_METADATA', 'COLLECT_META_DATA'
-          parser.verify_num_parameters(2, 2, "#{keyword} <Metadata Target Name> <Metadata Packet Name>")
-          System.telemetry.packet(params[0], params[1])
-          @@results_writer.metadata = [params[0], params[1]]
+        when 'COLLECT_METADATA'
+          parser.verify_num_parameters(0, 0, "#{keyword}")
+          @@results_writer.metadata = true
 
         else
           raise "Unhandled keyword: #{keyword}" if keyword

data/lib/cosmos/tools/tlm_extractor/tlm_extractor.rb

@@ -278,7 +278,6 @@ module Cosmos
       # Telemetry Search
       @search_layout = Qt::HBoxLayout.new
       @search_box = FullTextSearchLineEdit.new(self)
-      @search_box.setStyleSheet("padding-right: 20px;padding-left: 5px;background: url(#{File.join(Cosmos::PATH, 'data', 'search-14.png')});background-position: right;background-repeat: no-repeat;")
       @search_add_item_button = Qt::PushButton.new('Add Item')
       @search_add_item_button.connect(SIGNAL('clicked()')) do
         split_tlm = @search_box.text.to_s.split(" ")
@@ -397,7 +396,7 @@ module Cosmos
       @top_layout.addWidget(@file_box)
 
       # Packet Log Frame
-      @packet_log_frame = PacketLogFrame.new(self, @log_dir, System.default_packet_log_reader.new, @input_filenames, nil, true, true, true, Cosmos::TLM_FILE_PATTERN, Cosmos::TXT_FILE_PATTERN)
+      @packet_log_frame = PacketLogFrame.new(self, @log_dir, System.default_packet_log_reader.new(*System.default_packet_log_reader_params), @input_filenames, nil, true, true, true, Cosmos::TLM_FILE_PATTERN, Cosmos::TXT_FILE_PATTERN)
       @packet_log_frame.change_callback = method(:change_callback)
       @file_box_layout.addWidget(@packet_log_frame)
 
@@ -599,7 +598,7 @@ module Cosmos
         # Configure Tlm Extractor Config
         sync_gui_to_config()
 
-        start_time = Time.now
+        start_time = Time.now.sys
         ProgressDialog.execute(self, 'Log File Progress', 600, 300) do |progress_dialog|
           progress_dialog.cancel_callback = method(:cancel_callback)
           progress_dialog.enable_cancel_button
@@ -657,7 +656,7 @@ module Cosmos
           ensure
             progress_dialog.set_step_progress(1.0) if !@cancel
             progress_dialog.set_overall_progress(1.0) if !@cancel
-            progress_dialog.append_text("Runtime: #{Time.now - start_time} s")
+            progress_dialog.append_text("Runtime: #{Time.now.sys - start_time} s")
             progress_dialog.complete
             if @batch_filenames.empty?
               Qt.execute_in_main_thread(true) do
@@ -964,7 +963,7 @@ module Cosmos
       connect(ok, SIGNAL('clicked()'), dialog, SLOT('accept()'))
       button_layout.addWidget(ok)
       layout.addLayout(button_layout)
-      
+
       dialog.setLayout(layout)
       if dialog.exec == Qt::Dialog::Accepted
         @shared_columns = []

data/lib/cosmos/tools/tlm_extractor/tlm_extractor_config.rb

@@ -147,7 +147,7 @@ module Cosmos
         reset_settings()
         clear_items()
 
-        parser = ConfigParser.new
+        parser = ConfigParser.new("http://cosmosrb.com/docs/tools/#telemetry-extractor-configuration")
         parser.parse_file(filename) do |keyword, params|
           case keyword
           when 'DELIMITER'

data/lib/cosmos/tools/tlm_extractor/tlm_extractor_processor.rb

@@ -18,7 +18,7 @@ module Cosmos
     attr_accessor :packet_log_reader
 
     def initialize
-      @packet_log_reader = System.default_packet_log_reader.new
+      @packet_log_reader = System.default_packet_log_reader.new(*System.default_packet_log_reader_params)
     end
 
     def process_batch(batch_name, input_filenames, output_dir, output_extension, config_filenames, time_start = nil, time_end = nil, &block)

data/lib/cosmos/tools/tlm_grapher/data_object_adders/housekeeping_data_object_adder.rb

@@ -35,17 +35,33 @@ module Cosmos
       @search_layout = Qt::HBoxLayout.new
       @search_label = Qt::Label.new("Add Housekeeping Data Object: ", self)
       @search_box = FullTextSearchLineEdit.new(self)
-      @search_box.setStyleSheet("padding-right: 20px;padding-left: 5px;background: url(#{File.join(Cosmos::PATH, 'data', 'search-14.png')});background-position: right;background-repeat: no-repeat;")
       @search_box.completion_list = System.telemetry.all_item_strings(false, nil)
       @search_box.callback = lambda do |tlm|
+        tlm.upcase!
         split_tlm = tlm.split(" ")
         if split_tlm.length == 3
-          target_name = split_tlm[0].upcase
+          target_name = split_tlm[0]
           packet_name = split_tlm[1]
-          item_name = split_tlm[2]
+          # Check to see if the item name is followed by an array index,
+          # notated by square brackets around an integer; i.e. ARRAY_ITEM[1]
+          if (split_tlm[2] =~ /\[\d+\]$/)
+            # We found an array index.
+            # The $` special variable is the string before the regex match, i.e. ARRAY_ITEM
+            item_name = $`
+            # The $& special variable is the string matched by the regex, i.e. [1].
+            # Strip off the brackets and then convert the array index to an integer.
+            item_array_index = $&.gsub(/[\[\]]/, "").to_i
+          else
+            item_name = split_tlm[2]
+            item_array_index = nil
+          end
           begin
-            System.telemetry.packet_and_item(target_name, packet_name, item_name)
-            add_data_object(target_name, packet_name, item_name)
+            packet, item = System.telemetry.packet_and_item(target_name, packet_name, item_name)
+            # Default array index to zero if it wasn't specified.
+            item_array_index = 0 if item.array_size and !item_array_index
+            # Ignore array indicies for non-array items.
+            item_array_index = nil if !item.array_size
+            add_data_object(target_name, packet_name, item_name, item_array_index)
           rescue
             # Does not exist
           end
@@ -64,9 +80,10 @@ module Cosmos
     end
 
     # Adds a data object when the add button is pressed
-    def add_data_object(target_name, packet_name, item_name)
+    def add_data_object(target_name, packet_name, item_name, item_array_index)
       data_object = HousekeepingDataObject.new
       data_object.set_item(target_name, packet_name, item_name)
+      data_object.item_array_index = item_array_index
       @add_data_object_callback.call(data_object) if @add_data_object_callback
     end
 

data/lib/cosmos/tools/tlm_grapher/data_object_editors/housekeeping_data_object_editor.rb

@@ -38,6 +38,10 @@ module Cosmos
         data_object.set_item(packet.target_name, packet.packet_name, item_name)
       end
 
+      packet, item = System.telemetry.packet_and_item(data_object.target_name,
+                                                      data_object.packet_name,
+                                                      data_object.item_name)
+
       local_layout = Qt::VBoxLayout.new
       local_layout.setContentsMargins(0,0,0,0)
 
@@ -53,6 +57,18 @@ module Cosmos
       @telemetry_chooser.item_label.text   = '*Item:'
       local_layout.addWidget(@telemetry_chooser)
 
+      # Integer Field for array index
+      @item_array_index = IntegerChooser.new(self, '*Item Array Index:', 0, 0)
+      @item_array_index.value = data_object.item_array_index if data_object.item_array_index
+      if item.array_size
+        @array_item = true
+        @item_array_index.show
+      else
+        @array_item = false
+        @item_array_index.hide
+      end
+      local_layout.addWidget(@item_array_index)
+
       # Chooser for time item
       time_item_names = @telemetry_chooser.item_names
       @time_item_name = ComboboxChooser.new(self, '*Time Item:', time_item_names)
@@ -90,9 +106,6 @@ module Cosmos
       local_layout.addWidget(@analysis_samples)
       @layout.addLayout(local_layout)
 
-      packet, item = System.telemetry.packet_and_item(data_object.target_name,
-                                                      data_object.packet_name,
-                                                      data_object.item_name)
       if item.limits.values
         choices = ['TRUE', 'FALSE']
         @show_limits_lines = ComboboxChooser.new(self, 'Show Limits Lines:', choices)
@@ -122,6 +135,11 @@ module Cosmos
       data_object.set_item(@telemetry_chooser.target_name,
                            @telemetry_chooser.packet_name,
                            @telemetry_chooser.item_name)
+      if @array_item
+        data_object.item_array_index = @item_array_index.value
+      else
+        data_object.item_array_index = nil
+      end
       data_object.time_item_name = @time_item_name.string
       formatted_time_item_name = @formatted_time_item_name.string
       if formatted_time_item_name.strip.empty?
@@ -164,6 +182,18 @@ module Cosmos
       value_types.delete(data_object.value_type.to_s)
       value_types.unshift(data_object.value_type.to_s)
       @value_type.update_items(value_types, false)
+
+      packet, item = System.telemetry.packet_and_item(data_object.target_name,
+                                                      data_object.packet_name,
+                                                      data_object.item_name)
+      if item.array_size
+        @array_item = true
+        @item_array_index.show
+      else
+        @array_item = false
+        @item_array_index.hide 
+      end
+
     end
 
     # Handle the item name changing
@@ -174,6 +204,17 @@ module Cosmos
       value_types.delete(data_object.value_type.to_s)
       value_types.unshift(data_object.value_type.to_s)
       @value_type.update_items(value_types, false)
+
+      packet, item = System.telemetry.packet_and_item(data_object.target_name,
+                                                      data_object.packet_name,
+                                                      data_object.item_name)
+      if item.array_size
+        @array_item = true
+        @item_array_index.show
+      else
+        @array_item = false
+        @item_array_index.hide 
+      end
     end
 
   end # class HousekeepingDataObjectEditor

data/lib/cosmos/tools/tlm_grapher/data_objects/housekeeping_data_object.rb

@@ -31,6 +31,9 @@ module Cosmos
     # The housekeeping telemetry item's item name (string)
     attr_reader :item_name
 
+    # The housekeeping telemetry item's item array index, if applicable (integer)
+    attr_accessor :item_array_index
+
     # The housekeeping telemetry item's time item name (string)
     attr_accessor :time_item_name
 
@@ -58,6 +61,7 @@ module Cosmos
       @target_name = nil
       @packet_name = nil
       @item_name = nil
+      @item_array_index = nil
       @time_item_name = nil
       @formatted_time_item_name = nil
       @value_type = :CONVERTED
@@ -76,6 +80,7 @@ module Cosmos
     def configuration_string
       string = super()
       string << "      ITEM #{@target_name} #{@packet_name} #{@item_name}\n" if @target_name and @packet_name and @item_name
+      string << "      ITEM_ARRAY_INDEX #{@item_array_index}\n" if @item_array_index
       string << "      TIME_ITEM #{@time_item_name}\n" if @time_item_name
       string << "      FORMATTED_TIME_ITEM #{@formatted_time_item_name}\n" if @formatted_time_item_name
       string << "      VALUE_TYPE #{@value_type}\n"
@@ -93,6 +98,11 @@ module Cosmos
         parser.verify_num_parameters(3, 3, "ITEM <Target Name> <Packet Name> <Item Name>")
         set_item(parameters[0], parameters[1], parameters[2], true)
 
+      when 'ITEM_ARRAY_INDEX'
+        # Expect 1 parameter
+        parser.verify_num_parameters(1, 1, "ITEM_ARRAY_INDEX <Index>")
+        @item_array_index = parameters[0].to_i
+
       when 'TIME_ITEM'
         # Expect 1 parameter
         parser.verify_num_parameters(1, 1, "TIME_ITEM <Time Item Name>")
@@ -160,6 +170,9 @@ module Cosmos
         else
           y_value = packet.read(@item_name)
         end
+        if y_value.is_a?(Array) and @item_array_index and @item_array_index < y_value.size
+          y_value = y_value[@item_array_index]
+        end
         # Bail on the values if they are NaN or nil as we can't graph them
         return if x_value.nil? || y_value.nil? ||
           (x_value.respond_to?(:nan?) && x_value.nan?) ||
@@ -261,15 +274,13 @@ module Cosmos
 
     # Returns the name of this data object
     def name
+      str = ""
       if @target_name and @packet_name and @item_name
-        if @analysis != :NONE
-          "#{@target_name} #{@packet_name} #{@item_name} (#{@analysis})"
-        else
-          "#{@target_name} #{@packet_name} #{@item_name}"
-        end
-      else
-        ''
+        str << "#{@target_name} #{@packet_name} #{@item_name}"
+        str << "[#{@item_array_index}]" if @item_array_index
+        str << " (#{@analysis})" if @analysis != :NONE
       end
+      str
     end
 
     # Resets the data object
@@ -286,6 +297,7 @@ module Cosmos
       if @target_name and @packet_name and @item_name
         data_object.set_item(@target_name.clone, @packet_name.clone, @item_name.clone)
       end
+      data_object.item_array_index = @item_array_index if @item_array_index
       data_object.time_item_name = @time_item_name.clone if @time_item_name
       data_object.formatted_time_item_name = @formatted_time_item_name.clone if @formatted_time_item_name
       data_object.value_type = @value_type
@@ -316,6 +328,7 @@ module Cosmos
       if @target_name != edited_data_object.target_name or
          @packet_name != edited_data_object.packet_name or
          @item_name != edited_data_object.item_name or
+         @item_array_index != edited_data_object.item_array_index or
          @time_item_name != edited_data_object.time_item_name or
          @formatted_time_item_name != edited_data_object.formatted_time_item_name or
          @value_type != edited_data_object.value_type or