cosmos 4.2.4 → 4.5.0

data/autohotkey/tools/launcher.ahk

@@ -30,6 +30,7 @@ Click 130 100 ; Launch Command and Telemetry Server L-2
 Sleep 1000
 Send {Enter}
 WinWaitActive, Command and Telemetry Server
+WinActivate, Command and Telemetry Server
 Sleep 2000
 Send ^q
 Sleep 2000

data/autohotkey/tools/limits_monitor.ahk

@@ -15,7 +15,7 @@ Send {Enter}
 Run ruby.exe %A_ScriptDir%/ScriptRunner -w 800 -t 200
 Sleep 2000
 WinActivate, Script Runner
-Sleep 500
+Sleep 2000
 Send set_limits("INST", "HEALTH_STATUS", "TEMP1", -100, -80, 80, 100, -60, 60, :DEFAULT){Enter}
 Send set_limits("INST", "HEALTH_STATUS", "TEMP3", -100, -80, 80, 100, -60, 60, :DEFAULT)
 Sleep 1000

data/autohotkey/tools/packet_viewer.ahk

@@ -153,7 +153,7 @@ Sleep 500
 Send {Enter}
 Sleep 2000
 
-Click right 380, 687 ; TEMP1 details
+Click right 380, 734 ; TEMP1 details
 Sleep 1000
 Send {Tab}{Enter}
 WinWaitActive TEMP1
@@ -162,10 +162,10 @@ Sleep 1000
 
 WinActivate Packet Viewer
 WinWaitActive Packet Viewer
-Click right 380, 780 ; ARY details
+Click right 380, 757 ; TEMP2 details
 Sleep 1000
 Send {Tab}{Enter}
-WinWaitActive ARY
+WinWaitActive TEMP2
 Sleep 1000
 Send {Enter} ; Close the window
 
@@ -177,10 +177,11 @@ Send {Backspace 5}
 Sleep 500
 Send COLLECT_TYPE{Enter}
 Sleep 1000
-Click right 380, 780 ; ARY details
+Click right 380, 730 ; ARY details
 Sleep 1000
 Send {Tab}{Enter}
-WinWaitActive COLLECT_TYPE
+WinActivate ARY
+WinWaitActive ARY
 Sleep 1000
 Send {Enter} ; Close the window
 
@@ -191,7 +192,7 @@ Sleep 2000
 Run ruby.exe %A_ScriptDir%/ScriptRunner -w 600 -t 600
 Sleep 2000
 WinActivate Script Runner
-Sleep 1000
+Sleep 2000
 Send set_limits("INST","HEALTH_STATUS","TEMP1",-110,-105,105,110,-100,100){ENTER}
 Send set_limits_set("CUSTOM"){ENTER}
 Sleep 1000

data/autohotkey/tools/script_runner.ahk

@@ -101,6 +101,18 @@ Sleep 500
 Send ^+{Tab}
 Sleep 500
 
+Send !f ; File
+Sleep 500
+Send r ; Open Recent
+Sleep 500
+Send {ENTER}
+Sleep 1000
+Send !f ; File
+Sleep 500
+Send r ; Open Recent
+Sleep 500
+Send {Down}{ENTER}
+
 Click right 220 60
 Sleep 500
 Click 240 75 ; Close
@@ -143,9 +155,9 @@ WinWaitActive Script Runner
 
 Send ^s ; File Save SR-1
 Sleep 500
-Click 25 40 ; File
+Send !f ; File
 Sleep 500
-Click 20 185 ; Save As
+Send a ; Save as
 WinWaitActive Save As
 Send autohotkey.rb{Enter}
 WinWaitActive Script Runner
@@ -391,11 +403,11 @@ WinWaitActive Message
 Sleep 500
 Send {Enter}
 WinWaitActive Script Runner
-WinWaitActive COSMOS
+WinWaitActive Prompt
 Sleep 500
 Send {Enter}
 WinWaitActive Script Runner
-WinWaitActive COSMOS
+WinWaitActive Prompt
 Sleep 500
 Send {Enter}
 WinWaitActive Script Runner

