cosmos 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 134e2570bb805f1658a540299af415a7741b4c5c
-  data.tar.gz: 2db906d305fae0a0c6b3336e026562e197b750ce
+SHA256:
+  metadata.gz: 2c926798369e35c0ecb4a90b82b466222eba498919398d71260a8a788c93ec08
+  data.tar.gz: 1741c93c093df086241b47a82dbfdcabcab568da5bceb5890b4f8ad79b3b57a5
 SHA512:
-  metadata.gz: c2e0164a0959347156dd9b9d256f3a75488a4f3b8f147e1cafb461e9ea0d419ceeafcceb958da736921c0bc76386cd99abad47e1d7cc6ab442611aace04ec87c
-  data.tar.gz: 352996be7dcad437868a502237cf65f401c25d1aa58dc9c74f3b66fe8528570b2462259f05c1edb932cd62d3d661b85354d944b5bcf27e7e23241ff34a2757cc
+  metadata.gz: 54a24530208e5d2c775e621f896d219e84f00f647ea00a662dc204eb97786e5985b7a40acc4d88ad8889e0da7b0374922ca2235c3ac8aea77cea50cccb92b677
+  data.tar.gz: de63f56dd7fdffb1290825321710b3242915a31465fc6331c880fa9eadb58da9b42573233d21382081287ed6109d14da16a85253ce7ac4f530da4c29b82e6968

data/.dockerignore

