cosmos 3.8.0 → 3.8.1

data/lib/cosmos/packets/packet_item.rb

@@ -366,7 +366,7 @@ module Cosmos
     end
 
     def to_xtce_type(param_or_arg, xml)
-      # TODO: Arrays, Spline Conversions
+      # TODO: Spline Conversions
       case self.data_type
       when :INT, :UINT
         attrs = { :name => (self.name + '_Type') }
@@ -383,12 +383,13 @@ module Cosmos
           encoding = 'unsigned'
         end
         if @states
-			    xml['xtce'].send('Enumerated' + param_or_arg + 'Type', attrs) do
+          xml['xtce'].send('Enumerated' + param_or_arg + 'Type', attrs) do
+            to_xtce_endianness(xml)
             to_xtce_units(xml)
             xml['xtce'].IntegerDataEncoding(:sizeInBits => self.bit_size, :encoding => encoding)
-				    xml['xtce'].EnumerationList do
+            xml['xtce'].EnumerationList do
               @states.each do |state_name, state_value|
-					      xml['xtce'].Enumeration(:value => state_value, :label => state_name)
+                xml['xtce'].Enumeration(:value => state_value, :label => state_name)
               end
             end
           end
@@ -400,6 +401,7 @@ module Cosmos
             attrs[:signed] = signed
           end
           xml['xtce'].send(type_string, attrs) do
+            to_xtce_endianness(xml)
             to_xtce_units(xml)
             if (self.read_conversion and self.read_conversion.class == PolynomialConversion) or (self.write_conversion and self.write_conversion.class == PolynomialConversion)
               xml['xtce'].IntegerDataEncoding(:sizeInBits => self.bit_size, :encoding => encoding) do
@@ -432,6 +434,7 @@ module Cosmos
         attrs[:initialValue] = self.default if self.default and !self.array_size
         attrs[:shortDescription] = self.description if self.description
         xml['xtce'].send('Float' + param_or_arg + 'Type', attrs) do
+          to_xtce_endianness(xml)
           to_xtce_units(xml)
           if (self.read_conversion and self.read_conversion.class == PolynomialConversion) or (self.write_conversion and self.write_conversion.class == PolynomialConversion)
             xml['xtce'].FloatDataEncoding(:sizeInBits => self.bit_size, :encoding => 'IEEE754_1985') do
@@ -467,9 +470,10 @@ module Cosmos
         attrs[:initialValue] = self.default if self.default and !self.array_size
         attrs[:shortDescription] = self.description if self.description
         xml['xtce'].send('String' + param_or_arg + 'Type', attrs) do
+          to_xtce_endianness(xml)
           to_xtce_units(xml)
           xml['xtce'].StringDataEncoding(:encoding => 'UTF-8') do
-					  xml['xtce'].SizeInBits do
+            xml['xtce'].SizeInBits do
               xml['xtce'].Fixed do
                 xml['xtce'].FixedValue(self.bit_size.to_s)
               end
@@ -483,9 +487,10 @@ module Cosmos
         attrs[:shortDescription] = self.description if self.description
         #attrs[:initialValue] = self.default if self.default and !self.array_size
         xml['xtce'].send('Binary' + param_or_arg + 'Type', attrs) do
+          to_xtce_endianness(xml)
           to_xtce_units(xml)
           xml['xtce'].BinaryDataEncoding do
-					  xml['xtce'].SizeInBits do
+            xml['xtce'].SizeInBits do
               xml['xtce'].FixedValue(self.bit_size.to_s)
             end
           end
@@ -493,10 +498,24 @@ module Cosmos
       when :DERIVED
         raise "DERIVED data type not supported in XTCE"
       end
+
+      # Handle arrays
+      if self.array_size
+        # The above will have created the type for the array entries.   Now we create the type for the actual array.
+        attrs = { :name => (self.name + '_ArrayType') }
+        attrs[:shortDescription] = self.description if self.description
+        attrs[:arrayTypeRef] = (self.name + '_Type')
+        attrs[:numberOfDimensions] = '1' # COSMOS Only supports one-dimensional arrays
+        xml['xtce'].send('Array' + param_or_arg + 'Type', attrs)
+      end
     end
 
     def to_xtce_item(param_or_arg, xml)
-      xml['xtce'].send(param_or_arg, :name => self.name, "#{param_or_arg.downcase}TypeRef" => self.name + '_Type')
+      if self.array_size
+        xml['xtce'].send(param_or_arg, :name => self.name, "#{param_or_arg.downcase}TypeRef" => self.name + '_ArrayType')
+      else
+        xml['xtce'].send(param_or_arg, :name => self.name, "#{param_or_arg.downcase}TypeRef" => self.name + '_Type')
+      end
     end
 
     protected
