cosmos 3.0.1 → 3.1.0

data/demo/config/tools/test_runner/test_runner.txt

@@ -1,17 +1,17 @@
-REQUIRE_UTILITY 'example_test'
-LINE_DELAY 0
-# RESULTS_WRITER 'results_writer.rb'
-ALLOW_DEBUG
-PAUSE_ON_ERROR TRUE
-CONTINUE_TEST_CASE_AFTER_ERROR TRUE
-ABORT_TESTING_AFTER_ERROR FALSE
-MANUAL TRUE
-LOOP_TESTING FALSE
-BREAK_LOOP_AFTER_ERROR FALSE
-CREATE_DATA_PACKAGE
-AUTO_CYCLE_LOGS
-COLLECT_METADATA META DATA
-# IGNORE_TEST_SUITE EmptyTestSuite
-# IGNORE_TEST EmptyTest
-# MONITOR_LIMITS
-# PAUSE_ON_RED
+REQUIRE_UTILITY 'example_test'
+LINE_DELAY 0
+# RESULTS_WRITER 'results_writer.rb'
+ALLOW_DEBUG
+PAUSE_ON_ERROR TRUE
+CONTINUE_TEST_CASE_AFTER_ERROR TRUE
+ABORT_TESTING_AFTER_ERROR FALSE
+MANUAL TRUE
+LOOP_TESTING FALSE
+BREAK_LOOP_AFTER_ERROR FALSE
+CREATE_DATA_PACKAGE
+AUTO_CYCLE_LOGS
+COLLECT_METADATA META DATA
+# IGNORE_TEST_SUITE EmptyTestSuite
+# IGNORE_TEST EmptyTest
+# MONITOR_LIMITS
+# PAUSE_ON_RED

data/demo/config/tools/tlm_extractor/tlm_extractor.txt

@@ -1,13 +1,13 @@
-ITEM INST ADCS TIMEFORMATTED
-ITEM INST ADCS Q1 RAW
-ITEM INST ADCS Q1
-ITEM INST ADCS Q1 FORMATTED
-ITEM INST ADCS Q1 WITH_UNITS
-ITEM INST ADCS VELX RAW
-ITEM INST ADCS VELX
-ITEM INST ADCS VELX FORMATTED
-ITEM INST ADCS VELX WITH_UNITS
-ITEM INST ADCS CCSDSSEQFLAGS RAW
-ITEM INST ADCS CCSDSSEQFLAGS
-ITEM INST ADCS CCSDSSEQFLAGS FORMATTED
-ITEM INST ADCS CCSDSSEQFLAGS WITH_UNITS
+ITEM INST ADCS TIMEFORMATTED
+ITEM INST ADCS Q1 RAW
+ITEM INST ADCS Q1
+ITEM INST ADCS Q1 FORMATTED
+ITEM INST ADCS Q1 WITH_UNITS
+ITEM INST ADCS VELX RAW
+ITEM INST ADCS VELX
+ITEM INST ADCS VELX FORMATTED
+ITEM INST ADCS VELX WITH_UNITS
+ITEM INST ADCS CCSDSSEQFLAGS RAW
+ITEM INST ADCS CCSDSSEQFLAGS
+ITEM INST ADCS CCSDSSEQFLAGS FORMATTED
+ITEM INST ADCS CCSDSSEQFLAGS WITH_UNITS

data/demo/config/tools/tlm_extractor/tlm_extractor2.txt

@@ -1,2 +1,2 @@
-ITEM INST ADCS TIMEFORMATTED
-ITEM INST ADCS Q2 RAW
+ITEM INST ADCS TIMEFORMATTED
+ITEM INST ADCS Q2 RAW

data/demo/config/tools/tlm_extractor/tlm_extractor3.txt

@@ -1,2 +1,2 @@
-ITEM INST ADCS TIMEFORMATTED
-ITEM INST ADCS Q3 RAW
+ITEM INST ADCS TIMEFORMATTED
+ITEM INST ADCS Q3 RAW

data/demo/config/tools/tlm_extractor/tlm_extractor4.txt

@@ -1,2 +1,2 @@
-ITEM INST ADCS TIMEFORMATTED
-ITEM INST ADCS Q4 RAW
+ITEM INST ADCS TIMEFORMATTED
+ITEM INST ADCS Q4 RAW

data/demo/config/tools/tlm_viewer/tlm_viewer.txt

