cosmos 4.1.1-java → 4.2.0-java

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

@@ -29,7 +29,6 @@ module Cosmos
     end
 
     # Create the status tab and add it to the tab_widget
-    # @param tab_widget [Qt::TabWidget] The tab widget to add the tab to
     def populate
       reset()
       @widget = Qt::Widget.new

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

@@ -12,7 +12,6 @@ require 'cosmos'
 require 'cosmos/gui/qt'
 
 module Cosmos
-
   # Implements the targets tab in the Command and Telemetry Server GUI
   class TargetsTab
     def initialize(tab_widget)
@@ -30,8 +29,6 @@ module Cosmos
     end
 
     # Create the targets tab and add it to the tab_widget
-    #
-    # @param tab_widget [Qt::TabWidget] The tab widget to add the tab to
     def populate
       reset()
       num_targets = System.targets.length
@@ -92,6 +89,5 @@ module Cosmos
         row += 1
       end
     end
-
   end
-end # module Cosmos
+end

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

@@ -111,9 +111,10 @@ module Cosmos
           if @groups.include?(method_name.to_s[6..-1].upcase)
             check_methods << method_name.to_s
           else
-            raise "Method #{method_name} doesn't match a group name.\n"\
+            Logger.warn "Inside class #{self.class}, method #{method_name} doesn't match a group name.\n"\
               "Methods must begin with 'check_' and end with a valid group name.\n"\
-              "Groups are #{@groups.join(', ')}."
+              "You need to declare 'LIMITS_GROUP #{method_name.to_s[6..-1].upcase}' for #{method_name} to work.\n"\
+              "Currently defined groups: #{@groups.join(', ')}\n"\
           end
         end
       end

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

@@ -15,6 +15,7 @@ module Cosmos
 
     # The number of bytes to print when an UNKNOWN packet is received
     UNKNOWN_BYTES_TO_PRINT = 36
+    SLIDER_GRANULARITY = 10000
 
     attr_accessor :log_directory
     attr_accessor :log_filename
@@ -30,6 +31,7 @@ module Cosmos
 
     # Reset internal state
     def reset
+      @first = true
       @cancel = false
       @playback_delay = 0.0
       @default_packet_log_reader = System.default_packet_log_reader.new(*System.default_packet_log_reader_params)
@@ -46,8 +48,17 @@ module Cosmos
       @progress = 0
       @status = ''
       @start_time = ''
+      @start_time_object = nil
       @current_time = ''
+      @current_time_object = nil
       @end_time = ''
+      @end_time_object = nil
+      @mode = :stream
+      @interface = Cosmos::TcpipClientInterface.new(
+        Cosmos::System.connect_hosts['DART_STREAM'],
+        Cosmos::System.ports['DART_STREAM'],
+        Cosmos::System.ports['DART_STREAM'],
+        10, 30, 'PREIDENTIFIED')
     end
 
     # Select and start analyzing a file for replay
@@ -56,6 +67,7 @@ module Cosmos
     def select_file(filename, packet_log_reader = 'DEFAULT')
       stop()
       Cosmos.kill_thread(self, @thread)
+      @mode = :file
       @thread = Thread.new do
         begin
           stop()
@@ -80,7 +92,7 @@ module Cosmos
           @progress = 0
           @status = "Analyzing: #{@progress}%"
           start_config_name = System.configuration_name
-          config_change_success, config_error = Cosmos.check_log_configuration(@packet_log_reader, @log_filename)
+          Cosmos.check_log_configuration(@packet_log_reader, @log_filename)
           if System.configuration_name != start_config_name
             @config_change_callback.call() if @config_change_callback
           end
@@ -98,7 +110,7 @@ module Cosmos
 
           if @cancel
             @packet_log_reader.close
-            @log_filename = ''
+            @log_filename = nil
             @packet_offsets = []
             @playback_index = 0
             @start_time = ''
@@ -121,6 +133,46 @@ module Cosmos
       end
     end
 