data/autohotkey/tools/test_runner.ahk

@@ -82,9 +82,9 @@ Sleep 500
 Click 630 70 ; Start Test Suite
 Sleep 5000
 
-Click 64 40 ; Script Menu
+Click 100 40 ; Script Menu
 Sleep 500
-Click 64 128 ; Toggle Debug TR-9
+Click 100 128 ; Toggle Debug TR-9
 Sleep 500
 Send puts $manual{Enter} ; TR-16
 Sleep 1000
@@ -108,25 +108,25 @@ Click 630 70 ; Start Test Suite
 Sleep 5000
 Click 680 195 ; Retry
 Sleep 1000
-Click 65 40 ; Script
+Click 100 40 ; Script
 Sleep 500
-Click 65 65 ; Test Results Message
+Click 100 65 ; Test Results Message
 WinWaitActive Test Results
 Sleep 1000
 Send QA Approves{Enter}
 WinWaitActive Test Runner
 Sleep 500
-Click 65 40 ; Script
+Click 100 40 ; Script
 Sleep 500
-Click 65 86 ; Script Message
+Click 100 86 ; Script Message
 WinWaitActive Script Message
 Sleep 1000
 Send SQA Approves{Enter}
 WinWaitActive Test Runner
 Sleep 500
-Click 65 40 ; Script
+Click 100 40 ; Script
 Sleep 500
-Click 65 108 ; Show Call Stack
+Click 100 108 ; Show Call Stack
 WinWaitActive Call Stack
 Sleep 1000
 Send {Esc}

data/bin/cosmos