@@ -511,6 +530,16 @@ module Cosmos
       end
     end
 
+    def to_xtce_endianness(xml)
+      if self.endianness == :LITTLE_ENDIAN and self.bit_size > 8
+        xml['xtce'].ByteOrderList do
+          (((self.bit_size - 1)/ 8) + 1).times do |byte_significance|
+            xml['xtce'].Byte(:byteSignificance => byte_significance)
+          end
+        end
+      end
+    end
+
     def to_xtce_conversion(xml)
       if self.read_conversion
         conversion = self.read_conversion
@@ -519,11 +548,11 @@ module Cosmos
       end
       if conversion and conversion.class == PolynomialConversion
         xml['xtce'].DefaultCalibrator do
-					xml['xtce'].PolynomialCalibrator do
+          xml['xtce'].PolynomialCalibrator do
             conversion.coeffs.each_with_index do |coeff, index|
-						  xml['xtce'].Term(:coefficient => coeff, :exponent => index)
+              xml['xtce'].Term(:coefficient => coeff, :exponent => index)
             end
-					end
+          end
         end
       end
     end

data/lib/cosmos/packets/parsers/packet_item_parser.rb

@@ -119,7 +119,11 @@ module Cosmos
       return nil if data_type == :STRING or data_type == :BLOCK
 
       index = append? ? 3 : 4
-      (ConfigParser.handle_defined_constants(@parser.parameters[index].convert_to_value))..(ConfigParser.handle_defined_constants(@parser.parameters[index+1].convert_to_value))
+      min = ConfigParser.handle_defined_constants(
+        @parser.parameters[index].convert_to_value, get_data_type(), get_bit_size())
+      max = ConfigParser.handle_defined_constants(
+        @parser.parameters[index+1].convert_to_value, get_data_type(), get_bit_size())
+      min..max
     end
 
     def get_default
@@ -130,7 +134,8 @@ module Cosmos
       if data_type == :STRING or data_type == :BLOCK
         return @parser.parameters[index]
       else
-        return ConfigParser.handle_defined_constants(@parser.parameters[index+2].convert_to_value)
+        return ConfigParser.handle_defined_constants(
+          @parser.parameters[index+2].convert_to_value, get_data_type(), get_bit_size())
       end
     end
 

data/lib/cosmos/script/commands.rb

@@ -178,6 +178,11 @@ module Cosmos
       results
     end
 
+    # Returns the buffer from the most recent specified command
+    def get_cmd_buffer(target_name, command_name)
+      return $cmd_tlm_server.get_cmd_buffer(target_name, command_name)
+    end    
+
   end # module Script
 
 end # module Cosmos

data/lib/cosmos/script/scripting.rb

@@ -596,13 +596,13 @@ module Cosmos
       when 3
         target_name, packet_name, item_name = extract_fields_from_tlm_text(args[0])
         expected_value = args[1]
-        tolerance = args[2]
+        tolerance = args[2].abs
       when 5
         target_name = args[0]
         packet_name = args[1]
         item_name = args[2]
         expected_value = args[3]
-        tolerance = args[4]
+        tolerance = args[4].abs
       else
         # Invalid number of arguments
         raise "ERROR: Invalid number of arguments (#{args.length}) passed to #{function_name}()"
@@ -676,7 +676,7 @@ module Cosmos
       when 4, 5
         target_name, packet_name, item_name = extract_fields_from_tlm_text(args[0])
         expected_value = args[1]
-        tolerance = args[2]
+        tolerance = args[2].abs
         timeout = args[3]
         if args.length == 5
           polling_rate = args[4]
@@ -688,7 +688,7 @@ module Cosmos
         packet_name = args[1]
         item_name = args[2]
         expected_value = args[3]
-        tolerance = args[4]
+        tolerance = args[4].abs
         timeout = args[5]
         if args.length == 7
           polling_rate = args[6]
@@ -799,7 +799,7 @@ module Cosmos
 
     def cosmos_script_wait_implementation_tolerance(target_name, packet_name, item_name, value_type, expected_value, tolerance, timeout, polling_rate = DEFAULT_TLM_POLLING_RATE)
       _cosmos_script_wait_implementation(target_name, packet_name, item_name, value_type, timeout, polling_rate) do