+    # Setup streaming with the given arguments
+    #
+    # start_time [Time] Time at which stream should begin at
+    # end_time [Time] Time at which stream should stop
+    def select_stream(start_time, end_time, meta_filters = [])
+      stop()
+      Cosmos.kill_thread(self, @thread)
+      @thread = nil
+      @mode = :stream
+      @log_filename = nil
+      @log_directory = System.paths['LOGS']
+      @log_directory << '/' unless @log_directory[-1..-1] == '\\' or @log_directory[-1..-1] == '/'
+      @packet_offsets = []
+
+      System.telemetry.reset
+      @cancel = false
+      @progress = 0
+      @status = "Stream Ready"
+      # start_config_name = System.configuration_name
+      # Cosmos.check_log_configuration(@packet_log_reader, @log_filename)
+      # if System.configuration_name != start_config_name
+      #   @config_change_callback.call() if @config_change_callback
+      # end
+      @playback_index = 0
+      @playback_max_index = SLIDER_GRANULARITY
+      start_time = Time.utc(1970, 1, 1).sys unless start_time
+      @start_time = start_time.formatted(true, 3, true)
+      end_time = Time.now.sys unless end_time
+      @end_time = end_time.formatted(true, 3, true)
+      @start_time_object = start_time.dup
+      @end_time_object = end_time.dup
+      @current_time = @start_time.dup
+      @current_time_object = start_time.dup
+      @meta_filters = meta_filters
+      @status = 'Stopped'
+      @playing = false
+      @playback_sleeper = nil
+      @first = true
+    end
+
     # Get current replay status
     #
     # @return [status, playback_delay, filename, file_start, file_current, file_end, file_index, file_max_index]
@@ -155,8 +207,8 @@ module Cosmos
 
     # Replay start playing forward
     def play
-      if @log_filename and !@thread
-        @playback_index = 1 if @playback_index < 0
+      if (@mode == :stream or @log_filename) and !@thread
+        @playback_index = 0 if @playback_index < 0
         start_playback(:FORWARD)
       else
         stop()
@@ -165,8 +217,8 @@ module Cosmos
 
     # Replay start playing backward
     def reverse_play
-      if @log_filename and !@thread
-        @playback_index = @packet_offsets.length - 2 if @playback_index >= @packet_offsets.length
+      if (@mode == :stream or @log_filename) and !@thread
+        @playback_index = @packet_offsets.length - 2 if @mode != :stream and @playback_index >= @packet_offsets.length
         start_playback(:BACKWARD)
       else
         stop()
@@ -202,9 +254,15 @@ module Cosmos
 
     # Replay move to start of file
     def move_start
-      if @log_filename and !@thread
-        packet = read_at_index(0, :FORWARD)
-        @start_time = packet.received_time.formatted(true, 3, true) if packet and packet.received_time
+      if (@mode == :stream or @log_filename) and !@thread
+        if @mode == :stream
+          @playback_index = 0
+          @current_time = @start_time.dup
+          @current_time_object = @start_time_object.dup
+        else
+          packet = read_at_index(0, :FORWARD)
+          @start_time = packet.received_time.formatted(true, 3, true) if packet and packet.received_time
+        end
       else
         stop()
       end
@@ -212,9 +270,15 @@ module Cosmos
 
     # Replay move to end of file
     def move_end
-      if @log_filename and !@thread
-        packet = read_at_index(@packet_offsets.length - 1, :FORWARD)
-        @end_time = packet.received_time.formatted(true, 3, true) if packet and packet.received_time
+      if (@mode == :stream or @log_filename) and !@thread
+        if @mode == :stream
+          @playback_index = SLIDER_GRANULARITY
+          @current_time = @end_time.dup
+          @current_time_object = @end_time_object.dup
+        else
+          packet = read_at_index(@packet_offsets.length - 1, :FORWARD)
+          @end_time = packet.received_time.formatted(true, 3, true) if packet and packet.received_time
+        end
       else
         stop()
       end
@@ -224,8 +288,18 @@ module Cosmos
     #
     # @param index [Integer] packet index into file
     def move_index(index)
-      if @log_filename and !@thread
-        read_at_index(index, :FORWARD)
+      if (@mode == :stream or @log_filename) and !@thread
+        if @mode == :stream
+          @playback_index = index
+          total_seconds = @end_time_object - @start_time_object
+          delta = (total_seconds / SLIDER_GRANULARITY.to_f) * index
+          @current_time_object = @start_time_object + delta
+          @current_time = @current_time_object.formatted(true, 3, true)
+        else
+          read_at_index(index, :FORWARD)
+        end
+      else
+        stop()
       end
     end
 
@@ -244,6 +318,7 @@ module Cosmos
 
     def start_playback(direction)
       @thread = Thread.new do
+        packet_count = 0
         @playback_sleeper = Sleeper.new
         error = nil
         begin
