cosmos 4.0.0 → 4.0.1

data/demo/Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'ruby-termios', '~> 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i
+gem 'ruby-termios', '~> 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i and RUBY_ENGINE=='ruby'
 if ENV['COSMOS_DEVEL']
   gem 'cosmos', :path => ENV['COSMOS_DEVEL']
 else

data/demo/config/data/crc.txt

@@ -8,7 +8,7 @@
 "config/targets/SYSTEM/cmd_tlm/system_cmds.txt" 0xD1F6BA0F
 "config/targets/SYSTEM/cmd_tlm/override.txt" 0x8FE016FF
 "config/targets/SYSTEM/cmd_tlm/system_tlm.txt" 0xC44F7A0C
-"config/targets/SYSTEM/cmd_tlm/meta_cmd_tlm.txt" 0xE876EADC
+"config/targets/SYSTEM/cmd_tlm/meta_tlm.txt" 0x1637F68F
 "config/targets/SYSTEM/cmd_tlm/limits_groups.txt" 0x64426D51
 "config/targets/SYSTEM/lib/limits_groups.rb" 0xB2D5A8DA
 "config/targets/TEMPLATED/target.txt" 0x4A59ED64
@@ -99,7 +99,7 @@
 "config/tools/tlm_extractor/_adcs_time.txt" 0x3DAD5094
 "config/tools/tlm_extractor/tlm_extractor2.txt" 0x5C780BD2
 "config/tools/cmd_tlm_server/cmd_tlm_server2.txt" 0xC5AC2AE0
-"config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0x9347D9D9
+"config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0xA15F85F6
 "config/tools/tlm_grapher/README.txt" 0x93B2C07E
 "config/tools/opengl_builder/README.txt" 0x93B2C07E
 "config/tools/limits_monitor/README.txt" 0x93B2C07E
@@ -217,6 +217,11 @@
 "tools/mac/Launcher.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/Launcher.app/Contents/MacOS/main.sh" 0x0B32DAE8
 "tools/mac/Launcher.app/Contents/MacOS/Launcher.rb" 0xFD4E356C
+"tools/mac/ConfigEditor.app/Contents/Info.plist" 0x5E9C6081
+"tools/mac/ConfigEditor.app/Contents/Resources/appIcon.icns" 0xD9774799
+"tools/mac/ConfigEditor.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/ConfigEditor.app/Contents/MacOS/main.sh" 0x7C087C20
+"tools/mac/ConfigEditor.app/Contents/MacOS/ConfigEditor.rb" 0xD1205371
 "tools/mac/TlmGrapher.app/Contents/Info.plist" 0x3623B978
 "tools/mac/TlmGrapher.app/Contents/Resources/appIcon.icns" 0xCA324F50
 "tools/mac/TlmGrapher.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696

data/demo/config/targets/SYSTEM/cmd_tlm/meta_tlm.txt

@@ -0,0 +1,10 @@
+TELEMETRY SYSTEM META BIG_ENDIAN "System Meta Data Telemetry Packet"
+  APPEND_ID_ITEM PKTID 8 UINT 1 "Packet Id"
+  APPEND_ITEM CONFIG 256 STRING "Configuration Name"
+  APPEND_ITEM COSMOS_VERSION 240 STRING "COSMOS Version"
+    META READ_ONLY
+  APPEND_ITEM USER_VERSION 240 STRING "User Project Version"
+    META READ_ONLY
+  APPEND_ITEM RUBY_VERSION 240 STRING "Ruby Version"
+    META READ_ONLY
+  APPEND_ITEM OPERATOR_NAME 512 STRING "Operator Name"

data/demo/config/tools/cmd_tlm_server/cmd_tlm_server.txt

@@ -46,4 +46,4 @@ BACKGROUND_TASK example_background_task.rb
   STOPPED
 BACKGROUND_TASK limits_groups.rb 5 # Initial delay to allow interfaces to connect
 
-#COLLECT_METADATA
+COLLECT_METADATA

data/demo/tools/mac/ConfigEditor.app/Contents/Info.plist

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>ConfigEditor</string>
+	<key>CFBundleExecutable</key>
+	<string>main.sh</string>
+	<key>CFBundleIconFile</key>
+	<string>appIcon.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.ballaerospace.cosmos.ConfigEditor</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>ConfigEditor</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.0</string>
+	<key>CFBundleVersion</key>
+	<string>2.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.5.0</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© 2017 Ball Aerospace</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSAppSleepDisabled</key>
+	<true/>
+	<key>LSAppNapIsDisabled</key>
+	<true/>
+</dict>
+</plist>

