cosmos 4.4.0-java → 4.5.1-java

data/autohotkey/tools/cmd_sequence.ahk

@@ -1,7 +1,7 @@
 SetWinDelay 1000
 WinWaitActive Command Sequence
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Command Sequence
 
 Send ^o ; Open
@@ -28,12 +28,24 @@ Sleep 500
 Send a ; Save As
 WinWaitActive Save
 Send test_sequence.txt{Enter}
+Sleep 500
+Send y ; Just in case test_sequence.txt already exists we say 'y' to overwrites
+WinWaitActive Command Sequence
+
+Send ^e ; Export
+Sleep 500
+WinWaitActive Export
+Send sequence.bin{Enter}
+Sleep 500
+Send y ; Just in case sequence.bin already exists we say 'y' to overwrites
 WinWaitActive Command Sequence
 
 Send !a ; Actions menu
 Sleep 500
 Send e ; Expand All
 Sleep 1000
+Click 190 180 ; Click on sequence item to collapse it
+Sleep 1000
 Send !a ; Actions menu
 Sleep 500
 Send d ; Display state values in hex
@@ -57,7 +69,7 @@ Sleep 500
 Send s ; Show ignored items
 Sleep 500
 
-Click right 170 355 ; Right click collect type
+Click right 170 335 ; Right click collect type
 Sleep 500
 Send {Tab}{Enter}
 WinWaitActive INST
@@ -65,20 +77,21 @@ Sleep 500
 Send {Enter}
 WinWaitActive Command Sequence
 
-Click right 170 355 ; Right click collect type
+Click right 170 335 ; Right click collect type
 Sleep 500
 Send {Tab 2}{Enter} ; Insert filename
 WinWaitActive Insert
 Sleep 500
 Send {Esc}
-WinWaitActive Command Sequence
+Sleep 500
+WinActivate Command Sequence ; Not sure why but we have to explicitly activate here
 
-Click 260 355 2 ; Double click the collect type manual entry
+Click 260 335 2 ; Double click the collect type manual entry
 Sleep 500
 Send 9{Enter}
 Sleep 500
 
-Click 170 355 2 ; Double click the collect Type
+Click 170 335 2 ; Double click the collect Type
 Sleep 500
 Click ; Click again to activate the drop down
 Sleep 500
@@ -129,11 +142,11 @@ Click 610 124 ; Add Abort command
 Sleep 500
 Click 610 124 ; Add Abort command
 Sleep 500
-Click 450 124 ; Click the command dropdown
+Click 100 100 ; Click the search box
 Sleep 500
-Send {Down 2}{Enter} ; ASCIICMD
+Send ASCIICMD
 Sleep 500
-Click 610 124 ; Add ASCIICMD
+Send {Enter} ; Add ASCICMD
 Sleep 500
 Click 300 234 ; Click on the ASCIICMD to expand it
 Sleep 500

data/autohotkey/tools/config_editor.ahk

@@ -1,5 +1,5 @@
 WinWaitActive, Config Editor
-Sleep 1000
+Sleep 20000
 
 Click right 288 62 ; Right click on the tab
 Sleep 500
@@ -14,7 +14,7 @@ Send ^w ; Close
 Send !t ; alt T
 sleep 500
 Send {ENTER} ; Change file type
-
+sleep 1000
 Send ^s ; File Save
 WinWaitActive Save As
 Send {Esc}
@@ -149,13 +149,13 @@ Sleep 1000
 
 Send !a ; alt A
 sleep 500
-Send c ; Create target
+Send t ; Create target
 WinWaitActive Target
 Send {Esc}
 
 Send !a ; alt A
 sleep 500
-Send c ; Create target
+Send t ; Create target
 WinWaitActive Target
 Send AHK_TEST{ENTER}
 Sleep 2000

data/autohotkey/tools/data_viewer.ahk

@@ -1,7 +1,7 @@
 WinWaitActive, Data Viewer ahk_class QWidget
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Data Viewer
 Sleep 500
 Send ^r ; Reset

