cosmos 3.0.1 → 3.1.0

data/demo/config/targets/INST/screens/tabs.txt

@@ -1,70 +1,70 @@
-SCREEN AUTO AUTO 1.0
-
-TABBOOK
-  TABITEM ADCS
-    TITLE "Instrument ADCS Information"
-
-    HORIZONTAL
-      VERTICALBOX
-        SECTIONHEADER "Position and Velocity"
-
-        LABELVALUE INST ADCS POSX WITH_UNITS 20
-        LABELVALUE INST ADCS POSY WITH_UNITS 20
-        LABELVALUE INST ADCS POSZ WITH_UNITS 20
-        LABELVALUE INST ADCS VELX WITH_UNITS 20
-        LABELVALUE INST ADCS VELY WITH_UNITS 20
-        LABELVALUE INST ADCS VELZ WITH_UNITS 20
-      END
-
-      VERTICALBOX
-        SECTIONHEADER "Attitude"
-
-        LABELVALUE INST ADCS Q1
-        LABELVALUE INST ADCS Q2
-        LABELVALUE INST ADCS Q3
-        LABELVALUE INST ADCS Q4
-        LABELVALUE INST ADCS BIASX
-        LABELVALUE INST ADCS BIASY
-        LABELVALUE INST ADCS BIASZ
-      END
-
-      VERTICALBOX
-        SECTIONHEADER "File Progress"
-
-        LABELPROGRESSBAR INST ADCS POSPROGRESS
-        LABELPROGRESSBAR INST ADCS ATTPROGRESS
-      END
-    END
-
-    VERTICALBOX
-      LABELVALUE INST ADCS TIMEFORMATTED WITH_UNITS 30
-      LABELVALUE COSMOS VERSION COSMOS
-    END
-  END
-
-  TABITEM HS
-    TITLE "Instrument Health and Status"
-
-    VERTICALBOX
-      SECTIONHEADER "General Telemetry"
-
-      LABELVALUE INST HEALTH_STATUS COLLECTS
-    END
-
-    VERTICALBOX
-      SECTIONHEADER "Temperatures"
-
-      LABELVALUELIMITSBAR INST HEALTH_STATUS TEMP1
-      LABELVALUELIMITSBAR INST HEALTH_STATUS TEMP2
-      LABELVALUELIMITSBAR INST HEALTH_STATUS TEMP3
-      LABELVALUELIMITSBAR INST HEALTH_STATUS TEMP4
-    END
-
-    VERTICALBOX
-      LABELVALUE INST HEALTH_STATUS TIMEFORMATTED WITH_UNITS 30
-      LABELVALUE COSMOS VERSION COSMOS
-    END
-  END
-END
-
-
+SCREEN AUTO AUTO 1.0
+
+TABBOOK
+  TABITEM ADCS
+    TITLE "Instrument ADCS Information"
+
+    HORIZONTAL
+      VERTICALBOX
+        SECTIONHEADER "Position and Velocity"
+
+        LABELVALUE INST ADCS POSX WITH_UNITS 20
+        LABELVALUE INST ADCS POSY WITH_UNITS 20
+        LABELVALUE INST ADCS POSZ WITH_UNITS 20
+        LABELVALUE INST ADCS VELX WITH_UNITS 20
+        LABELVALUE INST ADCS VELY WITH_UNITS 20
+        LABELVALUE INST ADCS VELZ WITH_UNITS 20
+      END
+
+      VERTICALBOX
+        SECTIONHEADER "Attitude"
+
+        LABELVALUE INST ADCS Q1
+        LABELVALUE INST ADCS Q2
+        LABELVALUE INST ADCS Q3
+        LABELVALUE INST ADCS Q4
+        LABELVALUE INST ADCS BIASX
+        LABELVALUE INST ADCS BIASY
+        LABELVALUE INST ADCS BIASZ
+      END
+
+      VERTICALBOX
+        SECTIONHEADER "File Progress"
+
+        LABELPROGRESSBAR INST ADCS POSPROGRESS
+        LABELPROGRESSBAR INST ADCS ATTPROGRESS
+      END
+    END
+
+    VERTICALBOX
+      LABELVALUE INST ADCS TIMEFORMATTED WITH_UNITS 30
+      LABELVALUE COSMOS VERSION COSMOS
+    END
+  END
+
+  TABITEM HS
+    TITLE "Instrument Health and Status"
+
+    VERTICALBOX
+      SECTIONHEADER "General Telemetry"
+
+      LABELVALUE INST HEALTH_STATUS COLLECTS
+    END
+
+    VERTICALBOX
+      SECTIONHEADER "Temperatures"
+
+      LABELVALUELIMITSBAR INST HEALTH_STATUS TEMP1
+      LABELVALUELIMITSBAR INST HEALTH_STATUS TEMP2
+      LABELVALUELIMITSBAR INST HEALTH_STATUS TEMP3
+      LABELVALUELIMITSBAR INST HEALTH_STATUS TEMP4
+    END
+
+    VERTICALBOX
+      LABELVALUE INST HEALTH_STATUS TIMEFORMATTED WITH_UNITS 30
+      LABELVALUE COSMOS VERSION COSMOS
+    END
+  END
+END
+
+