-        "((#{expected_value} - #{tolerance})..(#{expected_value} + #{tolerance})).include? value"
+        "((#{expected_value} - #{tolerance.abs})..(#{expected_value} + #{tolerance.abs})).include? value"
       end
     end
 

data/lib/cosmos/script/telemetry.rb

@@ -122,6 +122,11 @@ module Cosmos
       $cmd_tlm_server.get_tlm_details(items)
     end
 
+    # Returns the buffer from the telemetry packet.
+    def get_tlm_buffer(target_name, packet_name)
+      return $cmd_tlm_server.get_tlm_buffer(target_name, packet_name)
+    end    
+
     # Subscribe to one or more telemetry packets. The queue ID is returned for
     # use in get_packet_data and unsubscribe_packet_data.
     # Usage:

data/lib/cosmos/tools/cmd_tlm_server/api.rb

@@ -28,6 +28,7 @@ module Cosmos
         'cmd_raw_no_hazardous_check',
         'cmd_raw_no_checks',
         'send_raw',
+        'get_cmd_buffer',
         'get_cmd_list',
         'get_cmd_param_list',
         'get_cmd_hazardous',
@@ -40,6 +41,7 @@ module Cosmos
         'tlm_variable',
         'set_tlm',
         'set_tlm_raw',
+        'get_tlm_buffer',
         'get_tlm_packet',
         'get_tlm_values',
         'get_tlm_list',
@@ -226,6 +228,16 @@ module Cosmos
       nil
     end
 
+    # Returns the raw buffer from the most recent specified command packet.
+    #
+    # @param target_name [String] Target name of the command
+    # @param command_name [String] Packet name of the command
+    # @return [String] last command buffer packet
+    def get_cmd_buffer(target_name, command_name)
+      packet = System.commands.packet(target_name, command_name)
+      return packet.buffer
+    end
+
     # Returns the list of all the command names and their descriptions from the
     # given target.
     #
@@ -480,6 +492,16 @@ module Cosmos
       nil
     end
 
+    # Returns the raw buffer for a telemetry packet.
+    #
+    # @param target_name [String] Name of the target
+    # @param packet_name [String] Name of the packet
+    # @return [String] last telemetry packet buffer
+    def get_tlm_buffer(target_name, packet_name)
+      packet = System.telemetry.packet(target_name, packet_name)
+      return packet.buffer
+    end    
+
     # Returns all the values (along with their limits state) for a packet.
     #
     # @param target_name [String] Name of the target

data/lib/cosmos/tools/limits_monitor/limits_monitor.rb

@@ -58,6 +58,12 @@ module Cosmos
     attr_reader :ignored
     # @return [Boolean] Whether the limits items have been fetched from the server
     attr_reader :initialized
+    # @return [Boolean] Whether to display an item with a colorblind option
+    attr_accessor :colorblind
+    # @return [Boolean] Whether to display an item with operational limits while it's
+    #   currently green. If false, items are not displayed until they go yellow
+    #   or red. If true, items are displayed when transitioning from blue to green.
+    attr_accessor :monitor_operational
 
     UNKNOWN_ARRAY = ['UNKNOWN', 'UNKNOWN', nil]
 
@@ -73,6 +79,8 @@ module Cosmos
       @out_of_limits = []
       @queue_id = nil
       @limits_set = :DEFAULT
+      @colorblind = false
+      @monitor_operational = true
       request_reset()
     end
 
@@ -237,6 +245,10 @@ module Cosmos
             @ignored << ([params[0], params[1], params[2]])
           when 'IGNORE_PACKET'
             @ignored << ([params[0], params[1], nil])
+          when 'COLOR_BLIND'
+            @colorblind = true
+          when 'IGNORE_OPERATIONAL_LIMITS'
+            @monitor_operational = false
           end
         end
         result = "#{filename} loaded. "
@@ -256,6 +268,12 @@ module Cosmos
     def save_config(filename)
       begin
         File.open(filename, "w") do |file|
+          if @colorblind
+            file.puts("COLOR_BLIND")
+          end
+          unless @monitor_operational
+            file.puts("IGNORE_OPERATIONAL_LIMITS")
+          end
           @ignored.each do |target, pkt_name, item_name|
             if item_name
               file.puts("IGNORE_ITEM #{target} #{pkt_name} #{item_name}")
@@ -311,7 +329,11 @@ module Cosmos
         message << "ERROR: "
         color = :RED
         out_of_limit(item)
