cosmos 3.4.2 → 3.5.0

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

@@ -717,7 +717,7 @@ module Cosmos
 
         orig_font = nil
         @@test_suites.each do |suite|
-          next if suite.name == "Cosmos::CustomTestSuite"
+          next if suite.name == "CustomTestSuite"
           doc = YARD::Registry.resolve(nil, suite.name)
           suite_node = create_node(doc, suite.name, tree) do |node|
             orig_font = node.font(0)
@@ -1047,10 +1047,10 @@ module Cosmos
       end
 
       # Build list of TestSuites and Tests
-      @@test_suites = @@test_suites.select {|my_suite| my_suite.name == 'Cosmos::CustomTestSuite'}
+      @@test_suites = @@test_suites.select {|my_suite| my_suite.name == 'CustomTestSuite'}
       tests         = []
       ObjectSpace.each_object(Class) do |object|
-        next if object.name == 'Cosmos::CustomTestSuite'
+        next if object.name == 'CustomTestSuite'
         if (object.ancestors.include?(TestSuite) &&
             object != TestSuite &&
             !ignored_test_suite_classes.include?(object))
@@ -1140,7 +1140,7 @@ module Cosmos
             end
           end
         end
-        @@suites[suite.name.split('::')[-1]] = cur_suite unless suite.name == 'Cosmos::CustomTestSuite'
+        @@suites[suite.name.split('::')[-1]] = cur_suite unless suite.name == 'CustomTestSuite'
       end
       Qt.execute_in_main_thread(true) { @test_runner_chooser.test_suites = @@suites }
     end

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

@@ -939,6 +939,11 @@ module Cosmos
         return false
       end
 
+      # Validate configurations exist for input filenames
+      @input_filenames.each do |input_filename|
+        Cosmos.check_log_configuration(@tlm_extractor_processor.packet_log_reader, input_filename)
+      end
+
       #Validate config information
       @tlm_extractor_processor.packet_log_reader.open(@input_filenames[0])
       @tlm_extractor_processor.packet_log_reader.close

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_logfile_thread.rb

@@ -48,6 +48,9 @@ module Cosmos
               progress_dialog.set_step_progress(0) if progress_dialog
               break if @cancel
               packet_count = 0
+              if progress_dialog
+                Cosmos.check_log_configuration(@packet_log_reader, log_file)
+              end
               @packet_log_reader.each(log_file, true, time_start, time_end) do |packet|
                 break if @cancel
                 if progress_dialog and packet_count % PROGRESS_UPDATE_PACKET_COUNT == 0

data/lib/cosmos/tools/tlm_viewer/tlm_viewer.rb

@@ -19,6 +19,7 @@ Cosmos.catch_fatal_exception do
   require 'cosmos/gui/widgets/full_text_search_line_edit'
   require 'cosmos/tools/tlm_viewer/tlm_viewer_config'
   require 'find'
+  require 'fileutils'
 end
 
 module Cosmos
@@ -58,7 +59,7 @@ module Cosmos
       additional_data = ''
       System.targets.each do |target_name, target|
         tlmviewer_files << target.filename if File.exist?(target.filename)
-        screen_dir = File.join(Cosmos::USERPATH, 'config', 'targets', target.original_name, 'screens')
+        screen_dir = File.join(target.dir, 'screens')
         if File.exist?(screen_dir)
           if target.substitute
             additional_data << target.original_name
@@ -304,7 +305,7 @@ module Cosmos
 
       results = ''
       screen_dir = File.join(USERPATH, 'config', 'targets', target.original_name, 'screens')
-      Dir.mkdir(screen_dir, 0777) unless File.exist?(screen_dir)
+      FileUtils.mkdir_p(screen_dir, :mode => 0777) unless File.exist?(screen_dir)
 
       System.telemetry.packets(target.name).each do |packet_name, packet|
         filename = File.join(screen_dir, packet_name.downcase + '.txt')

data/lib/cosmos/tools/tlm_viewer/tlm_viewer_config.rb

@@ -126,7 +126,7 @@ module Cosmos
         when 'AUTO_TARGETS'
           parser.verify_num_parameters(0, 0, 'AUTO_TARGETS')
           System.targets.each do |target_name, target|
-            screen_dir = File.join(Cosmos::USERPATH, 'config', 'targets', target.original_name, 'screens')
+            screen_dir = File.join(target.dir, 'screens')
             if File.exist?(screen_dir) and num_screens(screen_dir) > 0
               start_target(target.name, parser)
               auto_screens()