data/demo/config/targets/INST/target.txt

@@ -1,33 +1,33 @@
-# Requires for limits responses and custom conversion classes
-REQUIRE example_limits_response.rb
-
-# Ignored Parameters
-# IGNORE_PARAMETER parameter_name
-IGNORE_PARAMETER CCSDSVER
-IGNORE_PARAMETER CCSDSTYPE
-IGNORE_PARAMETER CCSDSSHF
-IGNORE_PARAMETER CCSDSAPID
-IGNORE_PARAMETER CCSDSSEQFLAGS
-IGNORE_PARAMETER CCSDSSEQCNT
-IGNORE_PARAMETER CCSDSLENGTH
-IGNORE_PARAMETER PKTID
-
-# Ignored Items
-# IGNORE_ITEM item_name
-IGNORE_ITEM CCSDSVER
-IGNORE_ITEM CCSDSTYPE
-IGNORE_ITEM CCSDSSHF
-IGNORE_ITEM CCSDSAPID
-IGNORE_ITEM CCSDSSEQFLAGS
-IGNORE_ITEM CCSDSSEQCNT
-IGNORE_ITEM CCSDSLENGTH
-
-IGNORE_ITEM RECEIVED_COUNT
-IGNORE_ITEM RECEIVED_TIMESECONDS
-IGNORE_ITEM RECEIVED_TIMEFORMATTED
-
-# Explicitly define command and telemetry files
-# If not given then all the files in cmd/tlm will be processed in
-# alphabetical order
-COMMANDS inst_cmds.txt
-TELEMETRY inst_tlm.txt
+# Requires for limits responses and custom conversion classes
+REQUIRE example_limits_response.rb
+
+# Ignored Parameters
+# IGNORE_PARAMETER parameter_name
+IGNORE_PARAMETER CCSDSVER
+IGNORE_PARAMETER CCSDSTYPE
+IGNORE_PARAMETER CCSDSSHF
+IGNORE_PARAMETER CCSDSAPID
+IGNORE_PARAMETER CCSDSSEQFLAGS
+IGNORE_PARAMETER CCSDSSEQCNT
+IGNORE_PARAMETER CCSDSLENGTH
+IGNORE_PARAMETER PKTID
+
+# Ignored Items
+# IGNORE_ITEM item_name
+IGNORE_ITEM CCSDSVER
+IGNORE_ITEM CCSDSTYPE
+IGNORE_ITEM CCSDSSHF
+IGNORE_ITEM CCSDSAPID
+IGNORE_ITEM CCSDSSEQFLAGS
+IGNORE_ITEM CCSDSSEQCNT
+IGNORE_ITEM CCSDSLENGTH
+
+IGNORE_ITEM RECEIVED_COUNT
+IGNORE_ITEM RECEIVED_TIMESECONDS
+IGNORE_ITEM RECEIVED_TIMEFORMATTED
+
+# Explicitly define command and telemetry files
+# If not given then all the files in cmd/tlm will be processed in
+# alphabetical order
+COMMANDS inst_cmds.txt
+TELEMETRY inst_tlm.txt

data/demo/config/targets/META/cmd_tlm/meta_cmd.txt

