cosmos 4.2.4-java → 4.3.0-java

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

@@ -305,21 +305,24 @@ module Cosmos
       if log_change
         # Write to Server Messages that limits state has changed
         tgt_pkt_item_str = "#{packet.target_name} #{packet.packet_name} #{item.name} = #{value} is"
+        packet_time = packet.packet_time
+        pkt_time_str = ""
+        pkt_time_str << " (#{packet.packet_time.sys.formatted})" if packet_time
         case item.limits.state
         when :BLUE
-          Logger.info "<B>#{tgt_pkt_item_str} #{item.limits.state}"
+          Logger.info "<B>#{tgt_pkt_item_str} #{item.limits.state}#{pkt_time_str}"
         when :GREEN, :GREEN_LOW, :GREEN_HIGH
-          Logger.info "<G>#{tgt_pkt_item_str} #{item.limits.state}"
+          Logger.info "<G>#{tgt_pkt_item_str} #{item.limits.state}#{pkt_time_str}"
         when :YELLOW, :YELLOW_LOW, :YELLOW_HIGH
-          Logger.warn "<Y>#{tgt_pkt_item_str} #{item.limits.state}"
+          Logger.warn "<Y>#{tgt_pkt_item_str} #{item.limits.state}#{pkt_time_str}"
         when :RED, :RED_LOW, :RED_HIGH
-          Logger.error "<R>#{tgt_pkt_item_str} #{item.limits.state}"
+          Logger.error "<R>#{tgt_pkt_item_str} #{item.limits.state}#{pkt_time_str}"
         else
-          Logger.error "#{tgt_pkt_item_str} UNKNOWN"
+          Logger.error "#{tgt_pkt_item_str} UNKNOWN#{pkt_time_str}"
         end
       end
 
-      post_limits_event(:LIMITS_CHANGE, [packet.target_name, packet.packet_name, item.name, old_limits_state, item.limits.state])
+      post_limits_event(:LIMITS_CHANGE, [packet.target_name, packet.packet_name, item.name, old_limits_state, item.limits.state, packet_time ? packet_time.tv_sec : nil, packet_time ? packet_time.tv_usec : nil])
 
       if @mode == :CMD_TLM_SERVER
         if item.limits.response
@@ -457,7 +460,7 @@ module Cosmos
                 received_time = packet.received_time
                 received_time ||= Time.now.sys
                 queue << [packet.buffer, target_name, packet_name,
-                  received_time.tv_sec, received_time.tv_usec, packet.received_count]
+                  received_time.tv_sec, received_time.tv_usec, packet.received_count, packet.stored, packet.extra]
                 if queue.length > queue_size
                   # Drop queue
                   queues_to_drop << id
@@ -529,7 +532,7 @@ module Cosmos
           received_time = packet.received_time
           received_time ||= Time.now.sys
           @@instance.packet_data_queues[id][0] << [packet.buffer, 'SYSTEM', 'META',
-            received_time.tv_sec, received_time.tv_usec, packet.received_count]
+            received_time.tv_sec, received_time.tv_usec, packet.received_count, packet.stored, packet.extra]
         end
       end
       return id
@@ -572,7 +575,7 @@ module Cosmos
           rescue ThreadError
             received_time ||= Time.now.sys
             return [@last_subscribed_packet.buffer, @last_subscribed_packet.target_name,
-              @last_subscribed_packet.packet_name, received_time.tv_sec, received_time.tv_usec, @last_subscribed_packet.received_count]
+              @last_subscribed_packet.packet_name, received_time.tv_sec, received_time.tv_usec, @last_subscribed_packet.received_count, @last_subscribed_packet.stored, @last_subscribed_packet.extra]
           end
         else
           return queue.pop(non_block)

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

@@ -153,7 +153,7 @@ module Cosmos
             current_interface_or_router.name = interface_name
             @interfaces[interface_name] = current_interface_or_router
 
-          when 'LOG', 'DONT_LOG', 'TARGET'
+          when 'LOG', 'LOG_STORED', 'DONT_LOG', 'TARGET'
             raise parser.error("No current interface for #{keyword}") unless current_interface_or_router and current_type == :INTERFACE
 
             case keyword