@@ -138,7 +138,7 @@ module Cosmos
           target_name = parameters[0].upcase
           target = System.targets[target_name]
           raise parser.error("Unknown target #{target_name}") unless target
-          screen_dir = File.join(Cosmos::USERPATH, 'config', 'targets', target.original_name, 'screens')
+          screen_dir = File.join(target.dir, 'screens')
           if File.exist?(screen_dir) and num_screens(screen_dir) > 0
             start_target(target.name, parser)
             auto_screens()
@@ -152,7 +152,7 @@ module Cosmos
         when 'SCREEN'
           raise parser.error("No target defined. SCREEN must follow TARGET.") unless @current_target
           parser.verify_num_parameters(1, 3, 'SCREEN <Filename> <X Position (optional)> <Y Position (optional)>')
-          screen_filename = File.join(Cosmos::USERPATH, 'config', 'targets', @current_target.original_name, 'screens', parameters[0])
+          screen_filename = File.join(@current_target.dir, 'screens', parameters[0])
           start_screen(screen_filename, parameters[1], parameters[2])
 
         when 'SHOW_ON_STARTUP'
@@ -178,7 +178,7 @@ module Cosmos
           raise parser.error("No group defined. GROUP_SCREEN must follow GROUP.") unless @current_group
           parser.verify_num_parameters(2, 4, 'GROUP_SCREEN <Target Name> <Screen Filename> <X Position (optional)> <Y Position (Optional)>')
           start_target(parameters[0].upcase, parser, @current_group)
-          screen_filename = File.join(Cosmos::USERPATH, 'config', 'targets', @current_target.original_name, 'screens', parameters[1])
+          screen_filename = File.join(@current_target.dir, 'screens', parameters[1])
           start_screen(screen_filename, parameters[2], parameters[3])
 
         else
@@ -203,7 +203,10 @@ module Cosmos
           target_screen_infos.each do |target_name, screen_infos|
             file.puts "TARGET \"#{target_name}\""
             screen_infos.each do |screen_name, screen_info|
-              screen_filename = screen_info.filename.gsub(File.join(Cosmos::USERPATH, 'config', 'targets', screen_info.original_target_name, 'screens', ''), '')
+              # Grab the filename by indexing the full path for 'screens' and going past
+              # to capture the filename such as 'status.txt' below
+              #   C:/COSMOS/config/targets/TGT/screens/status.txt
+              screen_filename = screen_info.filename[(screen_info.filename.index("screens").to_i + 8)..-1]
               string = "  SCREEN"
               string << " \"#{screen_filename}\""
               string << " #{screen_info.x_pos}" if screen_info.x_pos
@@ -246,7 +249,7 @@ module Cosmos
 
     def auto_screens
       @current_group = nil
-      screen_dir = File.join(Cosmos::USERPATH, 'config', 'targets', @current_target.original_name, 'screens')
+      screen_dir = File.join(@current_target.dir, 'screens')
       if File.exist?(screen_dir)
         Dir.new(screen_dir).each do |filename|
           if filename[0..0] != '.'

data/lib/cosmos/tools/tlm_viewer/widgets/array_widget.rb

@@ -25,11 +25,7 @@ module Cosmos
       @items_per_row = items_per_row.to_i
       setFixedSize(width.to_i, height.to_i)
       setReadOnly(true)
-      if Kernel.is_windows?
-        setFont(Cosmos.getFont("courier", 10))
-      else
-        setFont(Cosmos.getFont("courier", 14))
-      end
+      setFont(Cosmos.get_default_font)
       parent_layout.addWidget(self) if parent_layout
     end
 

data/lib/cosmos/tools/tlm_viewer/widgets/block_widget.rb

@@ -26,11 +26,7 @@ module Cosmos
       @bytes_per_row  = @bytes_per_word * @words_per_row
       @addr_format = ConfigParser.handle_nil(addr_format)
       @addr_format << ' ' if @addr_format
-      if Kernel.is_windows?
-        setFont(Cosmos.getFont("courier", 10))
-      else
-        setFont(Cosmos.getFont("courier", 14))
-      end
+      setFont(Cosmos.get_default_font)
     end
 
     def format_value(data)

data/lib/cosmos/top_level.rb

@@ -17,6 +17,8 @@ require 'cosmos/core_ext'
 require 'cosmos/version'
 require 'cosmos/utilities/logger'
 require 'socket'