data/demo/tools/mac/ConfigEditor.app/Contents/MacOS/ConfigEditor.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# encoding: ascii-8bit
+
+# Copyright 2015 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 'tool_launch'
+tool_launch do
+  require 'cosmos/tools/config_editor/config_editor'
+  Cosmos::ConfigEditor.run
+end

data/demo/tools/mac/ConfigEditor.app/Contents/MacOS/main.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -l
+TOOLNAME=ConfigEditor
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+rm $DIR/$TOOLNAME
+if hash rbenv 2>/dev/null; then
+  ln -s `rbenv which ruby` $DIR/$TOOLNAME
+else
+  ln -s `which ruby` $DIR/$TOOLNAME
+fi
+exec $DIR/$TOOLNAME $DIR/$TOOLNAME.rb "$@" &

data/demo/tools/mac/ConfigEditor.app/Contents/MacOS/tool_launch.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+# encoding: ascii-8bit
+
+# Copyright 2015 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
+
+def tool_launch
+  begin
+    require 'bundler/setup'
+    require 'cosmos'
+    yield
+  rescue Exception => error
+    popup_error = error; popup_error = $cosmos_fatal_exception if defined? $cosmos_fatal_exception
+    begin
+      raise error if STDIN.isatty # Have a console
+      raise error unless defined? $cosmos_fatal_exception or (error.class != SystemExit and error.class != Interrupt)
+      case RUBY_PLATFORM
+      when /mingw32/
+        require 'fiddle'
+        Fiddle::Function.new(Fiddle.dlopen('user32')['MessageBox'], [Fiddle::TYPE_LONG, Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_LONG], Fiddle::TYPE_LONG).call(0, "#{popup_error.class}:#{popup_error.message}\n\n#{popup_error.backtrace.join("\n")}\n\nNote: Ctrl-C will copy this information to the clipboard.", "Error Starting COSMOS Tool", 0x50030)
+      when /darwin/
+        system("osascript -e 'display notification \"#{popup_error.class}:#{popup_error.message}:#{popup_error.backtrace[0].tr("'\"`<>", '')}\" with title \"Error Starting COSMOS Tool\"'")
+      else
+        message = "#{popup_error.class}:#{popup_error.message}\\n\\n#{popup_error.backtrace.join("\\n").tr("'\"`<>", '')}"
+        command = "zenity --info --text=\"#{message}\" --title=\"Error Starting COSMOS Tool\""
+        success = system(command)
+        system("notify-send \"Error Starting COSMOS Tool\" \"#{message}\"") unless success
+      end
+    ensure
+      raise error
+    end
+  end
+end

data/install/Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'ruby-termios', '~> 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i
+gem 'ruby-termios', '~> 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i and RUBY_ENGINE=='ruby'
 if ENV['COSMOS_DEVEL']
   gem 'cosmos', :path => ENV['COSMOS_DEVEL']
 else

data/install/config/data/crc.txt

@@ -1,6 +1,6 @@
 "lib/user_version.rb" 0x8F282EE9
 "config/targets/SYSTEM/target.txt" 0x07E82776
-"config/targets/SYSTEM/cmd_tlm/meta_cmd_tlm.txt" 0x84E416C1
+"config/targets/SYSTEM/cmd_tlm/meta_tlm.txt" 0x07CDABCB
 "config/data/README.txt" 0x93B2C07E
 "config/system/system.txt" 0x6CB79668
 "config/tools/launcher/launcher.txt" 0x2F6ABBDB
@@ -126,6 +126,11 @@
 "tools/mac/Launcher.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/Launcher.app/Contents/MacOS/main.sh" 0x0B32DAE8
 "tools/mac/Launcher.app/Contents/MacOS/Launcher.rb" 0xFD4E356C
+"tools/mac/ConfigEditor.app/Contents/Info.plist" 0x5E9C6081
+"tools/mac/ConfigEditor.app/Contents/Resources/appIcon.icns" 0xD9774799
+"tools/mac/ConfigEditor.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/ConfigEditor.app/Contents/MacOS/main.sh" 0x7C087C20
+"tools/mac/ConfigEditor.app/Contents/MacOS/ConfigEditor.rb" 0xD1205371
 "tools/mac/TlmGrapher.app/Contents/Info.plist" 0x3623B978
 "tools/mac/TlmGrapher.app/Contents/Resources/appIcon.icns" 0xCA324F50
 "tools/mac/TlmGrapher.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696

data/install/config/targets/SYSTEM/cmd_tlm/meta_tlm.txt

@@ -0,0 +1,9 @@
+TELEMETRY SYSTEM META BIG_ENDIAN "System Meta Data Telemetry Packet"
+  APPEND_ID_ITEM PKTID 8 UINT 1 "Packet Id"
+  APPEND_ITEM CONFIG 256 STRING "Configuration Name"
+  APPEND_ITEM COSMOS_VERSION 240 STRING "COSMOS Version"
+    META READ_ONLY
+  APPEND_ITEM USER_VERSION 240 STRING "User Project Version"
+    META READ_ONLY
+  APPEND_ITEM RUBY_VERSION 240 STRING "Ruby Version"
+    META READ_ONLY

data/install/tools/mac/ConfigEditor.app/Contents/Info.plist

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>ConfigEditor</string>
+	<key>CFBundleExecutable</key>
+	<string>main.sh</string>
+	<key>CFBundleIconFile</key>
+	<string>appIcon.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.ballaerospace.cosmos.ConfigEditor</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>ConfigEditor</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.0</string>
+	<key>CFBundleVersion</key>
+	<string>2.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.5.0</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© 2017 Ball Aerospace</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSAppSleepDisabled</key>
+	<true/>
+	<key>LSAppNapIsDisabled</key>
+	<true/>
+</dict>
+</plist>

data/install/tools/mac/ConfigEditor.app/Contents/MacOS/ConfigEditor.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# encoding: ascii-8bit
+
+# Copyright 2015 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 'tool_launch'
+tool_launch do
+  require 'cosmos/tools/config_editor/config_editor'
+  Cosmos::ConfigEditor.run
+end

data/install/tools/mac/ConfigEditor.app/Contents/MacOS/main.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -l
+TOOLNAME=ConfigEditor
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+rm $DIR/$TOOLNAME
+if hash rbenv 2>/dev/null; then
+  ln -s `rbenv which ruby` $DIR/$TOOLNAME
+else
+  ln -s `which ruby` $DIR/$TOOLNAME
+fi
+exec $DIR/$TOOLNAME $DIR/$TOOLNAME.rb "$@" &

data/install/tools/mac/ConfigEditor.app/Contents/MacOS/tool_launch.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+# encoding: ascii-8bit
+
+# Copyright 2015 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
+
+def tool_launch
+  begin
+    require 'bundler/setup'
+    require 'cosmos'
+    yield
+  rescue Exception => error
+    popup_error = error; popup_error = $cosmos_fatal_exception if defined? $cosmos_fatal_exception
+    begin
+      raise error if STDIN.isatty # Have a console
+      raise error unless defined? $cosmos_fatal_exception or (error.class != SystemExit and error.class != Interrupt)
+      case RUBY_PLATFORM
+      when /mingw32/
+        require 'fiddle'
+        Fiddle::Function.new(Fiddle.dlopen('user32')['MessageBox'], [Fiddle::TYPE_LONG, Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_LONG], Fiddle::TYPE_LONG).call(0, "#{popup_error.class}:#{popup_error.message}\n\n#{popup_error.backtrace.join("\n")}\n\nNote: Ctrl-C will copy this information to the clipboard.", "Error Starting COSMOS Tool", 0x50030)
+      when /darwin/
+        system("osascript -e 'display notification \"#{popup_error.class}:#{popup_error.message}:#{popup_error.backtrace[0].tr("'\"`<>", '')}\" with title \"Error Starting COSMOS Tool\"'")
+      else
+        message = "#{popup_error.class}:#{popup_error.message}\\n\\n#{popup_error.backtrace.join("\\n").tr("'\"`<>", '')}"
+        command = "zenity --info --text=\"#{message}\" --title=\"Error Starting COSMOS Tool\""
+        success = system(command)
+        system("notify-send \"Error Starting COSMOS Tool\" \"#{message}\"") unless success
+      end
+    ensure
+      raise error
+    end
+  end
+end

data/lib/cosmos/gui/dialogs/set_tlm_dialog.rb

@@ -92,6 +92,9 @@ module Cosmos
           @editors << Qt::LineEdit.new
           @editors[-1].text = item_value.to_s
         end
+        if item.meta.keys && item.meta.keys.include?("READ_ONLY")
+          @editors[-1].setEnabled(false)
+        end
         values_layout.addRow(item_name, @editors[-1])
         if (@editors.length % 10 == 0) && (@items.length > @editors.length)
           values_layout = Qt::FormLayout.new

data/lib/cosmos/gui/dialogs/tlm_graph_dialog.rb

@@ -9,7 +9,7 @@
 # attribution addendums as found in the LICENSE.txt
 
 # This file contains the implementation and TlmGraphDialog class.   This class
-# is used to open a telemetry grapher to graph a telemetry item, typically on 
+# is used to open a telemetry grapher to graph a telemetry item, typically on
 # a right click.
 
 require 'cosmos'
@@ -19,7 +19,7 @@ require 'cosmos/script'
 
 module Cosmos
   # Dialog which allows the user to start graphing the given item.  If the
-  # item is a fixed-size array, this allows the user to determine whether to 
+  # item is a fixed-size array, this allows the user to determine whether to
   # graph a single index within the array or all indices within the array.
   # If the item is a variable-sized array, this allows the user to select a
   # single index to graph.
@@ -41,7 +41,7 @@ module Cosmos
           num_array_elements = -1
         end
       end
-      
+
       item_string = ""
 
       if num_array_elements != 0
@@ -49,13 +49,13 @@ module Cosmos
         dialog.setWindowTitle("Select array index")
         dialog_layout = Qt::VBoxLayout.new
         dialog_layout.addWidget(Qt::Label.new("#{target_name} #{packet_name} #{item_name} is an array."))
-        
+
         if num_array_elements > 0
           dialog_layout.addWidget(Qt::Label.new("Select array index to graph or graph all:"))
           index_chooser = IntegerChooser.new(parent, 'Array Index:', 0, 0, num_array_elements-1)
         else
           dialog_layout.addWidget(Qt::Label.new("Select array index to graph:"))
-          index_chooser = IntegerChooser.new(parent, 'Array Index:', 0, 0)  
+          index_chooser = IntegerChooser.new(parent, 'Array Index:', 0, 0)
         end
         dialog_layout.addWidget(index_chooser)
 
@@ -99,15 +99,9 @@ module Cosmos
         item_string << "-i \"#{target_name} #{packet_name} #{item_name}\" "
       end
 
-      # Start grapher if necessary.
+      # Start grapher if necessary
       if !item_string.empty?
-        if Kernel.is_windows?
-          Cosmos.run_process("rubyw tools/TlmGrapher #{item_string} --system #{File.basename(System.initial_filename)}")
-        elsif Kernel.is_mac? and File.exist?("tools/mac/TlmGrapher.app")
-          Cosmos.run_process("open tools/mac/TlmGrapher.app --args #{item_string} --system #{File.basename(System.initial_filename)}")
-        else
-          Cosmos.run_process("ruby tools/TlmGrapher #{item_string} --system #{File.basename(System.initial_filename)}")
-        end
+        Cosmos.run_cosmos_tool("TlmGrapher", "#{item_string} --system #{File.basename(System.initial_filename)}")
       end
     end
   end

data/lib/cosmos/interfaces/interface.rb

@@ -372,7 +372,7 @@ module Cosmos
     # @param packet [Packet] Packet to extract data from
     # @return data
     def convert_packet_to_data(packet)
-      packet.buffer(false)
+      packet.buffer(true) # Copy buffer so logged command isn't modified
     end
 
     # Called to read data and manipulate it until enough data is

data/lib/cosmos/packets/commands.rb

@@ -134,6 +134,11 @@ module Cosmos
       # Lookup the command and create a light weight copy
       command = packet(target_upcase, packet_upcase).clone
 
+      # Restore the command's buffer to a zeroed string of defined length
+      # This will undo any side effects from earlier commands that may have altered the size
+      # of the buffer
+      command.buffer = "\x00" * command.defined_length
+
       # Set time, parameters, and restore defaults
       command.received_time = Time.now.sys
       command.given_values = params

data/lib/cosmos/packets/packet.rb

@@ -454,6 +454,11 @@ module Cosmos
     #   can be any type.
     def read_item(item, value_type = :CONVERTED, buffer = @buffer)
       value = super(item, :RAW, buffer)
+      derived_raw = false
+      if item.data_type == :DERIVED && value_type == :RAW
+        value_type = :CONVERTED
+        derived_raw = true
+      end
       case value_type
       when :RAW
         # Done above
@@ -505,6 +510,9 @@ module Cosmos
           end
         end
 
+        # Derived raw values perform read_conversions but nothing else
+        return value if derived_raw
+
         # Convert from value to state if possible
         if item.states
           if Array === value

data/lib/cosmos/packets/packet_item.rb

@@ -248,6 +248,15 @@ module Cosmos
       @meta ||= {}
     end
 
+    def meta=(meta)
+      if meta
+        raise ArgumentError, "#{@name}: meta must be a Hash but is a #{meta.class}" unless Hash === meta
+        @meta = meta.clone
+      else
+        @meta = nil
+      end
+    end
+
     # Make a light weight clone of this item
     def clone
       item = super()