@@ -166,6 +166,12 @@ module Cosmos
               current_interface_log_added = true
               current_interface_or_router.packet_log_writer_pairs << packet_log_writer_pair unless current_interface_or_router.packet_log_writer_pairs.include?(packet_log_writer_pair)
 
+            when 'LOG_STORED'
+              parser.verify_num_parameters(1, 1, "#{keyword} <Packet Log Writer Name>")
+              packet_log_writer_pair = @packet_log_writer_pairs[params[0].upcase]
+              raise parser.error("Unknown packet log writer: #{params[0].upcase}") unless packet_log_writer_pair
+              current_interface_or_router.stored_packet_log_writer_pairs << packet_log_writer_pair unless current_interface_or_router.stored_packet_log_writer_pairs.include?(packet_log_writer_pair)
+
             when 'DONT_LOG'
               parser.verify_num_parameters(0, 0, "#{keyword}")
               current_interface_or_router.packet_log_writer_pairs = []

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

@@ -129,7 +129,7 @@ module Cosmos
       @first_output = 0
       @options = options
 
-      statusBar.showMessage(tr("")) # Show blank message to initialize status bar
+      statusBar.showMessage("") # Show blank message to initialize status bar
 
       initialize_actions()
       initialize_menus()
@@ -194,26 +194,26 @@ module Cosmos
       super()
 
       # File actions
-      @file_reload = Qt::Action.new(tr('&Reload Configuration'), self)
-      @file_reload.statusTip = tr('Reload configuraton and reset')
+      @file_reload = Qt::Action.new('&Reload Configuration', self)
+      @file_reload.statusTip = 'Reload configuraton and reset'
       @file_reload.connect(SIGNAL('triggered()')) do
         CmdTlmServer.instance.reload()
       end
 
       # Edit actions
-      @edit_clear_counters = Qt::Action.new(tr('&Clear Counters'), self)
-      @edit_clear_counters.statusTip = tr('Clear counters for all interfaces and targets')
+      @edit_clear_counters = Qt::Action.new('&Clear Counters', self)
+      @edit_clear_counters.statusTip = 'Clear counters for all interfaces and targets'
       @edit_clear_counters.connect(SIGNAL('triggered()')) { CmdTlmServer.clear_counters }
     end
 
     def initialize_menus
-      @file_menu = menuBar.addMenu(tr('&File'))
+      @file_menu = menuBar.addMenu('&File')
       @file_menu.addAction(@file_reload)
       @file_menu.addAction(@exit_action)
 
       # Do not allow clear counters in production mode
       unless @production
-        @edit_menu = menuBar.addMenu(tr('&Edit'))
+        @edit_menu = menuBar.addMenu('&Edit')
         @edit_menu.addAction(@edit_clear_counters)
       end
 
@@ -641,7 +641,7 @@ module Cosmos
             end
           else
             options.replay = false
-          end          
+          end
         end
 
         super(option_parser, options)

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

@@ -52,6 +52,8 @@ module Cosmos
         if identified_command
           identified_command.received_time = packet.received_time
           identified_command.raw = packet.raw
+          identified_command.stored = packet.stored
+          identified_command.extra = packet.extra
           packet = identified_command
         end
       end
@@ -69,6 +71,8 @@ module Cosmos
       end
       command.received_time = packet.received_time
       command.raw = packet.raw
+      command.stored = packet.stored
+      command.extra = packet.extra
       command.buffer = packet.buffer
       command.received_count += 1
       Logger.info System.commands.format(command, target.ignored_parameters) if !command.messages_disabled and command.target_name != 'UNKNOWN'
@@ -99,8 +103,15 @@ module Cosmos
       end
 
       # Write to command packet logs