-      when :GREEN, :GREEN_HIGH, :GREEN_LOW
+      when :GREEN_HIGH, :GREEN_LOW
+        message << "INFO: "
+        color = :GREEN
+        out_of_limit(item) if @monitor_operational
+      when :GREEN
         message << "INFO: "
         color = :GREEN
       when :BLUE
@@ -343,6 +365,8 @@ module Cosmos
   # encountered by the COSMOS server. It provides the ability to ignore and
   # restore limits as well as logs all limits events.
   class LimitsMonitor < QtTool
+    attr_reader :limits_items
+
     # LimitsWidget displays either a stale packet using the Label widget
     # or more commonly an out of limits item using the Labelvaluelimitsbar
     # Widget.
@@ -364,7 +388,7 @@ module Cosmos
         item = [target_name, packet_name, item_name]
         if item_name
           @value = LabelvaluelimitsbarWidget.new(@layout, target_name, packet_name, item_name)
-          @value.set_setting('COLORBLIND', [@colorblind])
+	  @value.set_setting('COLORBLIND', [parent.limits_items.colorblind])
           @value.process_settings
         else
           @value = LabelWidget.new(layout, "#{target_name} #{packet_name} is STALE")
@@ -530,7 +554,9 @@ module Cosmos
         dialog.setWindowTitle('Options')
 
         colorblind_box = Qt::CheckBox.new('Colorblind Mode Enabled', self)
-        colorblind_box.setCheckState(Qt::Checked) if @colorblind
+        colorblind_box.setCheckState(Qt::Checked) if @limits_items.colorblind
+        operational_limit_box = Qt::CheckBox.new('Monitor Operational Limits', self)
+        operational_limit_box.setCheckState(Qt::Checked) if @limits_items.monitor_operational
 
         ok = Qt::PushButton.new('Ok') do
           connect(SIGNAL('clicked()')) { dialog.accept }
@@ -544,18 +570,24 @@ module Cosmos
         end
         dialog.layout = Qt::VBoxLayout.new do
           addWidget(colorblind_box)
+          addWidget(operational_limit_box)
           addLayout(buttons)
         end
 
         case dialog.exec
         when Qt::Dialog::Accepted
+          if (operational_limit_box.checkState() == Qt::Checked)
+            @limits_items.monitor_operational = true
+          else
+            @limits_items.monitor_operational = false
+          end
           if (colorblind_box.checkState() == Qt::Checked)
-            @colorblind = true
+            @limits_items.colorblind = true
           else
-            @colorblind = false
+            @limits_items.colorblind = false
           end
           (0...@scroll_layout.count).each do |index|
-            @scroll_layout.itemAt(index).widget.set_colorblind(@colorblind)
+            @scroll_layout.itemAt(index).widget.set_colorblind(@limits_items.colorblind)
           end
         end
         dialog.dispose
@@ -784,10 +816,6 @@ module Cosmos
           palette = Cosmos.getPalette(Cosmos.getColor(0, 0, 0), Cosmos.getColor(255,0,0))
           @monitored_state_text_field.setPalette(palette)
           text = 'Red'
-        when :BLUE
-          palette = Cosmos.getPalette(Cosmos.getColor(0, 0, 0), Cosmos.getColor(0,0,255))
-          @monitored_state_text_field.setPalette(palette)
-          text = 'Blue'
         end
         text << ' - Some Items Ignored' if @limits_items.ignored_items?
         @monitored_state_text_field.text = text

data/lib/cosmos/tools/packet_viewer/packet_viewer.rb

@@ -116,6 +116,14 @@ module Cosmos
         end
       end
 
+      @derived_last_action = Qt::Action.new(tr('&Display Derived Last'), self)
+      @derived_last_keyseq = Qt::KeySequence.new(tr('Ctrl+D'))
+      @derived_last_action.shortcut  = @derived_last_keyseq
+      @derived_last_action.statusTip = tr('Display derived telemetry items last')
+      @derived_last_action.setCheckable(true)
+      @derived_last_action.setChecked(false)
+      @derived_last_action.connect(SIGNAL('triggered()')) { update_tlm_items() }
+
       @formatted_tlm_units_action = Qt::Action.new(tr('Formatted Telemetry With &Units'), self)
       @formatted_tlm_units_keyseq = Qt::KeySequence.new(tr('Ctrl+U'))
       @formatted_tlm_units_action.shortcut  = @formatted_tlm_units_keyseq
@@ -177,6 +185,7 @@ module Cosmos
       view_menu = menuBar.addMenu(tr('&View'))
       view_menu.addAction(@color_blind_action)
       view_menu.addAction(@hide_ignored_action)
