cosmos 3.5.3 → 3.6.0

data/lib/cosmos/io/json_drb_object.rb

@@ -48,6 +48,7 @@ module Cosmos
       @port = port
       @mutex = Mutex.new
       @socket = nil
+      @pipe_reader, @pipe_writer = IO.pipe
       @id = 0
       @request_in_progress = false
       @connect_timeout = connect_timeout
@@ -58,6 +59,7 @@ module Cosmos
     # Disconnects from the JSON server
     def disconnect
       Cosmos.close_socket(@socket)
+      @pipe_writer.write('.')
       # Cannot set @socket to nil here because this method can be called by
       # other threads and @socket being nil would cause unexpected errors in method_missing
       # Also don't want to take the mutex so that we can interrupt method_missing if necessary
@@ -113,6 +115,7 @@ module Cosmos
         addr = Socket.pack_sockaddr_in(@port, @hostname)
         @socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
         @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+        @pipe_reader, @pipe_writer = IO.pipe
         begin
           @socket.connect_nonblock(addr)
         rescue IO::WaitWritable
@@ -159,7 +162,7 @@ module Cosmos
         STDOUT.puts request_data if JsonDRb.debug?
         @request_in_progress = true
         JsonDRb.send_data(@socket, request_data)
-        response_data = JsonDRb.receive_message(@socket, '')
+        response_data = JsonDRb.receive_message(@socket, '', @pipe_reader)
         @request_in_progress = false
         STDOUT.puts "\nResponse:\n" if JsonDRb.debug?
         STDOUT.puts response_data if JsonDRb.debug?

data/lib/cosmos/io/tcpip_server.rb

@@ -483,7 +483,7 @@ module Cosmos
                 stream_protocol.disconnect
                 stream_protocol.stream.raw_logger_pair.stop if stream_protocol.stream.raw_logger_pair
                 indexes_to_delete.unshift(index) # Put later indexes at front of array
-              rescue Errno::ECONNRESET, Errno::ECONNABORTED
+              rescue Errno::ECONNRESET, Errno::ECONNABORTED, IOError
                 # Client has disconnected
                 Logger.instance.info "Tcpip server lost write connection to #{hostname}(#{host_ip}):#{port}"
                 stream_protocol.disconnect

data/lib/cosmos/packets/packet_config.rb

@@ -95,13 +95,16 @@ module Cosmos
     # @param filename [String] The name of the configuration file
     # @param target_name [String] The target name
     def process_file(filename, process_target_name)
+      # Partial files are included into another file and thus aren't directly processed
+      return if File.basename(filename)[0] == '_' # Partials start with underscore
+
       @converted_type = nil
       @converted_bit_size = nil
       @proc_text = ''
       @building_generic_conversion = false
 
       process_target_name = process_target_name.upcase
-      parser = ConfigParser.new("https://github.com/BallAerospace/COSMOS/wiki/Command-and-Telemetry-Configuration")
+      parser = ConfigParser.new("http://cosmosrb.com/docs/cmdtlm")
       parser.parse_file(filename) do |keyword, params|
 
         if @building_generic_conversion
@@ -230,6 +233,7 @@ module Cosmos
       # This simulates an array of structures of multiple items in the packet by repeating
       # each item in the list multiple times with a different "index" added to the name.
       when 'MACRO_APPEND_START'
+        Logger.warn "MACRO_APPEND_START/END is deprecated. Please use new ERB macro syntax."
         MacroParser.start(parser)
 
       # End the creation of a macro-expanded list of items

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

@@ -54,7 +54,7 @@ module Cosmos
       if first_index < last_index
         @macro.indices = (first_index..last_index).to_a
       else
-        @macro.indices = (last_index..first_index).to_a
+        @macro.indices = (last_index..first_index).to_a.reverse
       end
       @macro.format = parser.parameters[2] ? parser.parameters[2] : '%s%d'
       @macro.format_order = get_format_order()

data/lib/cosmos/script/scripting.rb