@@ -256,6 +331,8 @@ module Cosmos
               packet_start = Time.now.sys
               packet = read_at_index(@playback_index, direction)
               break unless packet
+              packet_count += 1
+
               delay_time = 0.0
               if @playback_delay
                 # Fixed Time Delay
@@ -269,6 +346,7 @@ module Cosmos
                 end
               end
               if delay_time > 0.0
+                delay_time = 1.0 if delay_time > 1.0 # prevents large delays from gaps
                 break if @playback_sleeper.sleep(delay_time)
               end
               previous_packet = packet
@@ -276,39 +354,93 @@ module Cosmos
               # No Delay
               packet = read_at_index(@playback_index, direction)
               break unless packet
+              packet_count += 1
               previous_packet = packet
             end
           end
         rescue Exception => error
           Logger.error "Error in Playback Thread\n#{error.formatted}"
         ensure
+          Logger.info "Replayed Packet Count = #{packet_count}"
           @status = 'Stopped'
           @playing = false
           @playback_sleeper = nil
           @thread = nil
+          @interface.disconnect
         end
       end
     end
 
     def read_at_index(index, direction)
-      packet_offset = nil
-      packet_offset = @packet_offsets[index] if index >= 0
-      if packet_offset
-        # Read the packet
-        packet = @packet_log_reader.read_at_offset(packet_offset, false)
-        handle_packet(packet)
+      if @mode == :file
+        packet_offset = nil
+        packet_offset = @packet_offsets[index] if index >= 0
+        if packet_offset
+          # Read the packet
+          packet = @packet_log_reader.read_at_offset(packet_offset, false)
+          handle_packet(packet)
+
+          # Adjust index for next read
+          if direction == :FORWARD
+            @playback_index = index + 1
+          else
+            @playback_index = index - 1
+          end
+          @current_time_object = packet.received_time
+          @current_time = packet.received_time.formatted(true, 3, true) if packet and packet.received_time
 
-        # Adjust index for next read
-        if direction == :FORWARD
-          @playback_index = index + 1
+          return packet
         else
-          @playback_index = index - 1
+          return nil
+        end
+      else
+        unless @interface.connected?
+          request_packet = Cosmos::Packet.new('DART', 'DART')
+          request_packet.define_item('REQUEST', 0, 0, :BLOCK)
+
+          request = {}
+          if direction == :FORWARD
+            request['start_time_sec'] = @current_time_object.tv_sec
+            request['start_time_usec'] = @current_time_object.tv_usec
+            request['end_time_sec'] = @end_time_object.tv_sec
+            request['end_time_usec'] = @end_time_object.tv_usec
+          else
+            request['start_time_sec'] = @current_time_object.tv_sec
+            request['start_time_usec'] = @current_time_object.tv_usec
+            request['end_time_sec'] = @start_time_object.tv_sec
+            request['end_time_usec'] = @start_time_object.tv_usec
+          end
+          request['cmd_tlm'] = 'TLM'
+          request['meta_filters'] = @meta_filters unless @meta_filters.empty?
+          request_packet.write('REQUEST', JSON.dump(request))
+
+          @interface.connect
+          @interface.write(request_packet)
+        end
+
+        packet = @interface.read
+        unless packet
+          @interface.disconnect
+          return nil
         end
-        @current_time = packet.received_time.formatted(true, 3, true) if packet and packet.received_time
+
+        # Switch to correct configuration from SYSTEM META when needed
+        if packet.target_name == 'SYSTEM'.freeze and packet.packet_name == 'META'.freeze
+          meta_packet = System.telemetry.update!('SYSTEM', 'META', packet.buffer)
+          Cosmos::System.load_configuration(meta_packet.read('CONFIG'))
+        end
+        handle_packet(packet)
+
+        @current_time_object = packet.received_time
+        @current_time = packet.received_time.formatted(true, 3, true)
+        if @first
+          @first = false
+          @start_time_object = @current_time_object.dup
+          @start_time = @current_time.dup
+        end
+        @playback_index = ((((@end_time_object - @start_time_object) - (@end_time_object - @current_time_object)).to_f / (@end_time_object - @start_time_object).to_f) * SLIDER_GRANULARITY).to_i
 
         return packet
-      else
-        return nil
       end
     end
 

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

@@ -55,7 +55,7 @@ module Cosmos
     # All interfaces defined by the Command/Telemetry configuration are
     # directed to this router to output commands
     #