-      interface.packet_log_writer_pairs.each do |packet_log_writer_pair|
-        packet_log_writer_pair.cmd_log_writer.write(command)
+      if command.stored and !interface.stored_packet_log_writer_pairs.empty?
+        interface.stored_packet_log_writer_pairs.each do |packet_log_writer_pair|
+          packet_log_writer_pair.cmd_log_writer.write(command)
+        end
+      else
+        interface.packet_log_writer_pairs.each do |packet_log_writer_pair|
+          # Write errors are handled by the log writer
+          packet_log_writer_pair.cmd_log_writer.write(command)
+        end
       end
     end
 

data/lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb

@@ -127,7 +127,7 @@ module Cosmos
     def populate_interface_table(interfaces, interfaces_table)
       row = 0
       interfaces.all.each do |interface_name, interface|
-        item = Qt::TableWidgetItem.new(Qt::Object.tr(interface_name))
+        item = Qt::TableWidgetItem.new(interface_name)
         item.setTextAlignment(ALIGN_CENTER)
         interfaces_table.setItem(row, 0, item)
         interfaces_table.setCellWidget(row, 1, create_button(interface, interface_name))
@@ -138,7 +138,7 @@ module Cosmos
           interface.bytes_written, interface.bytes_read,
           interface.write_count, interface.read_count].each do |val|
 
-          item = Qt::TableWidgetItem.new(val.to_s)#Qt::Object.tr(val.to_s))
+          item = Qt::TableWidgetItem.new(val.to_s)
           item.setTextAlignment(ALIGN_CENTER)
           interfaces_table.setItem(row, index, item)
           index += 1

data/lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb

@@ -77,7 +77,7 @@ module Cosmos
 
     def populate_logging_actions(layout)
       # Add all the action buttons
-      actions = Qt::GroupBox.new(Qt::Object.tr("Actions"))
+      actions = Qt::GroupBox.new("Actions")
       actions_layout = Qt::VBoxLayout.new(actions)
       button_layout = Qt::GridLayout.new
 
@@ -92,13 +92,13 @@ module Cosmos
 
       log_buttons.each do |text, location, method|
         next if text =~ /Stop/ and @production
-        button = Qt::PushButton.new(Qt::Object.tr(text))
+        button = Qt::PushButton.new(text)
         button_layout.addWidget(button, location[0], location[1])
         button.connect(SIGNAL('clicked()')) do
           begin
             CmdTlmServer.instance.send(method, 'ALL')
           rescue Exception => error
-            statusBar.showMessage(Qt::Object.tr(error.message))
+            statusBar.showMessage(error.message)
           end
         end
       end
@@ -109,13 +109,13 @@ module Cosmos
     end
 
     def create_log_layout(form_layout, log_writer, label_prefix)
-      label = Qt::Label.new(Qt::Object.tr(log_writer.logging_enabled.to_s))
+      label = Qt::Label.new(log_writer.logging_enabled.to_s)
       label.setTextInteractionFlags(Qt::TextSelectableByMouse)
       form_layout.addRow("#{label_prefix} Logging:", label)
-      label = Qt::Label.new(Qt::Object.tr(log_writer.queue.size.to_s))
+      label = Qt::Label.new(log_writer.queue.size.to_s)
       label.setTextInteractionFlags(Qt::TextSelectableByMouse)
       form_layout.addRow("#{label_prefix} Queue Size:", label)
-      label = Qt::Label.new(Qt::Object.tr(log_writer.filename))
+      label = Qt::Label.new(log_writer.filename)
       label.setTextInteractionFlags(Qt::TextSelectableByMouse)
       form_layout.addRow("#{label_prefix} Filename:", label)
       file_size = 0
@@ -124,7 +124,7 @@ module Cosmos
       rescue Exception
         # Do nothing on error
       end
-      label = Qt::Label.new(Qt::Object.tr(file_size.to_s))
+      label = Qt::Label.new(file_size.to_s)
       label.setTextInteractionFlags(Qt::TextSelectableByMouse)
       form_layout.addRow("#{label_prefix} File Size:", label)
     end
@@ -142,30 +142,30 @@ module Cosmos
 
         form_layout = Qt::FormLayout.new
         @logging_layouts[packet_log_writer_pair_name] = form_layout
