cosmos 4.5.0-java → 4.5.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dced340961ef95d924452c200b6f3108fba99d018c17159877bd650b9f4f7bb
-  data.tar.gz: '08255e720fa1736910fc4c497835e4bb65d843686ccbfa0d2648f71723c5257a'
+  metadata.gz: 3fbaffd5f8eff783ff39b719702ad5766aa9f7f2435521c6b251af357923d8c6
+  data.tar.gz: 3137c8db6b9d6babc9cad3ea40cfdd59a81f768fe32f8ac4afd18476ff98b4ed
 SHA512:
-  metadata.gz: c176d56ad4618a68ad17777ffda7ebb09c6efe716196fad328a4d67cac741e324b24cdd5ff41c89c7a29d8e752711e6dda79817fc09ad01b71a178615c29ac25
-  data.tar.gz: 1dbc2cc458d98d4458d4c35a6f66de3b4c2ab75c871605df5854da4d068839c8e8aa52baaec8d18e8cbfe205d95099ff10148ed1bd477d0f9527f651511bee93
+  metadata.gz: e1466c7b0e7856fefe15451800dfb1fd7c16289adb270aaab74017cc48c3b051509686bdaec259ffbc10330c0d1a92441395968e60f03aff2dac0b07e8910918
+  data.tar.gz: efa034b7d19fc0f26d7eb2736f292838c3d931b7e8662b1d61b6dbea56a9fe55497efea10e64c0da6b388ee40e006f90c38b79524bfe0da9a26bcdb9ac2df35b

data/Dockerfile

@@ -55,6 +55,7 @@ ARG COSMOS_REPO=https://github.com/BallAerospace/COSMOS.git
 RUN gem install bundler --no-document
 RUN cd /devel \
   && git clone ${COSMOS_REPO} COSMOS \
+  && git checkout cosmos4 \
   && cd /devel/COSMOS \
   && bundle install
 
@@ -63,7 +64,7 @@ ARG COSMOS_DOCKER_REPO=https://github.com/BallAerospace/cosmos-docker.git
 # Download COSMOS docker files to support docker release
 RUN cd /devel \
   && git clone ${COSMOS_DOCKER_REPO}
-  
+
 ENV COSMOS_DEVEL /devel/COSMOS
 WORKDIR /devel/COSMOS
 CMD bash

data/Rakefile

@@ -169,8 +169,8 @@ task :build => [:devkit] do
   end
 end
 
-task :git_checkout_master do
-  system('git checkout master')
+task :git_checkout do
+  system('git checkout cosmos4')
 end
 
 task :install_crc do
@@ -192,7 +192,7 @@ task :gem => [:require_version] do
   system('gem build cosmos.gemspec')
 end
 
-task :commit_release_ticket => [:require_version, :git_checkout_master] do
+task :commit_release_ticket => [:require_version, :git_checkout] do
   system('git add data/crc.txt')
   system('git add demo/config/data/crc.txt')
   system('git add install/config/data/crc.txt')
@@ -233,7 +233,7 @@ task :version => [:require_version] do
   # Create the crc.txt file
   crc = RakeCrc32.new
   File.open("data/crc.txt",'w') do |file|
-    Dir[File.join('lib','**','*.rb')].each do |filename|
+    Dir[File.join('lib','**','*.rb')].sort.each do |filename|
       file_data = File.open(filename, 'rb').read.gsub("\x0D\x0A", "\x0A")
       file.puts "\"#{filename}\" #{sprintf("0x%08X", crc.calc(file_data))}"
     end
@@ -297,7 +297,7 @@ if RUBY_ENGINE == 'ruby'
   end
 end
 
-task :release => [:require_version, :git_checkout_master, :build, :spec, :manifest, :version, :install_crc, :gem]
+task :release => [:require_version, :git_checkout, :build, :spec, :manifest, :version, :install_crc, :gem]
 task :commit_release => [:commit_release_ticket, :tag_release]
 
 task :docker_build do
@@ -312,8 +312,10 @@ end
 task :docker_run do
   STDOUT.puts "Note, this is not automated on purpose to ensure each step is successful (with user entry of credentials for github/rubygems.org)"
   STDOUT.puts "Steps to perform a COSMOS release:"
-  STDOUT.puts "1. git config --global user.name \"Last, First\""
-  STDOUT.puts "2. git config --global user.email \"me@ball.com\""
+  STDOUT.puts "1a. git config --global user.name \"Last, First\""
+  STDOUT.puts "1b. git config --global user.email \"me@ball.com\""
+  STDOUT.puts "1c. Ensure Ruby 2.5 is in your path"
+  STDOUT.puts "2. git checkout cosmos4"
   STDOUT.puts "3. git pull"
   STDOUT.puts "4. export VERSION=X.X.X"
   STDOUT.puts "5. rake release"
@@ -330,6 +332,6 @@ task :docker_run do
   STDOUT.puts "16. git checkout -b vX.X.X"
   STDOUT.puts "17. git push --set-upstream origin vX.X.X"
   STDOUT.puts "18. Update release notes on github.com and cosmosrb.com"
-  
+
   system('docker run -it --rm cosmos-dev')
 end

data/autohotkey/tools/cmd_extractor.ahk

@@ -4,27 +4,28 @@ Sleep 500
 Send ^r ; Mode->Include Raw Data CE-3
 Sleep 500
 Click 500 95 ; Browse
-Sleep 1000
+WinWaitActive Select
 Send cmd.bin{Enter}
 WinWaitActive Command Extractor
-Click 200 446 ; Process Files
+Click 200 446 ; Process Data
 WinWaitActive Warning
 Sleep 500
-Send {Enter} ;
+Send {Enter}
 WinWaitActive Log File
+Sleep 500
 Click 450 305 ; Cancel
 WinWaitActive Command Extractor
 sleep 500
-Click 200 446 ; Process Files
+Click 200 446 ; Process Data
 WinWaitActive Warning
 Sleep 500
-Send {Enter} ;
+Send {Enter} ; Overwrite
 Sleep 500
-Send {Enter} ; Overwrite Yes
+Send {Enter} ; Warning Ok
 Sleep 5000 ; Allow the file to be processed CE-1
 Send {Enter}
 WinWaitActive Command Extractor
-Click 460 446 ; Open in Text Editor CE-2
+Click 315 446 ; Open in Text Editor CE-2
 Sleep 5000
 Send !f{x}      ; Exit text editor
 WinActivate Command Extractor
@@ -32,14 +33,15 @@ WinWaitActive Command Extractor
 Send !f{a} ; Analyze logs
 WinWaitActive Warning
 Sleep 500
-Send {Enter} ;
+Send {Enter}
 WinWaitActive Log File
+Sleep 500
 Click 450 305 ; Cancel
 WinWaitActive Command Extractor
 Send !f{a} ; Analyze logs
 WinWaitActive Warning
 Sleep 500
-Send {Enter} ;
+Send {Enter}
 WinWaitActive Log File
 Sleep 2000
 Send {Enter} ; Done

data/autohotkey/tools/cmd_sender.ahk

@@ -15,7 +15,7 @@ Sleep 1000
 Send {Enter}
 WinWaitActive Command Sender
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
+Sleep 10000
 WinActivate Command Sender
 Sleep 500
 Click 60 600 ; Click in the Command History

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

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/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