+      view_menu.addAction(@derived_last_action)
       view_menu.addSeparator.setText(tr('Formatting'));
       view_menu.addAction(@formatted_tlm_units_action)
       view_menu.addAction(@formatted_tlm_action)
@@ -253,7 +262,8 @@ module Cosmos
     end
 
     def file_options
-      @polling_rate = Qt::InputDialog.getDouble(self, tr("Options"), tr("Polling Rate (sec):"), @polling_rate, 0, 1000, 1, nil)
+      @polling_rate = Qt::InputDialog.getDouble(self, tr("Options"), tr("Polling Rate (sec):"),
+                                                @polling_rate, 0, 1000, 1, nil)
     end
 
     def update_all
@@ -330,8 +340,22 @@ module Cosmos
       # Update Telemetry Items
       tlm_items = []
       begin
-        System.telemetry.items(target_name, packet_name).each do |item|
-          tlm_items << [item.name, item.states, item.description]
+        @derived_row = 0
+        if @derived_last_action.isChecked
+          derived = []
+          System.telemetry.items(target_name, packet_name).each do |item|
+            if item.data_type == :DERIVED
+              derived << [item.name, item.states, item.description]
+            else
+              tlm_items << [item.name, item.states, item.description]
+              @derived_row += 1
+            end
+          end
+	  tlm_items.concat(derived) # Tack the derived onto the end
+        else
+          System.telemetry.items(target_name, packet_name).each do |item|
+            tlm_items << [item.name, item.states, item.description]
+          end
         end
       rescue
         # Unknown packet
@@ -371,9 +395,11 @@ module Cosmos
 
       # Handle Table Clicks
       @table.setMouseTracking(true)
-      connect(@table, SIGNAL('cellEntered(int, int)'), self, SLOT('mouse_over(int, int)'))
+      connect(@table, SIGNAL('cellEntered(int, int)'),
+              self, SLOT('mouse_over(int, int)'))
       @table.setContextMenuPolicy(Qt::CustomContextMenu)
-      connect(@table, SIGNAL('customContextMenuRequested(const QPoint&)'), self, SLOT('context_menu(const QPoint&)'))
+      connect(@table, SIGNAL('customContextMenuRequested(const QPoint&)'),
+              self, SLOT('context_menu(const QPoint&)'))
 
       # Start Update Thread
       update_needed = false
@@ -403,15 +429,23 @@ module Cosmos
 
             Qt.execute_in_main_thread(true) do
               # If we need an update (which indicates we've reconnected to the server)
-              # Then we call update_all which will update all the telemetry items and kill and respawn this thread
+              # Then we call update_all which will update all the telemetry items
+              # and kill and respawn this thread
               if update_needed
                 update_all()
               end
 
               if tlm_items
-                row = 0
+                # Start with wherever the first derived item is
+                # See above where we populate tlm_items
+                row = @derived_row
                 tlm_items.each do |name, value, limits_state|
                   text = value.to_s
+                  # If derived is last we need to reset the row to 0
+                  # to start populating the real items at the top
+                  if row == (tlm_items.length)
+                    row = 0
+                  end
 
                   case limits_state
                   when :GREEN, :GREEN_HIGH
@@ -527,7 +561,8 @@ module Cosmos
           options.height = 200
           options.title = 'Packet Viewer : Formatted Telemetry with Units'
           option_parser.separator "Packet Viewer Specific Options:"
-          option_parser.on("-p", "--packet 'TARGET_NAME PACKET_NAME'", "Start viewing the specified packet") do |arg|
+          option_parser.on("-p", "--packet 'TARGET_NAME PACKET_NAME'",
+                           "Start viewing the specified packet") do |arg|
             split = arg.split
             if split.length != 2
               puts "Packet must be specified as 'TARGET_NAME PACKET_NAME' in quotes"
@@ -535,7 +570,10 @@ module Cosmos
             end
             options.packet = split
           end
-          option_parser.on("-r", "--rate PERIOD", "Set the polling rate to PERIOD (unit seconds)") { |arg| options.rate = Float(arg) } 
+          option_parser.on("-r", "--rate PERIOD",
+                           "Set the polling rate to PERIOD (unit seconds)") do |arg|
+            options.rate = Float(arg)
+          end
         end
 
         super(option_parser, options)
@@ -545,3 +583,4 @@ module Cosmos
   end # class PacketViewer
 
 end # module Cosmos
+