@@ -0,0 +1,2 @@
+demo/outputs/**
+install/outputs/**

data/.gitignore

@@ -7,6 +7,7 @@ Gemfile.lock
 .yardoc
 .DS_Store
 desktop.ini
+cert.pem
 install/outputs
 demo/outputs
 autohotkey/outputs

data/.travis.yml

@@ -1,16 +1,16 @@
 env: JRUBY_OPTS=--debug
+dist: trusty
 language: ruby
-sudo: false
 cache: bundler
 services:
   - postgresql
 rvm:
-  - jruby-9.2.5.0
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
-  - 2.3.8
+  - jruby-9.2.9.0
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
 before_install:
+  - sudo apt-get install -y libgl1-mesa-dev
   - gem update --system
   - gem install bundler
 script: bundle exec rake build spec

data/Dockerfile

@@ -0,0 +1,65 @@
+# This Dockerfile is for development of COSMOS
+# See Docker Hub: ballaerospace/cosmos for production docker images
+
+FROM ubuntu:18.04
+
+RUN apt-get update -y && apt-get install -y \
+  cmake \
+  default-jdk \
+  freeglut3 \
+  freeglut3-dev \
+  gcc \
+  g++ \
+  git \
+  iproute2 \
+  libffi-dev \
+  libgdbm-dev \
+  libgdbm5 \
+  libgstreamer-plugins-base1.0-dev \
+  libgstreamer1.0-dev \
+  libncurses5-dev \
+  libreadline6-dev \
+  libsmokeqt4-dev \
+  libssl-dev \
+  libyaml-dev \
+  net-tools \
+  postgresql-server-dev-all \
+  qt4-default \
+  qt4-dev-tools \
+  ruby2.5 \
+  ruby2.5-dev \
+  vim \
+  xterm \
+  zlib1g-dev
+
+RUN gem install rake --no-document
+
+# We require a local certificate file so set that up.
+# You must place a valid cert.pem file in your COSMOS development folder for this work
+# Comment out these lines if this is not required in your environment
+COPY cert.pem /devel/cert.pem
+ENV SSL_CERT_FILE /devel/cert.pem
+ENV CURL_CA_BUNDLE /devel/cert.pem
+ENV REQUESTS_CA_BUNDLE /devel/cert.pem
+RUN git config --global http.sslCAinfo /devel/cert.pem
+
+# Download and install jruby
+RUN cd /opt \
+  && curl -G https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.9.0/jruby-dist-9.2.9.0-bin.tar.gz > jruby.tar.gz \
+  && tar xvf jruby.tar.gz \
+  && mv jruby-9.2.9.0 jruby
+
+# Download and setup COSMOS devel area
+RUN gem install bundler --no-document
+RUN cd /devel \
+  && git clone https://github.com/BallAerospace/COSMOS.git \
+  && cd /devel/COSMOS \
+  && bundle install
+
+# Download COSMOS docker files to support docker release
+RUN cd /devel \
+  && git clone https://github.com/BallAerospace/cosmos-docker.git
+  
+ENV COSMOS_DEVEL /devel/COSMOS
+WORKDIR /devel/COSMOS
+CMD bash

data/Manifest.txt

@@ -1,4 +1,5 @@
 .coveralls.yml
+.dockerignore
 .gitattributes
 .github/ISSUE_TEMPLATE/bug_report.md
 .github/ISSUE_TEMPLATE/feature_request.md
@@ -8,6 +9,7 @@
 .travis.yml
 .yardopts
 CONTRIBUTING.txt
+Dockerfile
 Gemfile
 Guardfile
 LICENSE.txt
@@ -59,6 +61,7 @@ autohotkey/config/targets/SYSTEM/screens/limits_change.txt
 autohotkey/config/targets/SYSTEM/screens/meta.txt
 autohotkey/config/targets/SYSTEM/target.txt
 autohotkey/config/tools/cmd_sender/cmd_sender.txt
+autohotkey/config/tools/cmd_sequence/cmd_sequence.txt
 autohotkey/config/tools/cmd_tlm_server/cmd_tlm_server.txt
 autohotkey/config/tools/data_viewer/data_viewer.txt
 autohotkey/config/tools/handbook_creator/assets/css/bootstrap-theme.css
@@ -110,6 +113,7 @@ autohotkey/config/tools/tlm_grapher/test2.txt
 autohotkey/config/tools/tlm_viewer/tlm_viewer.txt
 autohotkey/config/tools/tlm_viewer/tlm_viewer2.txt
 autohotkey/config/tools/tlm_viewer/tlm_viewer3.txt
+autohotkey/lib/cmd_sequence_exporter.rb
 autohotkey/lib/example_background_task.rb
 autohotkey/lib/user_version.rb
 autohotkey/outputs/handbooks/README.txt
@@ -132,6 +136,7 @@ autohotkey/procedures/syntax_error.rb
 autohotkey/tools/CmdExtractorAHK
 autohotkey/tools/CmdSender
 autohotkey/tools/CmdSenderAHK
+autohotkey/tools/CmdSenderAHK2
 autohotkey/tools/CmdSequence
 autohotkey/tools/CmdSequenceAHK
 autohotkey/tools/CmdSequenceAHK2
@@ -184,6 +189,7 @@ autohotkey/tools/TlmViewerAHK5
 autohotkey/tools/autohotkey.rb
 autohotkey/tools/cmd_extractor.ahk
 autohotkey/tools/cmd_sender.ahk
+autohotkey/tools/cmd_sender2.ahk
 autohotkey/tools/cmd_sequence.ahk
 autohotkey/tools/cmd_sequence2.ahk
 autohotkey/tools/cmd_tlm_server.ahk
@@ -391,6 +397,7 @@ demo/config/targets/INST/cmd_tlm/_ccsds_cmd.txt
 demo/config/targets/INST/cmd_tlm/_ccsds_tlm.txt
 demo/config/targets/INST/cmd_tlm/inst_cmds.txt
 demo/config/targets/INST/cmd_tlm/inst_tlm.txt
+demo/config/targets/INST/cmd_tlm/inst_tlm_override.txt
 demo/config/targets/INST/cmd_tlm_server.txt
 demo/config/targets/INST/cmd_tlm_server2.txt
 demo/config/targets/INST/doc/README.txt
@@ -511,7 +518,6 @@ demo/lib/example_target.rb
 demo/lib/scpi_target.rb
 demo/lib/user_version.rb
 demo/outputs/dart/data/README.txt
-demo/outputs/dart/logs/README.txt
 demo/outputs/handbooks/README.txt
 demo/outputs/logs/README.txt
 demo/outputs/saved_config/README.txt
@@ -917,7 +923,6 @@ lib/cosmos/core_ext/string.rb
 lib/cosmos/core_ext/stringio.rb
 lib/cosmos/core_ext/time.rb
 lib/cosmos/dart/.rspec
-lib/cosmos/dart/Gemfile
 lib/cosmos/dart/Rakefile
 lib/cosmos/dart/app/assets/config/manifest.js
 lib/cosmos/dart/app/assets/images/.keep
@@ -1004,11 +1009,13 @@ lib/cosmos/dart/db/seeds.rb
 lib/cosmos/dart/examples/dart_decom_client.rb
 lib/cosmos/dart/examples/dart_stream_client.rb
 lib/cosmos/dart/lib/dart_common.rb
+lib/cosmos/dart/lib/dart_constants.rb
 lib/cosmos/dart/lib/dart_database_cleaner.rb
 lib/cosmos/dart/lib/dart_decom_query.rb
 lib/cosmos/dart/lib/dart_decommutator.rb
 lib/cosmos/dart/lib/dart_importer.rb
 lib/cosmos/dart/lib/dart_logging.rb
+lib/cosmos/dart/lib/dart_master_query.rb
 lib/cosmos/dart/lib/dart_packet_log_writer.rb
 lib/cosmos/dart/lib/dart_reducer_manager.rb
 lib/cosmos/dart/lib/dart_reducer_worker_thread.rb
@@ -1017,6 +1024,7 @@ lib/cosmos/dart/processes/dart.rb
 lib/cosmos/dart/processes/dart_decom_server.rb
 lib/cosmos/dart/processes/dart_import.rb
 lib/cosmos/dart/processes/dart_ingester.rb
+lib/cosmos/dart/processes/dart_master.rb
 lib/cosmos/dart/processes/dart_reducer.rb
 lib/cosmos/dart/processes/dart_stream_server.rb
 lib/cosmos/dart/processes/dart_util.rb
@@ -1184,6 +1192,7 @@ lib/cosmos/system/system.rb
 lib/cosmos/system/target.rb
 lib/cosmos/tools/cmd_extractor/cmd_extractor.rb
 lib/cosmos/tools/cmd_sender/cmd_param_table_item_delegate.rb
+lib/cosmos/tools/cmd_sender/cmd_params.rb
 lib/cosmos/tools/cmd_sender/cmd_sender.rb
 lib/cosmos/tools/cmd_sender/cmd_sender_text_edit.rb
 lib/cosmos/tools/cmd_sequence/cmd_sequence.rb
@@ -1212,6 +1221,7 @@ lib/cosmos/tools/cmd_tlm_server/router_thread.rb
 lib/cosmos/tools/cmd_tlm_server/routers.rb
 lib/cosmos/tools/config_editor/config_editor.rb
 lib/cosmos/tools/config_editor/config_editor_frame.rb
+lib/cosmos/tools/config_editor/system_config_dialog.rb
 lib/cosmos/tools/data_viewer/data_viewer.rb
 lib/cosmos/tools/data_viewer/data_viewer_component.rb
 lib/cosmos/tools/data_viewer/dump_component.rb

data/README.md

@@ -84,6 +84,11 @@ COSMOS is built and maintained by Ryan Melton (ryanatball/ryanmelt) and Jason Th
 
 5. Follow the [Documentation](http://cosmosrb.com) to start developing your configuration.
 
+## Docker
+
+See our Docker documentation here:
+[COSMOS Docker Directions](https://github.com/BallAerospace/cosmos-docker)
+
 ## Contributing
 
 We encourage you to contribute to COSMOS!

data/Rakefile

@@ -10,6 +10,20 @@
 
 require 'open3'
 
+# Cross-platform way of finding an executable in the $PATH.
+#
+#   which('ruby') #=> /usr/bin/ruby
+def which(cmd)
+  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+    exts.each { |ext|
+      exe = File.join(path, "#{cmd}#{ext}")
+      return exe if File.executable?(exe) && !File.directory?(exe)
+    }
+  end
+  return nil
+end
+
 # Pure Ruby CRC class to avoid circular dependency with c_cosmos
 class RakeCrc32
   attr_reader :crc32_poly
@@ -285,3 +299,41 @@ end
 
 task :release => [:require_version, :git_checkout_master, :build, :spec, :manifest, :version, :install_crc, :gem]
 task :commit_release => [:commit_release_ticket, :tag_release]
+
+task :docker_build do
+  _, platform, *_ = RUBY_PLATFORM.split("-")
+  if (platform == 'mswin32' or platform == 'mingw32') and which('winpty')
+    system('winpty docker build --tag cosmos-dev .')
+  else
+    system('docker build --tag cosmos-dev .')
+  end
+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 \"First Last\""
+  STDOUT.puts "2. git config --global user.email \"me@ball.com\""
+  STDOUT.puts "3. git pull"
+  STDOUT.puts "4. export VERSION=X.X.X"
+  STDOUT.puts "5. rake release"
+  STDOUT.puts "6. rake commit_release"
+  STDOUT.puts "7. export PATH=/opt/jruby/bin:$PATH"
+  STDOUT.puts "8. rake gem"
+  STDOUT.puts "9. gem push cosmos-X.X.X.gem"
+  STDOUT.puts "10. gem push cosmos-X.X.X-java.gem"
+  STDOUT.puts "11. cd /devel/cosmos-docker"
+  STDOUT.puts "12. Update COSMOS_VERSION in all Dockerfiles"
+  STDOUT.puts "13. git commit -a -m \"Release COSMOS vX.X.X\""
+  STDOUT.puts "14. git push"
+  STDOUT.puts "15. git checkout -b vX.X.X"
+  STDOUT.puts "16. git push --set-upstream origin vX.X.X"
+  STDOUT.puts "17. Update release notes on github.com and cosmosrb.com"
+  
+  _, platform, *_ = RUBY_PLATFORM.split("-")
+  if (platform == 'mswin32' or platform == 'mingw32') and which('winpty')
+    system('winpty docker run -it --rm cosmos-dev')
+  else
+    system('docker run -it --rm cosmos-dev')
+  end  
+end

data/appveyor.yml

@@ -1,19 +1,29 @@
+environment:
+  matrix:
+    - ruby_version: 24-x64
+    - ruby_version: 25-x64
+    #- ruby_version: 26-x64 this needs qtbindings support
+
+cache:
+  # If one of the files after the right arrow changes, cache will be invalidated
+  - vendor\bundle -> appveyor.yml, Gemfile, cosmos.gemspec
+
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - SET PATH=C:\MinGW\bin;%PATH%
   - SET RAKEOPT=-rdevkit
-  - ruby --version
-  - gem --version
+  - bundle config --local path vendor/bundle
   - bundle install
-  - bundle exec rake build spec
 
 build: off
 
-environment:
-  matrix:
-    - ruby_version: "24-x64"
-    - ruby_version: "25-x64"
-    # - ruby_version: "26-x64" Ruby 2.6 not yet supported on 1/15/2019
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake build spec
 
 branches:
   only:

data/autohotkey/config/tools/cmd_sequence/cmd_sequence.txt

@@ -0,0 +1,2 @@
+# Declare a custom export class
+EXPORTER cmd_sequence_exporter.rb

data/autohotkey/lib/cmd_sequence_exporter.rb

@@ -0,0 +1,52 @@
+# encoding: ascii-8bit
+
+# Copyright 2014 Ball Aerospace & Technologies Corp.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+
+require 'cosmos'
+require 'cosmos/ccsds/ccsds_packet'
+
+module Cosmos
+  class CmdSequenceExporter
+    def initialize(parent)
+      @parent = parent
+    end
+
+    def export(filename, sequence_dir, sequence_list)
+      basename = File.basename(filename, ".*")
+      filename = Qt::FileDialog::getSaveFileName(@parent,   # parent
+                                                 'Export', # caption
+                                                 sequence_dir + "/#{basename}.bin", # dir
+                                                 'Sequence Binary (*.bin)') # filter
+      return if filename.nil? || filename.empty?
+
+      data = ''
+      sequence_list.each do |item|
+        begin
+          time = Time.parse(item.time)
+          day, ms, us = Time.mdy2ccsds(time.year, time.month, time.day, time.hour, time.min, time.sec, time.usec)
+          data << [day].pack("N") # UINT32
+          data << [ms].pack("N") # UINT32
+        rescue
+          time = item.time.to_f * 1000
+          data << [0].pack("N") # UINT32
+          data << [time].pack("N") # UINT32
+        end
+        data << item.command.buffer
+      end
+      ccsds = CcsdsPacket.new
+      ccsds.write("CCSDSTYPE", CcsdsPacket::COMMAND)
+      ccsds.write('CCSDSSHF', 0)
+      ccsds.write("CCSDSAPID", 505)
+      ccsds.write("CCSDSSEQFLAGS", CcsdsPacket::STANDALONE)
+      ccsds.write("CCSDSDATA", data)
+      ccsds.write("CCSDSLENGTH", data.length - 1)
+      File.open(filename, 'wb') { |file| file.write ccsds.buffer }
+    end
+  end
+end

data/autohotkey/procedures/collect.rb

@@ -1,5 +1,5 @@
-require_utility 'collect_util.rb'
-require_utility 'clear_util.rb'
+load_utility 'collect_util.rb'
+load_utility 'clear_util.rb'
 
 number = ask("Enter a number.")
 raise "Bad return" unless number.is_a? Numeric

data/autohotkey/procedures/collect_util.rb

@@ -1,4 +1,4 @@
-require_utility 'clear_util.rb'
+load_utility 'clear_util.rb'
 
 def collect (type, duration, call_clear = false)
   # Get the current collects telemetry point

data/autohotkey/procedures/script_test.rb

@@ -1,4 +1,4 @@
-require_utility 'clear_util'
+load_utility 'clear_util'
 
 display("INST ADCS")
 wait 2

data/autohotkey/tools/CmdSenderAHK2

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# encoding: ascii-8bit
+
+# Copyright 2014 Ball Aerospace & Technologies Corp.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+
+require_relative 'autohotkey.rb'
+autohotkey('CmdSender2', 'cmd_sender2.ahk') do
+  require 'cosmos/tools/cmd_sender/cmd_sender'
+  require 'cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui'
+  Cosmos::CmdSender.run
+end
+

data/autohotkey/tools/cmd_sender.ahk

@@ -1,6 +1,19 @@
 SetWinDelay 1000
 WinWaitActive Command Sender
 Sleep 500
+Click 85 100 ; Target dropdown
+Sleep 500
+Click 75 128 ; INST2
+Sleep 500
+Click 365 100 ; Command dropdown
+Sleep 500
+Click 365 140 ; ASCIICMD
+Sleep 500
+Click 600 100 ; Send
+WinWaitActive Error ; Error connecting to CTS
+Sleep 1000
+Send {Enter}
+WinWaitActive Command Sender
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
 Sleep 4000
 WinActivate Command Sender
@@ -34,6 +47,8 @@ WinWaitActive Command Sender
 Sleep 500
 Click 85 100 ; Target dropdown CMD-1
 Sleep 500
+Click 85 115 ; INST
+Sleep 500
 Click 610 100 ; Send CMD-2
 Sleep 500
 Click 365 100 ; Command dropdown CMD-1
@@ -45,6 +60,7 @@ Sleep 500
 WinWaitActive Error
 Sleep 500
 Send {Enter}
+WinWaitActive Command Sender
 Click 240 210 ; Click in the TYPE parameter CMD-5
 Sleep 500
 Send 5{Enter}
@@ -135,15 +151,27 @@ Click 215 475 ; Select File
 WinWaitActive Insert
 Sleep 500
 Send cmd.bin{Enter}
-WinWaitActive Command Sender
-Sleep 500
-Click 85 100 ; Target dropdown
 Sleep 500
-Click 75 128 ; INST2
+WinActivate Command Sender
 Sleep 500
-Click 365 100 ; Command dropdown
+Click 70 70 ; Search box
+Send I
+Sleep 100
+Send N
+Sleep 100
+Send S
+Sleep 100
+Send T
+Sleep 100
+Send 2
+Sleep 100
+Send {Space}
+Sleep 100
+Send C
+Sleep 100
+Send O
 Sleep 500
-Click 365 165 ; Collect command
+Send {Enter}
 Sleep 500
 Click 180 390 ; Click on Type
 Sleep 500