@@ -1,41 +1,41 @@
-# Automatically pull in screens from all targets
-AUTO_TARGETS
-
-# Create a new dropdown with a few specific sceens
-GROUP "My group"
-  GROUP_SCREEN "COSMOS" "version.txt"
-  GROUP_SCREEN "INST" "hs.txt"
-  GROUP_SCREEN "INST2" "hs.txt"
-
-# NEW_COLUMN
-
-# AUTO_TARGET INST
-
-# TARGET "INST"
-#  SCREEN "adcs.txt"
-#  SCREEN "array.txt"
-#  SCREEN "block.txt"
-#  SCREEN "commanding.txt"
-#  SCREEN "graphs.txt"
-#  SCREEN "ground.txt"
-#  SCREEN "hs.txt"
-#  SCREEN "latest.txt" 480 324
-#    SHOW_ON_STARTUP
-#  SCREEN "other.txt"
-#  SCREEN "tabs.txt"
-
-#TARGET "INST2"
-#  SCREEN "adcs.txt"
-#  SCREEN "array.txt"
-#  SCREEN "block.txt"
-#  SCREEN "commanding.txt" 898 317
-#    SHOW_ON_STARTUP
-#  SCREEN "graphs.txt"
-#  SCREEN "ground.txt"
-#  SCREEN "hs.txt"
-#  SCREEN "latest.txt"
-#  SCREEN "other.txt"
-#  SCREEN "tabs.txt"
-
-# ADD_SHOW_ON_STARTUP INST ADCS 10 10
-# ADD_SHOW_ON_STARTUP INST HS 500 500
+# Automatically pull in screens from all targets
+AUTO_TARGETS
+
+# Create a new dropdown with a few specific sceens
+GROUP "My group"
+  GROUP_SCREEN "COSMOS" "version.txt"
+  GROUP_SCREEN "INST" "hs.txt"
+  GROUP_SCREEN "INST2" "hs.txt"
+
+# NEW_COLUMN
+
+# AUTO_TARGET INST
+
+# TARGET "INST"
+#  SCREEN "adcs.txt"
+#  SCREEN "array.txt"
+#  SCREEN "block.txt"
+#  SCREEN "commanding.txt"
+#  SCREEN "graphs.txt"
+#  SCREEN "ground.txt"
+#  SCREEN "hs.txt"
+#  SCREEN "latest.txt" 480 324
+#    SHOW_ON_STARTUP
+#  SCREEN "other.txt"
+#  SCREEN "tabs.txt"
+
+#TARGET "INST2"
+#  SCREEN "adcs.txt"
+#  SCREEN "array.txt"
+#  SCREEN "block.txt"
+#  SCREEN "commanding.txt" 898 317
+#    SHOW_ON_STARTUP
+#  SCREEN "graphs.txt"
+#  SCREEN "ground.txt"
+#  SCREEN "hs.txt"
+#  SCREEN "latest.txt"
+#  SCREEN "other.txt"
+#  SCREEN "tabs.txt"
+
+# ADD_SHOW_ON_STARTUP INST ADCS 10 10
+# ADD_SHOW_ON_STARTUP INST HS 500 500

data/demo/lib/example_background_task.rb

@@ -1,52 +1,57 @@
-# 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
-
-# This file implements an example background task
-
-require 'cosmos/tools/cmd_tlm_server/background_task'
-
-module Cosmos
-
-  # ExampleBackgroundTask class
-  #
-  # This class is an example background task
-  #
-  class ExampleBackgroundTask < BackgroundTask
-
-    def initialize
-      super()
-      @name = 'Example Background Task'
-    end
-
-    def call
-      sent_count = 0
-      @status = "Sleeping for 5 seconds"
-      sleep(5) # allow interfaces time to start
-      loop do
-        #Make sure we start up with 3 collects
-        if (tlm('INST', 'HEALTH_STATUS', 'COLLECTS') < 3)
-          begin
-            cmd('INST', 'COLLECT', 'TYPE' => 'NORMAL', 'DURATION' => 1)
-            sent_count += 1
-            @status = "Sent COLLECT ##{sent_count} at #{Time.now.formatted}"
-          rescue
-            # Oh well - probably disconnected
-          end
-        else
-          break
-        end
-        sleep(1)
-      end
-      @status = "Finished at #{Time.now.formatted}"
-    end
-
-  end # class ExampleBackgroundTask
-
-end # module Cosmos
+# 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
+
+# This file implements an example background task
+
+require 'cosmos/tools/cmd_tlm_server/background_task'
+
+module Cosmos
+
+  # ExampleBackgroundTask class
+  #
+  # This class is an example background task
+  #
+  class ExampleBackgroundTask < BackgroundTask
+
+    def initialize
+      super()
+      @name = 'Example Background Task'
+      @sleeper = Sleeper.new
+    end
+
+    def call
+      sent_count = 0
+      @status = "Sleeping for 5 seconds"
+      return if @sleeper.sleep(5) # allow interfaces time to start
+      loop do
+        #Make sure we start up with 3 collects
+        if (tlm('INST', 'HEALTH_STATUS', 'COLLECTS') < 3)
+          begin
+            cmd('INST', 'COLLECT', 'TYPE' => 'NORMAL', 'DURATION' => 1)
+            sent_count += 1
+            @status = "Sent COLLECT ##{sent_count} at #{Time.now.formatted}"
+          rescue
+            # Oh well - probably disconnected
+          end
+        else
+          break
+        end
+        return if @sleeper.sleep(1)
+      end
+      @status = "Finished at #{Time.now.formatted}"
+    end
+
+    def stop
+      @sleeper.cancel
+    end
+
+  end # class ExampleBackgroundTask
+
+end # module Cosmos

data/demo/lib/example_target.rb