-        label = Qt::Label.new(Qt::Object.tr(interfaces.join(", ")))
+        label = Qt::Label.new(interfaces.join(", "))
         label.setTextInteractionFlags(Qt::TextSelectableByMouse)
         form_layout.addRow("Interfaces:", label)
         create_log_layout(form_layout, packet_log_writer_pair.cmd_log_writer, 'Cmd')
         create_log_layout(form_layout, packet_log_writer_pair.tlm_log_writer, 'Tlm')
 
         button_layout = Qt::HBoxLayout.new
-        start_button = Qt::PushButton.new(Qt::Object.tr('Start Cmd Logging'))
+        start_button = Qt::PushButton.new('Start Cmd Logging')
         button_layout.addWidget(start_button)
         start_button.connect(SIGNAL('clicked()')) do
           CmdTlmServer.instance.start_cmd_log(packet_log_writer_pair_name)
         end
-        start_button = Qt::PushButton.new(Qt::Object.tr('Start Tlm Logging'))
+        start_button = Qt::PushButton.new('Start Tlm Logging')
         button_layout.addWidget(start_button)
         start_button.connect(SIGNAL('clicked()')) do
           CmdTlmServer.instance.start_tlm_log(packet_log_writer_pair_name)
         end
         if @production == false
-          stop_button = Qt::PushButton.new(Qt::Object.tr('Stop Cmd Logging'))
+          stop_button = Qt::PushButton.new('Stop Cmd Logging')
           button_layout.addWidget(stop_button)
           stop_button.connect(SIGNAL('clicked()')) do
             CmdTlmServer.instance.stop_cmd_log(packet_log_writer_pair_name)
           end
-          stop_button = Qt::PushButton.new(Qt::Object.tr('Stop Tlm Logging'))
+          stop_button = Qt::PushButton.new('Stop Tlm Logging')
           button_layout.addWidget(stop_button)
           stop_button.connect(SIGNAL('clicked()')) do
             CmdTlmServer.instance.stop_tlm_log(packet_log_writer_pair_name)
@@ -175,7 +175,7 @@ module Cosmos
         log_layout.addLayout(form_layout)
         layout.addWidget(log)
       end
-      layout.addWidget(Qt::Label.new(Qt::Object.tr("Note: Buffered IO operations cause file size to not reflect total logged data size until the log file is closed.")))
+      layout.addWidget(Qt::Label.new("Note: Buffered IO operations cause file size to not reflect total logged data size until the log file is closed."))
     end
   end
 end

data/lib/cosmos/tools/cmd_tlm_server/gui/packets_tab.rb

@@ -116,11 +116,11 @@ module Cosmos
         packets.sort.each do |packet_name, packet|
           packet.received_count ||= 0
           next if packet.hidden
-          target_name_widget = Qt::TableWidgetItem.new(Qt::Object.tr(target_name))
+          target_name_widget = Qt::TableWidgetItem.new(target_name)
           target_name_widget.setTextAlignment(Qt::AlignRight | Qt::AlignVCenter)
           table.setItem(row, 0, target_name_widget)
-          table.setItem(row, 1, Qt::TableWidgetItem.new(Qt::Object.tr(packet_name)))
-          packet_count = Qt::TableWidgetItem.new(Qt::Object.tr(packet.received_count.to_s))
+          table.setItem(row, 1, Qt::TableWidgetItem.new(packet_name))
+          packet_count = Qt::TableWidgetItem.new(packet.received_count.to_s)
           packet_count.setTextAlignment(Qt::AlignCenter)
           table.setItem(row, 2, packet_count)
           view_raw = Qt::PushButton.new("View Raw")
@@ -151,7 +151,7 @@ module Cosmos
         end
         table.setCellWidget(row, 4, view_pv)
       else
-        table_widget = Qt::TableWidgetItem.new(Qt::Object.tr('N/A'))
+        table_widget = Qt::TableWidgetItem.new('N/A')
         table_widget.setTextAlignment(Qt::AlignCenter)
         table.setItem(row, 4, table_widget)
       end

data/lib/cosmos/tools/cmd_tlm_server/gui/status_tab.rb