@@ -1,10 +1,10 @@
-COMMAND META DATA BIG_ENDIAN "Metadata"
-  DISABLED
-  APPEND_PARAMETER TEST_COUNT 32 INT 0 255 0 "Test Count"
-  APPEND_PARAMETER TEST_ANGLE 64 FLOAT 0.0 100.0 0.0 "Test Angle"
-  APPEND_PARAMETER TEST_TYPE 32 UINT 0 2 0 "Test Type"
-    STATE TVAC 0
-    STATE EMI 1
-    STATE OTHER 2
-  APPEND_PARAMETER VERSION 1024 STRING '' "Version Metadata"
-    WRITE_CONVERSION new_packet_log_conversion.rb
+COMMAND META DATA BIG_ENDIAN "Metadata"
+  DISABLED
+  APPEND_PARAMETER TEST_COUNT 32 INT 0 255 0 "Test Count"
+  APPEND_PARAMETER TEST_ANGLE 64 FLOAT 0.0 100.0 0.0 "Test Angle"
+  APPEND_PARAMETER TEST_TYPE 32 UINT 0 2 0 "Test Type"
+    STATE TVAC 0
+    STATE EMI 1
+    STATE OTHER 2
+  APPEND_PARAMETER VERSION 1024 STRING '' "Version Metadata"
+    WRITE_CONVERSION new_packet_log_conversion.rb

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

@@ -1,13 +1,13 @@
-TELEMETRY META DATA BIG_ENDIAN "Metadata"
-  APPEND_ITEM TEST_COUNT 32 INT "Test Count"
-    GENERIC_WRITE_CONVERSION_START
-      raise "Value must be 123" if value.to_i != 123
-      value
-    GENERIC_WRITE_CONVERSION_END
-  APPEND_ITEM TEST_ANGLE 64 FLOAT "Test Angle"
-  APPEND_ITEM TEST_TYPE 32 UINT "Test Type"
-    STATE TVAC 0
-    STATE EMI 1
-    STATE OTHER 2
-  APPEND_ITEM VERSION 1024 STRING "Version Metadata"
-    WRITE_CONVERSION new_packet_log_conversion.rb
+TELEMETRY META DATA BIG_ENDIAN "Metadata"
+  APPEND_ITEM TEST_COUNT 32 INT "Test Count"
+    GENERIC_WRITE_CONVERSION_START
+      raise "Value must be 123" if value.to_i != 123
+      value
+    GENERIC_WRITE_CONVERSION_END
+  APPEND_ITEM TEST_ANGLE 64 FLOAT "Test Angle"
+  APPEND_ITEM TEST_TYPE 32 UINT "Test Type"
+    STATE TVAC 0
+    STATE EMI 1
+    STATE OTHER 2
+  APPEND_ITEM VERSION 1024 STRING "Version Metadata"
+    WRITE_CONVERSION new_packet_log_conversion.rb

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

@@ -1,7 +1,7 @@
-LIMITS_GROUP FIRST
-  LIMITS_GROUP_ITEM INST HEALTH_STATUS TEMP1
-  LIMITS_GROUP_ITEM INST HEALTH_STATUS TEMP3
-
-LIMITS_GROUP SECOND
-  LIMITS_GROUP_ITEM INST HEALTH_STATUS TEMP2
-  LIMITS_GROUP_ITEM INST HEALTH_STATUS TEMP4
+LIMITS_GROUP FIRST
+  LIMITS_GROUP_ITEM INST HEALTH_STATUS TEMP1
+  LIMITS_GROUP_ITEM INST HEALTH_STATUS TEMP3
+
+LIMITS_GROUP SECOND
+  LIMITS_GROUP_ITEM INST HEALTH_STATUS TEMP2
+  LIMITS_GROUP_ITEM INST HEALTH_STATUS TEMP4

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