data/autohotkey/tools/limits_monitor.ahk

@@ -2,7 +2,7 @@ SetWinDelay 1000
 WinWaitActive Limits Monitor
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Limits Monitor
 Sleep 3000
 Send !fp ; Options

data/autohotkey/tools/packet_viewer.ahk

@@ -3,7 +3,7 @@ SetTitleMatchMode 2 ; Contain the title anywhere to match
 WinWaitActive Packet Viewer
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Packet Viewer
 WinWaitActive Packet Viewer
 Sleep 500

data/autohotkey/tools/script_runner.ahk

@@ -538,7 +538,7 @@ Sleep 500
 
 ; Start the CmdTlmServer
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Script Runner
 Sleep 1000
 

data/autohotkey/tools/test_runner2.ahk

@@ -1,7 +1,7 @@
 SetWinDelay 500
 ; Start the CmdTlmServer
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 
 WinActivate Test Runner
 WinWaitActive Test Runner

data/autohotkey/tools/tlm_grapher.ahk

@@ -20,7 +20,7 @@ Sleep 500
 
 ; Connect to the CT server
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Telemetry Grapher
 Click 55 95  ; Start TG-3
 Sleep 500

data/autohotkey/tools/tlm_grapher3.ahk

@@ -3,7 +3,7 @@ WinWaitActive Telemetry Grapher
 
 ; Connect to the CT server
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Telemetry Grapher
 Send {Enter}
 

data/autohotkey/tools/tlm_viewer.ahk

@@ -3,7 +3,7 @@ SetKeyDelay 10
 
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 
 WinActivate Telemetry Viewer
 Sleep 1000

data/autohotkey/tools/tlm_viewer2.ahk

@@ -10,7 +10,7 @@ Send {Enter}
 
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 Run ruby.exe %A_ScriptDir%/ScriptRunner -w 600 -t 600
 
 WinWaitActive Script

data/autohotkey/tools/tlm_viewer5.ahk

@@ -4,7 +4,7 @@ SetKeyDelay 10
 Sleep 500
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
 WinActivate "INST ADCS"
-Sleep 4000
+Sleep 10000
 
 ; Close down command and telemetry server
 WinActivate Command and Telemetry Server

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

@@ -36,7 +36,7 @@ option_parser = OptionParser.new do |option_parser|
 
   # Create the system option
   option_parser.on("--system VALUE", "Use an alternative system.txt file") do |arg|
-    Cosmos::System.instance(File.join(USERPATH, 'config', 'system', arg))
+    Cosmos::System.instance(File.join(Cosmos::USERPATH, 'config', 'system', arg))
   end
 
   # Handle --import mode

data/cosmos.gemspec

@@ -113,8 +113,8 @@ spec = Gem::Specification.new do |s|
   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/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.

data/data/config/interface_modifiers.yaml

@@ -84,8 +84,9 @@ OPTION:
     - name: Name
       required: true
       description: The option to set. COSMOS defines several options on the core provided
-        interfaces. The SerialInterface defines FLOW_CONTROL which can be NONE (default) or RTSCTS
-        and DATA_BITS which changes the data bits of the serial interface.
+        interfaces. The SerialInterface defines FLOW_CONTROL which can be NONE (default) or RTSCTS,
+        STRUCT to directly set fields in the Windows DCB or POSIX structure and it defines
+        DATA_BITS which changes the data bits of the serial interface.
         The TcpipServerInterface defines LISTEN_ADDRESS which is the IP address to accept
         connections on (default 0.0.0.0) and AUTO_SYSTEM_META which will automatically send
         SYSTEM META when the interface connects (default false).

data/data/config/param_item_modifiers.yaml

@@ -44,3 +44,8 @@ META:
       required: false
       description: One or more values to be stored for this Meta Name
       values: .*
+OVERLAP:
+  summary: This item is allowed to overlap other items in the packet
+  description: If an item's bit offset overlaps another item, COSMOS issues a warning. This keyword explicitly
+    allows an item to overlap another and supresses the warning message.
+  since: 4.4.1