@@ -133,7 +133,7 @@ end
 def gen_test(target)
   %Q(# To add this test to Test Runner edit config/tools/test_runner/test_runner.txt
 # Add this line:
-#   REQUIRE_UTILITY '#{target.downcase}_test'
+#   LOAD_UTILITY '#{target.downcase}_test'
 #
 # Test Runner test script
 class #{target.capitalize}Test < Cosmos::Test
@@ -230,6 +230,40 @@ def generate(args)
   end
 end
 
+def limits_change_callback(packet, item, old_limits_state, value, log_change)
+  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
+      Cosmos::Logger.info "#{tgt_pkt_item_str} #{item.limits.state}#{pkt_time_str}"
+    when :GREEN, :GREEN_LOW, :GREEN_HIGH
+      Cosmos::Logger.info "#{tgt_pkt_item_str} #{item.limits.state}#{pkt_time_str}"
+    when :YELLOW, :YELLOW_LOW, :YELLOW_HIGH
+      Cosmos::Logger.warn "#{tgt_pkt_item_str} #{item.limits.state}#{pkt_time_str}"
+    when :RED, :RED_LOW, :RED_HIGH
+      Cosmos::Logger.error "#{tgt_pkt_item_str} #{item.limits.state}#{pkt_time_str}"
+    else
+      Cosmos::Logger.error "#{tgt_pkt_item_str} UNKNOWN#{pkt_time_str}"
+    end
+  end
+end
+
+def check_limits(filenames)
+  Cosmos::Logger.level = Cosmos::Logger::INFO
+  packet_log_reader = Cosmos::System.default_packet_log_reader.new(*Cosmos::System.default_packet_log_reader_params)
+  filenames.each do |filename|
+    packet_log_reader.open(filename)
+    Cosmos::System.telemetry.limits_change_callback = method(:limits_change_callback)
+    packet_log_reader.each(filename) do |packet|
+      packet.check_limits
+    end
+  end
+end
+
 if not ARGV[0].nil? # argument(s) given
 
   # Handle each task
@@ -253,6 +287,9 @@ if not ARGV[0].nil? # argument(s) given
   when 'generate'
     generate(ARGV[1..-1])
 
+  when 'check_limits'
+    check_limits(ARGV[1..-1])
+
   when 'help'
     print_usage()
 

data/bin/cstol_converter

@@ -731,7 +731,7 @@ def parse_line(full_line, loc_out_file, wait_check_flag=false)
     # Process procedures with arguments as functions
     else
       # Add the statement to require the function
-      str = str + "require_utility(\"" + words[1].downcase + ".rb\")\n"
+      str = str + "load_utility(\"" + words[1].downcase + ".rb\")\n"
       numSpaces.times {str = str + " "}
 
       # Split the list of arguments on commas

data/bin/rubysloc

@@ -13,25 +13,72 @@
 # Blank lines and comment lines are ignored.  All other
 # lines count as one line.
 
-files = []
-if ARGV.length == 0
-  require 'find'
+require 'ostruct'
+require 'optparse'
+
+options = OpenStruct.new
+options.filename = nil
+options.sort_column = nil
 
-  #Find all .rb and .rbw files from the current directory
-  Find.find('.') do |path|
-    Find.prune if FileTest.directory?(path) and File.basename(path) == 'pkg'
-    extension = File.extname(path)
-    files << path if extension.to_s =~ /\.rb/i
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: rubysloc"
+  opts.separator ""
+  opts.separator "Recursively calculate SLOC for all ruby files (*.rb) sorted by filename"
+  opts.separator ""
+  opts.on("-h", "--help", "Show this message") do
+    puts opts
+    exit
   end
-else
-  if ARGV[0] == '--infile' or ARGV[0] == '-i'
-    File.open(ARGV[1], 'r') {|file| file.each_line {|line| files << line.chomp.strip}}
+  opts.on("-i DIRECTORY/FILENAME", "--input DIRECTORY/FILENAME",
+    "Parse only the specified directory/filename (relative or absolute path)") do |arg|
+    options.filename = arg
+  end
+  opts.on("-s SORT", "--sort SORT", "Sort by the specified column. Must be one of LINES, COMMENTS, SLOC, or RATIO.") do |arg|
+    case arg
+    when 'LINES'
+      options.sort_column = 1
+    when 'COMMENTS'
+      options.sort_column = 2
+    when 'SLOC'
+      options.sort_column = 3
+    when 'RATIO'
+      options.sort_column = 4
+    else
+      puts opts
+      exit
+    end
+  end
+end
+
+begin
+  opts.parse!(ARGV)
+rescue => err
+  puts err
+  puts opts
+  exit
+end
+
+files = []
+if options.filename
+  options.filename = File.join(Dir.pwd, options.filename) unless File.exist?(options.filename)
+  if File.exist?(options.filename)
+    if File.directory?(options.filename)
+      # Dir only works with unix paths so swap backslashes
+      files = Dir[File.join(options.filename.gsub('\\','/'), '**', '*.rb')]
+    else
+      files << options.filename
+    end
   else
-    files = ARGV
+    puts "File #{options.filename} not found."
+    puts opts
+    exit
   end
+else
+  files = Dir['**/*.rb']
 end
 
 # Build results over all found ruby files
+longest_path = 1
 results = []
 files.each do |full_filename|
   filename = File.basename(full_filename)
@@ -43,21 +90,20 @@ files.each do |full_filename|
       lines += 1
       split_line = line.split
       if split_line[0].nil?
-        #Blank Line - Do Nothing
-        #puts "NOT COUNTED - #{line.chomp}"
+        # Blank Line - Do Nothing
       elsif split_line[0].to_s[0..0] == '#'
-        #Comment Line
-        #puts "COMMENT LINE - #{line.chomp}"
         comments += 1
       else
-        #puts "COUNTED - #{line.chomp}"
         slocs += 1
       end
     end
-    results << [filename, lines, comments, slocs, comments.to_f / slocs.to_f]
+    results << [full_filename, lines, comments, slocs, comments.to_f / slocs.to_f]
+    longest_path = full_filename.length if full_filename.length > longest_path
   end
 end
 
+results.sort_by! {|col| col[options.sort_column].finite? ? col[options.sort_column] : -1 } if options.sort_column
+
 # Print results to STDOUT
 total_files    = 0
 total_lines    = 0
@@ -65,12 +111,12 @@ total_comments = 0
 total_slocs    = 0
 total_ratio    = 0
 
-puts "|-----------------------------------|----------|----------|----------|--------|"
-puts "| Filename                          |  Lines   | Comments |  SLOCs   |  Ratio |"
-puts "|-----------------------------------|----------|----------|----------|--------|"
+puts sprintf("|-%-#{longest_path}s-|----------|----------|----------|--------|", "-"*longest_path)
+puts sprintf("| %-#{longest_path}s |  Lines   | Comments |  SLOCs   |  Ratio |", "Filename")
+puts sprintf("|-%-#{longest_path}s-|----------|----------|----------|--------|", "-"*longest_path)
 results.each do |filename, lines, comments, slocs, ratio|
-  filename = filename[0..32] if filename.length > 33
-  puts sprintf("| %-33s | %8d | %8d | %8d | %6.2f |",
+  # filename = filename[0..32] if filename.length > 33
+  puts sprintf("| %-#{longest_path}s | %8d | %8d | %8d | %6.2f |",
                filename, lines, comments, slocs, ratio)
   total_files    += 1
   total_lines    += lines
@@ -78,8 +124,7 @@ results.each do |filename, lines, comments, slocs, ratio|
   total_slocs    += slocs
 end
 total_ratio = total_comments.to_f / total_slocs.to_f if total_slocs != 0
-puts "|-----------------------------------|----------|----------|----------|--------|"
-puts sprintf("| Totals - %3d Files                | %8d | %8d | %8d | %6.2f |",
-             total_files, total_lines, total_comments, total_slocs, total_ratio)
-
-puts "|-----------------------------------|----------|----------|----------|--------|"
+puts sprintf("|-%-#{longest_path}s-|----------|----------|----------|--------|", "-"*longest_path)
+puts sprintf("| %-#{longest_path}s | %8d | %8d | %8d | %6.2f |",
+  "Totals - #{total_files} Files", total_lines, total_comments, total_slocs, total_ratio)
+puts sprintf("|-%-#{longest_path}s-|----------|----------|----------|--------|", "-"*longest_path)

data/bin/xtce_converter

@@ -68,7 +68,7 @@ end
 if input_filename
   packet_config = Cosmos::PacketConfig.new
   puts "Processing #{input_filename}..."
-  packet_config.process_xtce(input_filename)
+  packet_config.process_file(input_filename, nil)
   puts "Converting to COSMOS config files in #{output_dir}"
   packet_config.to_config(output_dir)
   puts "Success"

data/cosmos.gemspec

@@ -73,12 +73,10 @@ spec = Gem::Specification.new do |s|
       files
     else [] end
 
-  s.has_rdoc = true
-
-  s.required_ruby_version = '~> 2.2'
+  s.required_ruby_version = '~> 2.3'
 
   # Runtime Dependencies
-  s.add_runtime_dependency 'bundler', '~> 1.3'
+  s.add_runtime_dependency 'bundler', '>= 1.3'
   s.add_runtime_dependency 'rdoc', '>= 4' # qtbindings doesn't parse in 6.0.0, fixed in 6.0.1
   s.add_runtime_dependency 'rake', '>= 10.0' # 10.0 released Nov 12, 2012
   s.add_runtime_dependency 'json', '>= 1.5', '< 3' # 2.0+ works with COSMOS
@@ -88,7 +86,7 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency 'uuidtools', '~> 2.1'
   s.add_runtime_dependency 'snmp', '~> 1.0'
   s.add_runtime_dependency 'rubyzip', '~> 1.2'
-  s.add_runtime_dependency 'nokogiri', '~> 1.6'
+  s.add_runtime_dependency 'nokogiri', '~> 1.10'
   s.add_runtime_dependency 'opengl-bindings', '~> 1.6' if RUBY_ENGINE == 'ruby' # MRI Only
   s.add_runtime_dependency 'qtbindings', '~> 4.8.6', '>= 4.8.6.2' if RUBY_ENGINE == 'ruby' # MRI Only
   s.add_runtime_dependency 'puma', '~> 3.10'
@@ -107,16 +105,16 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.5'
   s.add_development_dependency 'flog', '~> 4.0'
   s.add_development_dependency 'flay', '~> 2.0'
-  s.add_development_dependency 'reek', '~> 4.0'
-  s.add_development_dependency 'roodi', '~> 4.0'
+  s.add_development_dependency 'reek', '~> 5.0'
+  s.add_development_dependency 'roodi', '~> 5.0'
   s.add_development_dependency 'guard', '~> 2.0'
   s.add_development_dependency 'listen', '~> 3.0'
   s.add_development_dependency 'guard-bundler', '~> 2.0'
   s.add_development_dependency 'guard-rspec', '~> 4.0'
   s.add_development_dependency 'simplecov', '~> 0.15'
   s.add_development_dependency 'codecov', '~> 0.1'
-  s.add_development_dependency 'benchmark-ips', '~> 2.0'
-  s.add_development_dependency 'ruby-prof', '~> 0.16' if RUBY_ENGINE == 'ruby' # MRI Only
+  s.add_development_dependency 'benchmark-ips', '= 2.7.2'
+  s.add_development_dependency 'ruby-prof', ['~> 1.0', '< 1.3'] if RUBY_ENGINE == 'ruby' # MRI Only
 
   s.post_install_message = "Thanks for installing Ball Aerospace COSMOS!\nStart your first project with: cosmos demo demo\n"
 end

data/data/config/_interfaces.yaml

@@ -95,6 +95,10 @@ udp_interface.rb:
       description: Number of seconds to wait before aborting the read. Default is
         'nil' (block on read).
       values: .+
+    - name: Bind Address
+      required: false
+      description: Address to bind UDP ports to
+      values: .+
 serial_interface.rb:
   description: Connects to a target over a serial port. COSMOS provides drivers
     for both Windows and POSIX drivers for UNIX based systems.

data/data/config/cmd_sequence.yaml

@@ -0,0 +1,14 @@
+---
+EXPORTER:
+  summary: Configure a Ruby class to export the command sequence definition into a custom format
+  parameters:
+    - name: Exporter Class Filename
+      required: true
+      description: The name of the Ruby class which implements the exporter.
+        Follow the convention of lower case filename with words separated by underscores.
+        For example if your class is "MyExporter" your filename would be "my_exporter.rb".
+      values: .+
+    - name: Exporter Class Arguments
+      required: false
+      description: Arguments to pass to the class constructor. There can be more than one.
+      values: .+

data/data/config/command_modifiers.yaml

@@ -8,7 +8,7 @@ PARAMETER:
     PARAMETER DATA 32 32 INT MIN MAX 0 "Data value"
     PARAMETER VALUE 64 32 FLOAT 0 10.5 2.5
     PARAMETER LABEL 96 96 STRING "COSMOS" "The label to apply"
-    PARAMETER BLOCK 192 0 BLOCK '' "Block of binary data"
+    PARAMETER BLOCK 192 0 BLOCK 0x0 "Block of binary data"
   parameters:
     - name: Name
       required: true
@@ -109,6 +109,21 @@ SELECT_PARAMETER:
       required: true
       description: Name of the parameter to select for modification
       values: .+
+DELETE_PARAMETER:
+  summary: Deletes an existing command parameter from the packet definition
+  description: Deleting a parameter from the command definition does not remove the
+    defined space for that parameter. Thus unless you redefine a new parameter, there
+    will be a "hole" in the packet where the data is not accessible. You can
+    use SELECT_COMMAND and then PARAMETER to define a new parameter.
+  example: |
+    SELECT_COMMAND SYSTEM STARTLOGGING
+      DELETE_PARAMETER LABEL
+  since: 4.4.1
+  parameters:
+    - name: Parameter
+      required: true
+      description: Name of the parameter to delete
+      values: .+
 HIDDEN:
   summary: Hides this command from all COSMOS tools such as Command Sender and Handbook Creator
   description: Hidden commands do not appear in the Script Runner popup helper when writing scripts.