@@ -53,7 +53,7 @@ module Cosmos
     private
 
     def populate_limits_status(layout)
-      limits = Qt::GroupBox.new(Qt::Object.tr("Limits Status"))
+      limits = Qt::GroupBox.new("Limits Status")
       limits_layout = Qt::FormLayout.new(limits)
       current_limits_set = System.limits_set.to_s
 
@@ -88,7 +88,7 @@ module Cosmos
         @previous_request_count = 0
       end
 
-      api = Qt::GroupBox.new(Qt::Object.tr("API Status"))
+      api = Qt::GroupBox.new("API Status")
       api_layout = Qt::VBoxLayout.new(api)
       @api_table = Qt::TableWidget.new()
       @api_table.verticalHeader.hide()
@@ -97,14 +97,14 @@ module Cosmos
       @api_table.setHorizontalHeaderLabels(["Port", "Num Clients", "Requests", "Requests/Sec", "Avg Request Time", "Estimated Utilization"])
 
       if CmdTlmServer.mode == :CMD_TLM_SERVER
-        @api_table.setItem(0, 0, Qt::TableWidgetItem.new(Qt::Object.tr(System.ports['CTS_API'].to_s)))
+        @api_table.setItem(0, 0, Qt::TableWidgetItem.new(System.ports['CTS_API'].to_s))
       else
-        @api_table.setItem(0, 0, Qt::TableWidgetItem.new(Qt::Object.tr(System.ports['REPLAY_API'].to_s)))
+        @api_table.setItem(0, 0, Qt::TableWidgetItem.new(System.ports['REPLAY_API'].to_s))
       end
-      item0 = Qt::TableWidgetItem.new(Qt::Object.tr(CmdTlmServer.json_drb.num_clients.to_s))
+      item0 = Qt::TableWidgetItem.new(CmdTlmServer.json_drb.num_clients.to_s)
       item0.setTextAlignment(Qt::AlignCenter)
       @api_table.setItem(0, 1, item0)
-      item = Qt::TableWidgetItem.new(Qt::Object.tr(@previous_request_count.to_s))
+      item = Qt::TableWidgetItem.new(@previous_request_count.to_s)
       item.setTextAlignment(Qt::AlignCenter)
       @api_table.setItem(0, 2, item)
       item2 = Qt::TableWidgetItem.new("0.0")
@@ -122,7 +122,7 @@ module Cosmos
     end
 
     def populate_system_status(layout)
-      system = Qt::GroupBox.new(Qt::Object.tr("System Status"))
+      system = Qt::GroupBox.new("System Status")
       system_layout = Qt::VBoxLayout.new(system)
       @system_table = Qt::TableWidget.new()
       @system_table.verticalHeader.hide()
@@ -148,7 +148,7 @@ module Cosmos
     end
 
     def populate_background_status(layout)
-      background_tasks_groupbox = Qt::GroupBox.new(Qt::Object.tr("Background Tasks"))
+      background_tasks_groupbox = Qt::GroupBox.new("Background Tasks")
       background_tasks_layout = Qt::VBoxLayout.new(background_tasks_groupbox)
       @background_tasks_table = Qt::TableWidget.new()
       @background_tasks_table.verticalHeader.hide()

data/lib/cosmos/tools/cmd_tlm_server/gui/targets_tab.rb

@@ -68,21 +68,21 @@ module Cosmos
     def populate_targets_table
       row = 0
       System.targets.sort.each do |target_name, target|
-        target_name_widget = Qt::TableWidgetItem.new(Qt::Object.tr(target_name))
+        target_name_widget = Qt::TableWidgetItem.new(target_name)
         target_name_widget.setTextAlignment(Qt::AlignCenter)
         @targets_table.setItem(row, 0, target_name_widget)
         if target.interface
-          interface_name_widget = Qt::TableWidgetItem.new(Qt::Object.tr(target.interface.name.to_s))
+          interface_name_widget = Qt::TableWidgetItem.new(target.interface.name.to_s)
         else