-    # @param router_name [String] Name of the command router
+    # @param cmd_router_name [String] Name of the command router
     # @param port [Integer] Port to pass to the {TcpipServerInterface}
     def add_cmd_preidentified(cmd_router_name, port)
       cmd_router_name = cmd_router_name.upcase

data/lib/cosmos/tools/config_editor/config_editor.rb

@@ -326,6 +326,12 @@ module Cosmos
       @splitter.setSizes([200, 800]) # Rough split of the widget
       setCentralWidget(@splitter)
 
+      next_child = Qt::Shortcut.new(Qt::KeySequence.new(Qt::CTRL + Qt::Key_Tab), self)
+      self.connect(next_child, SIGNAL('activated()')) { next_child() }
+      # Note using Qt::KeySequence::PreviousChild does not work due to QT bug
+      previous_child = Qt::Shortcut.new(Qt::KeySequence.new(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab), self)
+      self.connect(previous_child, SIGNAL('activated()')) { previous_child() }
+
       # Display a blank message to force the statusBar to show
       statusBar.showMessage("")
       @status_bar_right_label = Qt::Label.new
@@ -615,46 +621,6 @@ module Cosmos
       end
     end
 
-    def enable_menu_items
-      # Enable File Menu Items
-      @file_new.setEnabled(true)
-      @file_open.setEnabled(true)
-      @file_close.setEnabled(true)
-      @file_reload.setEnabled(true)
-      @file_save.setEnabled(true)
-      @file_save_as.setEnabled(true)
-      @file_options.setEnabled(true)
-
-      # Enable Edit Menu Items
-      @edit_undo.setEnabled(true)
-      @edit_redo.setEnabled(true)
-      @edit_cut.setEnabled(true)
-      @edit_copy.setEnabled(true)
-      @edit_paste.setEnabled(true)
-      @edit_select_all.setEnabled(true)
-      @edit_comment.setEnabled(true)
-    end
-
-    def disable_menu_items
-      # Disable File Menu Items
-      @file_new.setEnabled(false)
-      @file_open.setEnabled(false)
-      @file_close.setEnabled(false)
-      @file_reload.setEnabled(false)
-      @file_save.setEnabled(false)
-      @file_save_as.setEnabled(false)
-      @file_options.setEnabled(false)
-
-      # Disable Edit Menu Items
-      @edit_undo.setEnabled(false)
-      @edit_redo.setEnabled(false)
-      @edit_cut.setEnabled(false)
-      @edit_copy.setEnabled(false)
-      @edit_paste.setEnabled(false)
-      @edit_select_all.setEnabled(false)
-      @edit_comment.setEnabled(false)
-    end
-
     # Handle the user changing tabs
     def handle_tab_change(index)
       update_title()
@@ -662,17 +628,18 @@ module Cosmos
       update_tree()
     end
 
-    def handle_script_keypress(event)
+    def next_child
+      index = @tab_book.currentIndex + 1
+      index = 0 if index >= @tab_book.count
+      @tab_book.setCurrentIndex(index)
+      update_title()
+    end
+
+    def previous_child
+      index = @tab_book.currentIndex - 1
+      index = @tab_book.count - 1 if index < 0
+      @tab_book.setCurrentIndex(index)
       update_title()
-      if event.matches(Qt::KeySequence::NextChild)
-        index = @tab_book.currentIndex + 1
-        index = 0 if index >= @tab_book.count
-        @tab_book.setCurrentIndex(index)
-      elsif event.matches(Qt::KeySequence::PreviousChild)
-        index = @tab_book.currentIndex - 1
-        index = @tab_book.count - 1 if index < 0
-        @tab_book.setCurrentIndex(index)
-      end
     end
 
     def tab_context_menu(point)
@@ -779,8 +746,6 @@ module Cosmos
               SLOT('undo_available(bool)'))
       config_editor_frame.set_text_from_file(filename) unless filename.empty?
       config_editor_frame.filename = filename
-      # Register a keypress handler so we can Ctrl-Tab our way through the tabs
-      config_editor_frame.key_press_callback = method(:handle_script_keypress)
       # Update the title if the frame changes so we can add/remove the asterix
       config_editor_frame.connect(SIGNAL('modificationChanged(bool)')) { update_title() }
       config_editor_frame.connect(SIGNAL('cursorPositionChanged()')) { update_cursor() }