@@ -1,108 +1,113 @@
-# 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/interfaces'
-require 'cosmos/tools/cmd_tlm_server/interface_thread'
-
-module Cosmos
-
-  class ExampleTarget
-
-    class ExampleServerInterface < TcpipServerInterface
-      PORT = 9999
-
-      def initialize
-        super(PORT, PORT, 5.0, nil, 'LENGTH', 0, 32, 4, 1, 'BIG_ENDIAN', 4)
-      end
-
-      def pre_write_packet(packet)
-        [packet.length].pack('N') << packet.buffer(false)
-      end
-    end
-
-    class ExampleInterfaceThread < InterfaceThread
-
-      protected
-
-      def handle_packet(packet)
-        identified_packet = System.commands.identify(packet.buffer, ['EXAMPLE'])
-        if identified_packet
-          Logger.info "Received command: #{identified_packet.target_name} #{identified_packet.packet_name}"
-        else
-          Logger.info "Received UNKNOWN command"
-        end
-      end
-    end
-
-    class ExampleTelemetryThread
-      attr_reader :thread
-
-      def initialize(interface)
-        @interface = interface
-      end
-
-      def start
-        packet = System.telemetry.packet('EXAMPLE', 'STATUS')
-        @thread = Thread.new do
-          begin
-            while true
-              packet.write('PACKET_ID', 1)
-              packet.write('STRING', "The time is now: #{Time.now.formatted}")
-              @interface.write(packet)
-              sleep(1)
-            end
-          rescue Exception => err
-            Logger.error "ExampleTelemetryThread unexpectedly died\n#{err.formatted}"
-          end
-        end
-      end
-
-      def stop
-        @thread.kill
-        @thread.join
-      end
-    end
-
-    def initialize
-      # Create interface to receive commands and send telemetry
-      @interface = ExampleServerInterface.new
-      @interface_thread = nil
-      @telemetry_thread = nil
-    end
-
-    def start
-      @interface_thread = ExampleInterfaceThread.new(@interface)
-      @interface_thread.start
-      @telemetry_thread = ExampleTelemetryThread.new(@interface)
-      @telemetry_thread.start
-    end
-
-    def stop
-      @telemetry_thread.stop if @telemetry_thread
-      @interface_thread.stop if @interface_thread
-    end
-
-    def self.run
-      Logger.level = Logger::INFO
-      target = self.new
-      begin
-        target.start
-        while true
-          sleep 1
-        end
-      rescue SystemExit, Interrupt
-        target.stop
-      end
-    end
-
-  end # class ExampleTarget
-
-end # module Cosmos
+# 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/interfaces'
+require 'cosmos/tools/cmd_tlm_server/interface_thread'
+
+module Cosmos
+
+  class ExampleTarget
+
+    class ExampleServerInterface < TcpipServerInterface
+      PORT = 9999
+
+      def initialize
+        super(PORT, PORT, 5.0, nil, 'LENGTH', 0, 32, 4, 1, 'BIG_ENDIAN', 4)
+      end
+
+      def pre_write_packet(packet)
+        [packet.length].pack('N') << packet.buffer(false)
+      end
+    end
+
+    class ExampleInterfaceThread < InterfaceThread
+
+      protected
+
+      def handle_packet(packet)
+        identified_packet = System.commands.identify(packet.buffer, ['EXAMPLE'])
+        if identified_packet
+          Logger.info "Received command: #{identified_packet.target_name} #{identified_packet.packet_name}"
+        else
+          Logger.info "Received UNKNOWN command"
+        end
+      end
+    end
+
+    class ExampleTelemetryThread
+      attr_reader :thread
+
+      def initialize(interface)
+        @interface = interface
+        @sleeper = Sleeper.new
+      end
+
+      def start
+        packet = System.telemetry.packet('EXAMPLE', 'STATUS')
+        @thread = Thread.new do
+          @stop_thread = false
+          begin
+            while true
+              packet.write('PACKET_ID', 1)
+              packet.write('STRING', "The time is now: #{Time.now.formatted}")
+              @interface.write(packet)
+              break if @sleeper.sleep(1)
+            end
+          rescue Exception => err
+            Logger.error "ExampleTelemetryThread unexpectedly died\n#{err.formatted}"
+          end
+        end
+      end
+
+      def stop
+        Cosmos.kill_thread(self, @thread)
+      end
+
+      def graceful_kill
+        @sleeper.cancel
+      end
+    end
+
+    def initialize
+      # Create interface to receive commands and send telemetry
+      @interface = ExampleServerInterface.new
+      @interface_thread = nil
+      @telemetry_thread = nil
+    end
+
+    def start
+      @interface_thread = ExampleInterfaceThread.new(@interface)
+      @interface_thread.start
+      @telemetry_thread = ExampleTelemetryThread.new(@interface)
+      @telemetry_thread.start
+    end
+
+    def stop
+      @telemetry_thread.stop if @telemetry_thread
+      @interface_thread.stop if @interface_thread
+    end
+
+    def self.run
+      Logger.level = Logger::INFO
+      target = self.new
+      begin
+        target.start
+        while true
+          sleep 1
+        end
+      rescue SystemExit, Interrupt
+        target.stop
+      end
+    end
+
+  end # class ExampleTarget
+
+end # module Cosmos