@@ -69,6 +69,34 @@ module Cosmos
       prompt_combo_box(string, options)
     end
 
+    def _file_dialog(message, directory, select_files = true)
+      answer = ''
+      files = Dir["#{directory}/*"]
+      if select_files
+        files.select! {|f| !File.directory? f }
+      else
+        files.select! {|f| File.directory? f }
+      end
+      while answer.empty?
+        print message + "\n" + files.join("\n") + "\n<Type file name>:"
+        answer = gets
+        answer.chomp!
+      end
+      return answer
+    end
+    def save_file_dialog(directory = Cosmos::USERPATH, message = "Save File")
+      _file_dialog(message, directory)
+    end
+    def open_file_dialog(directory = Cosmos::USERPATH, message = "Open File")
+      _file_dialog(message, directory)
+    end
+    def open_files_dialog(directory = Cosmos::USERPATH, message = "Open File(s)")
+      _file_dialog(message, directory)
+    end
+    def open_directory_dialog(directory = Cosmos::USERPATH, message = "Open Directory")
+      _file_dialog(message, directory, false)
+    end
+
     # Creates a string with the parameters upcased
     def _upcase(target_name, packet_name, item_name)
       "#{target_name.upcase} #{packet_name.upcase} #{item_name.upcase}"

data/lib/cosmos/streams/tcpip_socket_stream.rb

@@ -20,6 +20,8 @@ module Cosmos
   class TcpipSocketStream < Stream
     attr_reader :write_socket
 
+    FAST_READ = (RUBY_VERSION > "2.1")
+
     # @param write_socket [Socket] Socket to write
     # @param read_socket [Socket] Socket to read
     # @param write_timeout [Float|nil] Number of seconds to wait for the write
@@ -39,6 +41,7 @@ module Cosmos
       # Mutex on write is needed to protect from commands coming in from more
       # than one tool
       @write_mutex = Mutex.new
+      @pipe_reader, @pipe_writer = IO.pipe
       @connected = false
     end
 
@@ -48,27 +51,66 @@ module Cosmos
 
       # No read mutex is needed because there is only one stream procesor
       # reading
-      begin
-        data = @read_socket.recv_nonblock(65535)
-        @raw_logger_pair.read_logger.write(data) if @raw_logger_pair
-      rescue IO::WaitReadable
-        # Wait for the socket to be ready for reading or for the timeout
+      if FAST_READ
         begin
-          result = IO.fast_select([@read_socket], nil, nil, @read_timeout)
+          while true # Loop until we get some data
+            data = @read_socket.read_nonblock(65535, exception: false)
+            raise EOFError, 'end of file reached' unless data
+            if data == :wait_readable
+              # Wait for the socket to be ready for reading or for the timeout
+              begin
+                result = IO.fast_select([@read_socket, @pipe_reader], nil, nil, @read_timeout)
+                # If select returns something it means the socket is now available for
+                # reading so retry the read. If it returns nil it means we timed out.
+                # If the pipe is present that means we closed the socket
+                if result
+                  if result.include?(@pipe_reader)
+                    raise IOError
+                  else
+                    next
+                  end
+                else
+                  raise Timeout::Error, "Read Timeout"
+                end
+              rescue IOError, Errno::ENOTSOCK
+                # These can happen with the socket being closed while waiting on select
+                data = ''
+              end
+            end
+            @raw_logger_pair.read_logger.write(data) if @raw_logger_pair
+            break
+          end
+        rescue Errno::ECONNRESET, Errno::ECONNABORTED, IOError, Errno::ENOTSOCK
+          data = ''
+        end
+      else
+        begin
+          data = @read_socket.read_nonblock(65535)
+          @raw_logger_pair.read_logger.write(data) if @raw_logger_pair
+        rescue IO::WaitReadable
+          # Wait for the socket to be ready for reading or for the timeout
+          begin
+            result = IO.fast_select([@read_socket, @pipe_reader], nil, nil, @read_timeout)
 