@@ -1,29 +1,29 @@
-SELECT_TELEMETRY INST ADCS
-  SELECT_ITEM STAR1ID
-    FORMAT_STRING "0x%x"
-  SELECT_ITEM STAR2ID
-    FORMAT_STRING "0x%x"
-  SELECT_ITEM STAR3ID
-    FORMAT_STRING "0x%x"
-  SELECT_ITEM STAR4ID
-    FORMAT_STRING "0x%x"
-  SELECT_ITEM STAR5ID
-    FORMAT_STRING "0x%x"
-
-SELECT_TELEMETRY INST2 ADCS
-  SELECT_ITEM STAR1ID
-    FORMAT_STRING "0x%x"
-  SELECT_ITEM STAR2ID
-    FORMAT_STRING "0x%x"
-  SELECT_ITEM STAR3ID
-    FORMAT_STRING "0x%x"
-  SELECT_ITEM STAR4ID
-    FORMAT_STRING "0x%x"
-  SELECT_ITEM STAR5ID
-    FORMAT_STRING "0x%x"
-
-# You can define additional telemetry packets in the SYSTEM
-# configuration but it isn't recommended.
-#TELEMETRY INST TEST BIG_ENDIAN "Test packet"
-#  APPEND_ITEM TEST 16 UINT "Test Item"
-
+SELECT_TELEMETRY INST ADCS
+  SELECT_ITEM STAR1ID
+    FORMAT_STRING "0x%x"
+  SELECT_ITEM STAR2ID
+    FORMAT_STRING "0x%x"
+  SELECT_ITEM STAR3ID
+    FORMAT_STRING "0x%x"
+  SELECT_ITEM STAR4ID
+    FORMAT_STRING "0x%x"
+  SELECT_ITEM STAR5ID
+    FORMAT_STRING "0x%x"
+
+SELECT_TELEMETRY INST2 ADCS
+  SELECT_ITEM STAR1ID
+    FORMAT_STRING "0x%x"
+  SELECT_ITEM STAR2ID
+    FORMAT_STRING "0x%x"
+  SELECT_ITEM STAR3ID
+    FORMAT_STRING "0x%x"
+  SELECT_ITEM STAR4ID
+    FORMAT_STRING "0x%x"
+  SELECT_ITEM STAR5ID
+    FORMAT_STRING "0x%x"
+
+# You can define additional telemetry packets in the SYSTEM
+# configuration but it isn't recommended.
+#TELEMETRY INST TEST BIG_ENDIAN "Test packet"
+#  APPEND_ITEM TEST 16 UINT "Test Item"
+

data/demo/config/targets/SYSTEM/screens/status.txt

@@ -1,12 +1,12 @@
-SCREEN AUTO AUTO 0.5
-
-VERTICAL
-
-  TITLE "Status"
-
-  LABELVALUE COSMOS VERSION COSMOS 
-  LABELVALUE INST HEALTH_STATUS COLLECTS
-  LABELVALUE INST2 HEALTH_STATUS COLLECTS
-END
-
-
+SCREEN AUTO AUTO 0.5
+
+VERTICAL
+
+  TITLE "Status"
+
+  LABELVALUE COSMOS VERSION COSMOS 
+  LABELVALUE INST HEALTH_STATUS COLLECTS
+  LABELVALUE INST2 HEALTH_STATUS COLLECTS
+END
+
+

data/demo/config/targets/TEMPLATED/cmd_tlm/templated_cmds.txt

@@ -1,12 +1,13 @@
-COMMAND TEMPLATED SETPT_VOLTAGE BIG_ENDIAN "Templated string command"
-  APPEND_ID_PARAMETER CMD_ID 8 UINT 0 0 0 "Command Id"
-  APPEND_PARAMETER VOLTAGE 64 FLOAT MIN_FLOAT64 MAX_FLOAT64 3.14 "Voltage setting"
-  APPEND_PARAMETER CHANNEL 8 UINT 1 4 1 "Desired channel"
-  APPEND_PARAMETER CMD_TEMPLATE 1024 STRING "SOUR:VOLT <VOLTAGE>, (@<CHANNEL>)"
-
-COMMAND TEMPLATED GET_SETPT_VOLTAGE BIG_ENDIAN "Templated string command with response"
-  APPEND_ID_PARAMETER CMD_ID 8 UINT 1 1 1 "Command Id"
-  APPEND_PARAMETER CHANNEL 8 UINT 1 4 1 "Desired channel"
-  APPEND_PARAMETER CMD_TEMPLATE 512 STRING "SOUR:VOLT?, (@<CHANNEL>)"
-  APPEND_PARAMETER RSP_TEMPLATE 512 STRING "<VOLTAGE>"
-  APPEND_PARAMETER RSP_PACKET 512 STRING "READ_VOLTAGE"
+COMMAND TEMPLATED SETPT_VOLTAGE BIG_ENDIAN "Templated string command"
+  APPEND_ID_PARAMETER CMD_ID 8 UINT 0 0 0 "Command Id"
+  APPEND_PARAMETER VOLTAGE 64 FLOAT MIN_FLOAT64 MAX_FLOAT64 3.14 "Voltage setting"
+  APPEND_PARAMETER CHANNEL 8 UINT 1 4 1 "Desired channel"
+  APPEND_PARAMETER CMD_TEMPLATE 1024 STRING "SOUR:VOLT <VOLTAGE>, (@<CHANNEL>)"
+
+COMMAND TEMPLATED GET_SETPT_VOLTAGE BIG_ENDIAN "Templated string command with response"
+  DISABLE_MESSAGES
+  APPEND_ID_PARAMETER CMD_ID 8 UINT 1 1 1 "Command Id"
+  APPEND_PARAMETER CHANNEL 8 UINT 1 4 1 "Desired channel"
+  APPEND_PARAMETER CMD_TEMPLATE 512 STRING "SOUR:VOLT?, (@<CHANNEL>)"
+  APPEND_PARAMETER RSP_TEMPLATE 512 STRING "<VOLTAGE>"
+  APPEND_PARAMETER RSP_PACKET 512 STRING "READ_VOLTAGE"