+require 'pathname'
+require 'bundler'
 
 # If a hazardous command is sent through the {Cosmos::Api} this error is raised.
 # {Cosmos::Script} rescues the error and prompts the user to continue.
@@ -44,6 +46,8 @@ end
 # new tool. Be sure to explore the various GUI classes
 module Cosmos
 
+  BASE_PWD = Dir.pwd
+
   # FatalErrors cause an exit but are not as dangerous as other errors.
   # They are used for known issues and thus we don't need a full error report.
   class FatalError < StandardError; end
@@ -136,6 +140,70 @@ module Cosmos
     end
   end
 
+  # Searches the COSMOS::USERPATH/config/data directory and then the core
+  # COSMOS/data directory for the given file name. Returns the absolute file
+  # path or nil if the file could not be found. This allows for user configuration
+  # files to override COSMOS data file defaults.
+  def self.data_path(name)
+    # Check USERPATH
+    filename = File.join(::Cosmos::USERPATH, 'config', 'data', name)
+    return filename if File.exist? filename
+
+    # Check extensions
+    begin
+      Bundler.load.specs.each do |spec|
+        spec_name_split = spec.name.split('-')
+        if spec_name_split.length > 1 and spec_name_split[0] == 'cosmos'
+          filename = File.join(spec.gem_dir, 'config', 'data', name)
+          return filename if File.exist? filename
+        end
+      end
+    rescue Bundler::GemfileNotFound
+      # No Gemfile - so no gem based extensions
+    end
+
+    filename = File.join(::Cosmos::PATH, 'data', name)
+    return filename if File.exist? filename
+
+    # Check CORE
+    filename = Cosmos.path('data', name)
+    return filename if File.exist? filename
+
+    nil
+  end
+
+  # Returns a path to a cosmos file.  Prefers files in USERPATH but will look
+  # relative to calling_file if not present in USERPATH
+  # @param calling_file [String] Should be __FILE__ from the calling file
+  # @param paths [Array<String>] Partial paths like in File.join
+  def self.path(calling_file, *paths)
+    partial_path = File.join(*paths)
+
+    # First look in the Cosmos::USERPATH
+    user_path = File.join(Cosmos::USERPATH, partial_path)
+    return user_path if File.exist?(user_path)
+
+    # Then look relative to the calling file
+    if Pathname.new(calling_file).absolute?
+      current_dir = File.dirname(calling_file)
+    else
+      current_dir = File.join(BASE_PWD, calling_file)
+    end
+    while true
+      test_path = File.join(current_dir, partial_path)
+      if File.exist?(test_path)
+        return test_path
+      else
+        old_current_dir = current_dir
+        current_dir = File.expand_path(File.join(current_dir, '..'))
+        if old_current_dir == current_dir
+          # Hit the root dir - give up
+          raise "Could not find path to #{File.join(*paths)}"
+        end
+      end
+    end
+  end
+
   # Creates a marshal file by serializing the given obj
   #
   # @param marshal_filename [String] Name of the marshal file to create
@@ -323,7 +391,7 @@ module Cosmos
         # Make sure the log directory exists
         raise unless File.exist?(log_dir)
         log_file
-      rescue
+      rescue Exception
         # If not then we just build a file locally
         if File.exist?('./outputs/logs')
           log_file = File.join('./outputs/logs', File.build_timestamped_filename([filename]))
@@ -455,12 +523,13 @@ module Cosmos
   # @param error [Exception] The exception to handle
   # @param try_gui [Boolean] Whether to try and create a GUI exception popup
   def self.handle_fatal_exception(error, try_gui = true)
+    $cosmos_fatal_exception = error
     log_file = self.write_exception_file(error)
     Logger.level = Logger::FATAL unless try_gui
     Logger.fatal "Fatal Exception! Exiting..."
     Logger.fatal error.formatted
-    if defined? ExceptionDialog and try_gui
-      Qt.execute_in_main_thread(true) {|| ExceptionDialog.new(nil, error, '', true, false, log_file)}
+    if defined? ExceptionDialog and try_gui and Qt::Application.instance
+      Qt.execute_in_main_thread(true) {||ExceptionDialog.new(nil, error, '', true, false, log_file)}
     else
       if $stdout != STDOUT
         $stdout = STDOUT
@@ -673,4 +742,18 @@ module Cosmos
     end
   end
 