-          # If select returns something it means the socket is now available for
-          # reading so retry the read. If it returns nil it means we timed out.
-          if result
-            retry
-          else
-            raise Timeout::Error, "Read Timeout"
+            # If select returns something it means the socket is now available for
+            # reading so retry the read. If it returns nil it means we timed out.
+            # If the pipe is present that means we closed the socket
+            if result
+              if result.include?(@pipe_reader)
+                raise IOError
+              else
+                retry
+              end
+            else
+              raise Timeout::Error, "Read Timeout"
+            end
+          rescue IOError, Errno::ENOTSOCK
+            # These can happen with the socket being closed while waiting on select
+            data = ''
           end
-        rescue IOError, Errno::ENOTSOCK
-          # These can happen with the socket being closed while waiting on select
+        rescue Errno::ECONNRESET, Errno::ECONNABORTED, IOError, Errno::ENOTSOCK
           data = ''
         end
-      rescue Errno::ECONNRESET, Errno::ECONNABORTED, IOError, Errno::ENOTSOCK
-        data = ''
       end
 
       data
@@ -79,9 +121,19 @@ module Cosmos
       # No read mutex is needed because there is only one stream procesor
       # reading
       begin
-        data = @read_socket.recv_nonblock(65535)
-        @raw_logger_pair.read_logger.write(data) if @raw_logger_pair
-      rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::ECONNRESET, Errno::ECONNABORTED
+        if FAST_READ
+          data = @read_socket.read_nonblock(65535, exception: false)
+          raise EOFError, 'end of file reached' unless data
+          if data == :wait_readable
+            data = ''
+          else
+            @raw_logger_pair.read_logger.write(data) if @raw_logger_pair
+          end
+        else
+          data = @read_socket.read_nonblock(65535)
+          @raw_logger_pair.read_logger.write(data) if @raw_logger_pair
+        end
+      rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::ECONNRESET, Errno::ECONNABORTED, IOError
         data = ''
       end
 
@@ -135,6 +187,7 @@ module Cosmos
     def disconnect
       Cosmos.close_socket(@write_socket)
       Cosmos.close_socket(@read_socket)
+      @pipe_writer.write('.')
       @connected = false
     end
 

data/lib/cosmos/system/target.rb

@@ -107,6 +107,8 @@ module Cosmos
       # If target.txt didn't specify specific cmd/tlm files then add everything
       if @cmd_tlm_files.empty?
         @cmd_tlm_files = add_all_cmd_tlm(@dir)
+      else
+        add_cmd_tlm_partials(@dir)
       end
     end
 
@@ -184,14 +186,26 @@ module Cosmos
     def add_all_cmd_tlm(dir)
       cmd_tlm_files = []
       if Dir.exist?(File.join(dir, 'cmd_tlm'))
-        # Only grab *.txt files in the root of the cmd_tlm folder
-        Dir[File.join(dir, 'cmd_tlm', '*.txt')].each do |filename|
+        # Grab All *.txt files in the cmd_tlm folder and subfolders
+        Dir[File.join(dir, 'cmd_tlm', '**', '*.txt')].each do |filename|
           cmd_tlm_files << filename
         end
       end
       cmd_tlm_files.sort!
     end
 
+    # Make sure all partials are included in the cmd_tlm list for the MD5 calculation
+    def add_cmd_tlm_partials(dir)
+      if Dir.exist?(File.join(dir, 'cmd_tlm'))
+        # Grab all _*.txt files in the cmd_tlm folder and subfolders
+        Dir[File.join(dir, 'cmd_tlm', '**', '_*.txt')].each do |filename|
+          @cmd_tlm_files << filename
+        end
+      end
+      @cmd_tlm_files.uniq!
+      @cmd_tlm_files.sort!
+    end
+
   end # class Target
 
 end # module Cosmos

data/lib/cosmos/tools/cmd_sender/cmd_sender.rb

@@ -84,6 +84,24 @@ module Cosmos
       initialize_menus()
       initialize_central_widget()
       complete_initialize() # defined in qt_tool