-          interface_name_widget = Qt::TableWidgetItem.new(Qt::Object.tr(''))
+          interface_name_widget = Qt::TableWidgetItem.new('')
         end
         interface_name_widget.setTextAlignment(Qt::AlignCenter)
         @targets_table.setItem(row, 1, interface_name_widget)
-        cmd_cnt = Qt::TableWidgetItem.new(Qt::Object.tr(target.cmd_cnt.to_s))
+        cmd_cnt = Qt::TableWidgetItem.new(target.cmd_cnt.to_s)
         cmd_cnt.setTextAlignment(Qt::AlignCenter)
         @targets_table.setItem(row, 2, cmd_cnt)
 
-        tlm_cnt = Qt::TableWidgetItem.new(Qt::Object.tr(target.tlm_cnt.to_s))
+        tlm_cnt = Qt::TableWidgetItem.new(target.tlm_cnt.to_s)
         tlm_cnt.setTextAlignment(Qt::AlignCenter)
         @targets_table.setItem(row, 3, tlm_cnt)
 

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

@@ -140,34 +140,43 @@ module Cosmos
     protected
 
     def handle_packet(packet)
-      # Identify and update packet
-      if packet.identified?
-        begin
-          # Preidentifed packet - place it into the current value table
-          identified_packet = System.telemetry.update!(packet.target_name,
-                                                       packet.packet_name,
-                                                       packet.buffer)
-        rescue RuntimeError
-          # Packet identified but we don't know about it
-          # Clear packet_name and target_name and try to identify
-          Logger.warn "Received unknown identified telemetry: #{packet.target_name} #{packet.packet_name}"
-          packet.target_name = nil
-          packet.packet_name = nil
+      if packet.stored
+        # Stored telemetry does not update the current value table
+        identified_packet = System.telemetry.identify_and_define_packet(packet, @interface.target_names)
+      else
+        # Identify and update packet
+        if packet.identified?
+          begin
+            # Preidentifed packet - place it into the current value table
+            identified_packet = System.telemetry.update!(packet.target_name,
+                                                         packet.packet_name,
+                                                         packet.buffer)
+          rescue RuntimeError
+            # Packet identified but we don't know about it
+            # Clear packet_name and target_name and try to identify
+            Logger.warn "Received unknown identified telemetry: #{packet.target_name} #{packet.packet_name}"
+            packet.target_name = nil
+            packet.packet_name = nil
+            identified_packet = System.telemetry.identify!(packet.buffer,
+                                                           @interface.target_names)
+          end
+        else
+          # Packet needs to be identified
           identified_packet = System.telemetry.identify!(packet.buffer,
                                                          @interface.target_names)
         end
-      else
-        # Packet needs to be identified
-        identified_packet = System.telemetry.identify!(packet.buffer,
-                                                       @interface.target_names)
       end
 
       if identified_packet
         identified_packet.received_time = packet.received_time
+        identified_packet.stored = packet.stored
+        identified_packet.extra = packet.extra
         packet = identified_packet
       else
         unknown_packet = System.telemetry.update!('UNKNOWN', 'UNKNOWN', packet.buffer)
         unknown_packet.received_time = packet.received_time
+        unknown_packet.stored = packet.stored
+        unknown_packet.extra = packet.extra
         packet = unknown_packet
         data_length = packet.length
         string = "#{@interface.name} - Unknown #{data_length} byte packet starting: "
@@ -194,9 +203,15 @@ module Cosmos
       end
 
       # Write to packet log writers
-      @interface.packet_log_writer_pairs.each do |packet_log_writer_pair|
-        # Write errors are handled by the log writer
-        packet_log_writer_pair.tlm_log_writer.write(packet)
+      if packet.stored and !@interface.stored_packet_log_writer_pairs.empty?
+        @interface.stored_packet_log_writer_pairs.each do |packet_log_writer_pair|
+          packet_log_writer_pair.tlm_log_writer.write(packet)
+        end
+      else
+        @interface.packet_log_writer_pairs.each do |packet_log_writer_pair|
+          # Write errors are handled by the log writer
+          packet_log_writer_pair.tlm_log_writer.write(packet)
+        end
       end
     end