+  # Play a wav file
+  # @param wav_filename filename of the wav file
+  def self.play_wav_file(wav_filename)
+    if defined? Qt and wav_filename
+      Qt.execute_in_main_thread(true) do
+        if Qt::CoreApplication.instance and Qt::Sound.isAvailable
+          Cosmos.set_working_dir do
+            Qt::Sound.play(wav_filename.to_s)
+          end
+        end
+      end
+    end
+  end
+
 end

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.4.2'
+COSMOS_VERSION = '3.5.0'
 module Cosmos
   module Version
     MAJOR = '3'
-    MINOR = '4'
-    PATCH = '2'
-    BUILD = 'd7b8067e652f11393629c9e8e1708cb846c5d233'
+    MINOR = '5'
+    PATCH = '0'
+    BUILD = 'a1963b6efc3b22a28c3abb878079ebad4aa73067'
   end
-  VERSION = '3.4.2'
+  VERSION = '3.5.0'
 end

data/lib/cosmos/win32/win32_main.rb

@@ -131,7 +131,13 @@ module Cosmos
     CBR_115200 = 115200
     CBR_128000 = 128000
     CBR_256000 = 256000
-    BAUD_RATES = [CBR_110, CBR_300, CBR_600, CBR_1200, CBR_2400, CBR_4800, CBR_9600, CBR_14400, CBR_19200, CBR_38400, CBR_56000, CBR_57600, CBR_115200, CBR_128000, CBR_256000]
+	
+    BAUD_RATES = [
+	  CBR_110, CBR_300, CBR_600, CBR_1200, CBR_2400, CBR_4800, CBR_9600, 
+	  CBR_14400, CBR_19200, CBR_38400, CBR_56000, CBR_57600, CBR_115200, 
+	  CBR_128000, CBR_256000, 230400, 460800, 500000, 576000, 921600, 
+	  1000000, 1152000, 1500000, 2000000, 3000000, 3500000, 4000000
+	]
 
     # Parity
     NOPARITY = 0

data/spec/packet_logs/packet_log_reader_spec.rb

@@ -125,7 +125,7 @@ module Cosmos
           file.write [pkt.buffer.length].pack('N')
           file.write pkt.buffer
         end
-        @plr.open(filename)
+        expect(@plr.open(filename)).to eql [false, nil]
         pkt1 = @plr.read
         expect(pkt1.target_name).to eql 'TGT1'
         expect(pkt1.packet_name).to eql 'PKT1'
@@ -139,6 +139,66 @@ module Cosmos
       end
     end
 
+    it "handles saved configuration with errors" do
+      begin
+        System.class_eval('@@instance = nil')
+
+        # Save system.txt
+        @config_file = File.join(Cosmos::USERPATH,'config','system','system.txt')
+        FileUtils.mv @config_file, Cosmos::USERPATH
+
+        # Create a dummy system.txt
+        File.open(@config_file,'w') {|file| file.puts "# This is a comment" }
+        @config_targets = File.join(Cosmos::USERPATH,'config','targets')
+
+        File.open(@config_file,'w') do |file|
+          file.puts "DECLARE_TARGET COSMOS"
+          file.puts "DECLARE_TARGET COSMOS OVERRIDE"
+        end
+
+        # Load the original configuration
+        original_config_name, err = System.load_configuration
+        expect(err).to eql nil
+        expect(System.telemetry.target_names).to eql %w(COSMOS OVERRIDE)
+        original_pkts = System.telemetry.packets('COSMOS').keys
+
+        # Create a new configuration by writing another telemetry file
+        File.open(File.join(@config_targets,'COSMOS','cmd_tlm','test1_tlm.txt'),'w') do |file|
+          file.puts "TELEMETRY COSMOS TEST1 BIG_ENDIAN"
+          file.puts "  APPEND_ITEM DATA 240 STRING"
+        end
+        System.instance.process_file(@config_file)
+        # Verify the new telemetry packet is there
+        expect(System.telemetry.packets('COSMOS').keys).to include "TEST1"
+        second_config_name = System.configuration_name
+
+        # Create a log file for the second config
+        filename = File.join(@log_path,'test.bin')
+        File.open(filename,'wb') do |file|
+          file.write "COSMOS2_TLM_#{second_config_name}_#{'A' * 83}"
+        end
+
+        # Corrupt the second config
+        second_config_path = System.instance.send(:find_configuration, second_config_name)
+        FileUtils.mv File.join(second_config_path, 'system.txt'), File.join(second_config_path, 'system2.txt')
+
+        # Return to original config
+        System.load_configuration
+
+        # Open the file from the second config and expect an error
+        success, error = @plr.open(filename)
+        expect(success).to eql false
+        expect(error).to_not be_nil
+        @plr.close
+      ensure
+        # Restore system.txt
+        FileUtils.mv File.join(Cosmos::USERPATH, 'system.txt'),
+          File.join(Cosmos::USERPATH,'config','system')
+
+        File.delete(File.join(@config_targets,'COSMOS','cmd_tlm','test1_tlm.txt'))
+      end
+    end
+
     describe "packet_offsets and read_at_offset" do
       it "returns packet offsets CTS-20, CTS-22" do
         packet_offsets = @plr.packet_offsets(Dir[File.join(@log_path,"*cmd.bin")][0])