+
+      # Bring up slash screen for long duration tasks after creation
+      Splash.execute(self) do |splash|
+        # Configure CosmosConfig to interact with splash screen
+        ConfigParser.splash = splash
+
+        System.commands
+        Qt.execute_in_main_thread(true) do
+          update_targets()
+          @target_select.setCurrentText(options.packet[0]) if options.packet
+          update_commands()
+          @cmd_select.setCurrentText(options.packet[1]) if options.packet
+          update_cmd_params()
+        end
+
+        # Unconfigure CosmosConfig to interact with splash screen
+        ConfigParser.splash = nil
+      end
     end
 
     def initialize_actions
@@ -245,24 +263,8 @@ module Cosmos
       layout.addWidget(splitter)
       central_widget.layout = layout
 
-      #Mark this window as the window for popups
+      # Mark this window as the window for popups
       set_cmd_tlm_gui_window(self)
-
-      # Bring up slash screen for long duration tasks after creation
-      Splash.execute(self) do |splash|
-        # Configure CosmosConfig to interact with splash screen
-        ConfigParser.splash = splash
-
-        System.commands
-        Qt.execute_in_main_thread(true) do
-          update_targets()
-          update_commands()
-          update_cmd_params()
-        end
-
-        # Unconfigure CosmosConfig to interact with splash screen
-        ConfigParser.splash = nil
-      end
     end
 
     def menu_states_in_hex(checked)
@@ -706,6 +708,15 @@ module Cosmos
           options.width = 600
           options.height = 425
           options.title = 'Command Sender'
+          option_parser.separator "Command Sender Specific Options:"
+          option_parser.on("-p", "--packet 'TARGET_NAME PACKET_NAME'", "Start with the specified command selected") do |arg|
+            split = arg.split
+            if split.length != 2
+              puts "Packet must be specified as 'TARGET_NAME PACKET_NAME' in quotes"
+              exit
+            end
+            options.packet = split
+          end
         end
 
         super(option_parser, options)

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

@@ -79,15 +79,27 @@ module Cosmos
           when 'PACKET_LOG_WRITER'
             usage = "PACKET_LOG_WRITER <Name> <Filename> <Specific Parameters>"
             parser.verify_num_parameters(2, nil, usage)
+            packet_log_writer_name = params[0].upcase
             packet_log_writer_class = Cosmos.require_class(params[1])
+
+            # Verify not overridding a packet log writer that is already associated with an interface
+            packet_log_writer_pair = @packet_log_writer_pairs[packet_log_writer_name]
+            if packet_log_writer_pair
+              @interfaces.each do |interface_name, interface|
+                if interface.packet_log_writer_pairs.include?(packet_log_writer_pair)
+                  raise parser.error("Redefining Packet Log Writer #{packet_log_writer_name} not allowed after it is associated with an interface")
+                end
+              end
+            end
+
             if params[2]
               cmd_log_writer = packet_log_writer_class.new(:CMD, *params[2..-1])
               tlm_log_writer = packet_log_writer_class.new(:TLM, *params[2..-1])
-              @packet_log_writer_pairs[params[0].upcase] = PacketLogWriterPair.new(cmd_log_writer, tlm_log_writer)
+              @packet_log_writer_pairs[packet_log_writer_name] = PacketLogWriterPair.new(cmd_log_writer, tlm_log_writer)
             else
               cmd_log_writer = packet_log_writer_class.new(:CMD)
               tlm_log_writer = packet_log_writer_class.new(:TLM)
-              @packet_log_writer_pairs[params[0].upcase] = PacketLogWriterPair.new(cmd_log_writer, tlm_log_writer)
+              @packet_log_writer_pairs[packet_log_writer_name] = PacketLogWriterPair.new(cmd_log_writer, tlm_log_writer)
             end
 
           when 'AUTO_INTERFACE_TARGETS'

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

@@ -179,7 +179,7 @@ module Cosmos
       when 1
         handle_tab('Targets') { @targets_tab.update }
       when 2