data/demo/config/targets/TEMPLATED/cmd_tlm/templated_tlm.txt

@@ -1,3 +1,3 @@
-TELEMETRY TEMPLATED READ_VOLTAGE BIG_ENDIAN "Telemetry response"
-  APPEND_ID_ITEM PKT_ID 8 UINT 0 "Packet Id"
-  APPEND_ITEM VOLTAGE 64 FLOAT "Voltage"
+TELEMETRY TEMPLATED READ_VOLTAGE BIG_ENDIAN "Telemetry response"
+  APPEND_ID_ITEM PKT_ID 8 UINT 0 "Packet Id"
+  APPEND_ITEM VOLTAGE 64 FLOAT "Voltage"

data/demo/config/targets/TEMPLATED/cmd_tlm_server.txt

@@ -1,6 +1,6 @@
-# This is a segment of the main cmd_tlm_server.txt that will be used with
-# AUTO_INTERFACE_TARGETS or INTERFACE_TARGET
-
-INTERFACE TEMPLATED_INT templated_interface.rb localhost 5025 5025 5.0 5.0 TEMPLATE 0xA 0xA
-  TARGET TEMPLATED
-  DONT_CONNECT
+# This is a segment of the main cmd_tlm_server.txt that will be used with
+# AUTO_INTERFACE_TARGETS or INTERFACE_TARGET
+
+INTERFACE TEMPLATED_INT templated_interface.rb localhost 5025 5025 5.0 5.0 TEMPLATE 0xA 0xA
+  TARGET TEMPLATED
+  DONT_CONNECT

data/demo/config/targets/TEMPLATED/lib/templated_interface.rb

@@ -1,48 +1,54 @@
-# 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'
-
-module Cosmos
-
-  class TemplatedInterface < TcpipClientInterface
-    def initialize(*args)
-      super(*args)
-      @polling_thread = nil
-    end
-
-    def connect
-      super()
-
-      # Start a thread to poll telemetry
-      Thread.new do |thread|
-        @polling_thread.kill if @polling_thread
-        @polling_thread = Thread.current
-        begin
-          while connected?
-            cmd("#{@target_names[0]} GET_SETPT_VOLTAGE")
-            sleep 1
-          end
-        rescue Exception => err
-          Logger.error "Polling Thread Unexpectedly Died.\n#{err.formatted}"
-        end
-      end
-    end
-
-    def disconnect
-      super()
-      # Note: This must be after super or the disconnect process will be interrupted by killing
-      # the thread
-      @polling_thread.kill if @polling_thread
-      @polling_thread = nil
-    end
-  end
-
-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'
+
+module Cosmos
+
+  class TemplatedInterface < TcpipClientInterface
+    def initialize(*args)
+      super(*args)
+      @polling_thread = nil
+      @sleeper = Sleeper.new
+    end
+
+    def connect
+      super()
+
+      # Start a thread to poll telemetry
+      Thread.new do |thread|
+        Cosmos.kill_thread(self, @polling_thread)
+        @sleeper = Sleeper.new
+        @polling_thread = Thread.current
+        begin
+          while connected?
+            cmd("#{@target_names[0]} GET_SETPT_VOLTAGE")
+            break if @sleeper.sleep(1)
+          end
+        rescue Exception => err
+          Logger.error "Polling Thread Unexpectedly Died.\n#{err.formatted}"
+        end
+      end
+    end
+
+    def disconnect
+      super()
+      # Note: This must be after super or the disconnect process will be interrupted by killing
+      # the thread
+      Cosmos.kill_thread(self, @polling_thread)
+      @polling_thread = nil
+    end
+
+    def graceful_kill
+      @sleeper.cancel
+    end
+  end
+
+end # module Cosmos