@@ -148,7 +208,7 @@ module Cosmos
         header_length = 8 + 1 + 6 + 1 + 12 + 4
         expect(packet_offsets).to eql [PacketLogReader::COSMOS2_HEADER_LENGTH, PacketLogReader::COSMOS2_HEADER_LENGTH + header_length + @cmd_packet_length, PacketLogReader::COSMOS2_HEADER_LENGTH + (header_length + @cmd_packet_length) * 2]
 
-        @plr.open(Dir[File.join(@log_path,"*cmd.bin")][0])
+        expect(@plr.open(Dir[File.join(@log_path,"*cmd.bin")][0])).to eql [true, nil]
         pkt = @plr.read_at_offset(packet_offsets[1])
         expect(pkt.target_name).to eql "COSMOS"
         expect(pkt.packet_name).to eql "STARTLOGGING"
@@ -164,7 +224,7 @@ module Cosmos
         header_length = 8 + 1 + 6 + 1 + 7 + 4
         expect(packet_offsets).to eql [PacketLogReader::COSMOS2_HEADER_LENGTH, PacketLogReader::COSMOS2_HEADER_LENGTH + header_length + @tlm_packet_length, PacketLogReader::COSMOS2_HEADER_LENGTH + (header_length + @tlm_packet_length) * 2]
 
-        @plr.open(Dir[File.join(@log_path,"*tlm.bin")][0])
+        expect(@plr.open(Dir[File.join(@log_path,"*tlm.bin")][0])).to eql [true, nil]
         pkt = @plr.read_at_offset(packet_offsets[1])
         expect(pkt.target_name).to eql "COSMOS"
         expect(pkt.packet_name).to eql "VERSION"
@@ -313,7 +373,7 @@ module Cosmos
 
     describe "first" do
       it "returns the first command packet and retain the file position" do
-        @plr.open(Dir[File.join(@log_path,"*cmd.bin")][0])
+        expect(@plr.open(Dir[File.join(@log_path,"*cmd.bin")][0])).to eql [true, nil]
         pkt1 = @plr.read
         expect(pkt1.target_name).to eql @cmd_packets[0].target_name
         expect(pkt1.packet_name).to eql @cmd_packets[0].packet_name
@@ -335,7 +395,7 @@ module Cosmos
       end
 
       it "returns the first telemetry packet and retain the file position" do
-        @plr.open(Dir[File.join(@log_path,"*tlm.bin")][0])
+        expect(@plr.open(Dir[File.join(@log_path,"*tlm.bin")][0])).to eql [true, nil]
         pkt1 = @plr.read
         expect(pkt1.target_name).to eql @tlm_packets[0].target_name
         expect(pkt1.packet_name).to eql @tlm_packets[0].packet_name
@@ -359,7 +419,7 @@ module Cosmos
 
     describe "last" do
       it "returns the last command packet and retain the file position" do
-        @plr.open(Dir[File.join(@log_path,"*cmd.bin")][0])
+        expect(@plr.open(Dir[File.join(@log_path,"*cmd.bin")][0])).to eql [true, nil]
         pkt1 = @plr.read
         expect(pkt1.target_name).to eql @cmd_packets[0].target_name
         expect(pkt1.packet_name).to eql @cmd_packets[0].packet_name
@@ -381,7 +441,7 @@ module Cosmos
       end
 
       it "returns the last telemetry packet and retain the file position" do
-        @plr.open(Dir[File.join(@log_path,"*tlm.bin")][0])
+        expect(@plr.open(Dir[File.join(@log_path,"*tlm.bin")][0])).to eql [true, nil]
         pkt1 = @plr.read
         expect(pkt1.target_name).to eql @tlm_packets[0].target_name
         expect(pkt1.packet_name).to eql @tlm_packets[0].packet_name