-        handle_tab('Packets') { @packets_tab.update(PacketsTab::COMMANDS) }
+        handle_tab('Commands') { @packets_tab.update(PacketsTab::COMMANDS) }
       when 3
         handle_tab('Telemetry') { @packets_tab.update(PacketsTab::TELEMETRY) }
       when 4

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

@@ -76,12 +76,12 @@ module Cosmos
       table = Qt::TableWidget.new()
       table.verticalHeader.hide()
       table.setRowCount(count)
-      column_cnt = 4
-      column_cnt += 1 if name == TELEMETRY
+      column_cnt = 5
       table.setColumnCount(column_cnt)
       # Force the last section to fill all available space in the frame
       #~ table.horizontalHeader.setStretchLastSection(true)
       headers = ["Target Name", "Packet Name", "Packet Count", "View Raw"]
+      headers << "View in Command Sender" if name == COMMANDS
       headers << "View in Packet Viewer" if name == TELEMETRY
       table.setHorizontalHeaderLabels(headers)
 
@@ -121,24 +121,10 @@ module Cosmos
           end
           table.setCellWidget(row, 3, view_raw)
 
-          if name == TELEMETRY
-            if target_name != 'UNKNOWN' and packet_name != 'UNKNOWN'
-              view_pv = Qt::PushButton.new("View in Packet Viewer")
-              view_pv.connect(SIGNAL('clicked()')) do
-                if Kernel.is_windows?
-                  Cosmos.run_process("rubyw tools/PacketViewer -p \"#{target_name} #{packet_name}\" --system #{File.basename(System.initial_filename)}")
-                elsif Kernel.is_mac? and File.exist?("tools/mac/PacketViewer.app")
-                  Cosmos.run_process("open tools/mac/PacketViewer.app --args -p \"#{target_name} #{packet_name}\" --system #{File.basename(System.initial_filename)}")
-                else
-                  Cosmos.run_process("ruby tools/PacketViewer -p \"#{target_name} #{packet_name}\" --system #{File.basename(System.initial_filename)}")
-                end
-              end
-              table.setCellWidget(row, 4, view_pv)
-            else
-              table_widget = Qt::TableWidgetItem.new(Qt::Object.tr('N/A'))
-              table_widget.setTextAlignment(Qt::AlignCenter)
-              table.setItem(row, 4, table_widget)
-            end
+          if name == COMMANDS
+            add_tool_button(table, row, target_name, packet_name, "Command Sender")
+          elsif name == TELEMETRY
+            add_tool_button(table, row, target_name, packet_name, "Packet Viewer")
           end
 
           row += 1
@@ -146,5 +132,26 @@ module Cosmos
       end
     end
 
+    def add_tool_button(table, row, target_name, packet_name, tool_name)
+      if target_name != 'UNKNOWN' and packet_name != 'UNKNOWN'
+        view_pv = Qt::PushButton.new("View in #{tool_name}")
+        view_pv.connect(SIGNAL('clicked()')) do
+          tool_name = tool_name.split.join.gsub("Command","Cmd") # remove space and convert name
+          if Kernel.is_windows?
+            Cosmos.run_process("rubyw tools/#{tool_name} -p \"#{target_name} #{packet_name}\" --system #{File.basename(System.initial_filename)}")
+          elsif Kernel.is_mac? and File.exist?("tools/mac/#{tool_name}.app")
+            Cosmos.run_process("open tools/mac/#{tool_name}.app --args -p \"#{target_name} #{packet_name}\" --system #{File.basename(System.initial_filename)}")
+          else
+            Cosmos.run_process("ruby tools/#{tool_name} -p \"#{target_name} #{packet_name}\" --system #{File.basename(System.initial_filename)}")
+          end
+        end
+        table.setCellWidget(row, 4, view_pv)
+      else
+        table_widget = Qt::TableWidgetItem.new(Qt::Object.tr('N/A'))
+        table_widget.setTextAlignment(Qt::AlignCenter)
+        table.setItem(row, 4, table_widget)
+      end
+    end
+
   end
 end # module Cosmos