cosmos 4.1.0-java → 4.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5c9882b4721899fb470146b4ccab1484cf3e153ffbc08ec34e8cb50498cfc45
-  data.tar.gz: fc60b44cee9781724396208cc9714835a760d20a5859da4ee4d1105a072a92ea
+  metadata.gz: c79012c319e10b15675502eb282056748a32f45af811f149ad9640337a7eddd3
+  data.tar.gz: 315874bfda726d8b7fcfa2c62d6cdaec489dadba5a4642fa33eb94f1198513c9
 SHA512:
-  metadata.gz: 4fc6e1f7cb34fa00ddfc25846587b1ed367e0c5d56442412cff09972766443757318086aac9f694bc4bc90eebbcb5679ceb91b4fc49b071d167b101c439a86d1
-  data.tar.gz: 4f45aefd7c9e9afe1e1b59537eded48e5a30abd309d2d4ddf4a669923c88c4aabe76bb53897da639059f680912eaa9c37074c5706198a096da03e913d5433716
+  metadata.gz: 6a28fab6dd29037af71a8b23823548bfb297b1e28e7db80459428cba9b99d15dcf9e29aaf6d4c5e43b252f115e0665e9838ec26af1797ed5bac968dabcaebea8
+  data.tar.gz: 4b84fcea7bba1d917d754e4c9963bafa878a8ab7bf9f0ec64bbd51538134b6fbd6e4b4f1915a422bb25fc1d07725ea0fbbe08138465b7a195d6d9ebc4a891f9d

data/Manifest.txt

@@ -992,6 +992,8 @@ lib/cosmos/packets/parsers/packet_item_parser.rb
 lib/cosmos/packets/parsers/packet_parser.rb
 lib/cosmos/packets/parsers/processor_parser.rb
 lib/cosmos/packets/parsers/state_parser.rb
+lib/cosmos/packets/parsers/xtce_converter.rb
+lib/cosmos/packets/parsers/xtce_parser.rb
 lib/cosmos/packets/structure.rb
 lib/cosmos/packets/structure_item.rb
 lib/cosmos/packets/telemetry.rb
@@ -1239,6 +1241,7 @@ spec/install/config/targets/INST/cmd_tlm/inst_tlm.txt
 spec/install/config/targets/INST/cmd_tlm/inst_tlm_linc.txt
 spec/install/config/targets/INST/cmd_tlm_server.txt
 spec/install/config/targets/INST/lib/sim_inst.rb
+spec/install/config/targets/INST/screens/hs.txt
 spec/install/config/targets/INST/target.txt
 spec/install/config/targets/SYSTEM/cmd_tlm/limits_groups.txt
 spec/install/config/targets/SYSTEM/cmd_tlm/meta_tlm.txt
@@ -1295,6 +1298,7 @@ spec/packets/parsers/packet_item_parser_spec.rb
 spec/packets/parsers/packet_parser_spec.rb
 spec/packets/parsers/processor_parser_spec.rb
 spec/packets/parsers/state_parser_spec.rb
+spec/packets/parsers/xtce_parser_spec.rb
 spec/packets/structure_item_spec.rb
 spec/packets/structure_spec.rb
 spec/packets/telemetry_spec.rb
@@ -1338,6 +1342,7 @@ spec/tools/table_manager/table_item_spec.rb
 spec/tools/table_manager/table_parser_spec.rb
 spec/tools/table_manager/table_spec.rb
 spec/tools/table_manager/tablemanager_core_spec.rb
+spec/tools/tlm_viewer/tlm_viewer_config_spec.rb
 spec/top_level/top_level_spec.rb
 spec/utilities/crc_spec.rb
 spec/utilities/csv_spec.rb

data/appveyor.yml

@@ -17,3 +17,5 @@ environment:
 branches:
   only:
     - master
+  except:
+    - website

data/autohotkey/tools/replay.ahk

@@ -4,100 +4,100 @@ WinWaitActive Replay
 Sleep 1000
 
 ; Click on all the buttons with no file loaded
-Click 75 155 ; Rewind
+Click 75 180 ; Rewind
 Sleep 500
-Click 188 155 ; Go back one packet
+Click 188 180 ; Go back one packet
 Sleep 500
-Click 300 166 ; Play backwards
+Click 300 180 ; Play backwards
 Sleep 500
-Click 408 155 ; Stop
+Click 408 180 ; Stop
 Sleep 500
-Click 515 155 ; Play
+Click 515 180 ; Play
 Sleep 500
-Click 625 155 ; Advance one packet
+Click 625 180 ; Advance one packet
 Sleep 500
-Click 737 155 ; Go to the end
+Click 737 180 ; Go to the end
 Sleep 500
 
-Click 750 95 ; Browse
-WinWaitActive Select
+Click 710 115 ; Browse
+WinWaitActive Select Log File
+Click 370 50 ; Browse
+WinWaitActive Select Log File:
 Send bigtlm.bin{Enter}
+Sleep 500
+WinWaitActive Select Log File
+Click 150 315 ; Ok
 WinWaitActive Warning
 Sleep 500
 Send {Enter} ;
-WinWaitActive Analyzing
-Send {Enter}
 WinWaitActive Replay
-Click 750 95 ; Browse
-WinWaitActive Select
+Sleep 2000
+Click 710 115 ; Browse
+WinWaitActive Select Log File
+Click 370 50 ; Browse
+WinWaitActive Select Log File:
 Send bigtlm.bin{Enter}
+Sleep 500
+WinWaitActive Select Log File
+Click 150 315 ; Ok
 WinWaitActive Warning
 Sleep 500
 Send {Enter} ;
-WinWaitActive Analyzing
 WinWaitActive Replay
-Sleep 1000
+Sleep 2000
 
-Click 515 155 ; Play RPY-1
+Click 515 180 ; Play RPY-1
 Sleep 5000
-Click 408 155 ; Stop
+Click 408 180 ; Stop
 Sleep 500
-Click 75 155 ; Rewind
+Click 75 180 ; Rewind
 Sleep 1000
-Click 515 155 ; Play RPY-2
+Click 515 180 ; Play RPY-2
 Sleep 3000
-Click 408 155 ; Stop
+Click 408 180 ; Stop
 Sleep 500
-Click 300 166 ; Play backwards RPY-2
+Click 300 180 ; Play backwards RPY-2
 Sleep 2000
-Click 408 155 ; Stop
+Click 408 180 ; Stop
 Sleep 1000
 Loop 4
 {
-  Click 625 155 ; Advance one packet RPY-6
+  Click 625 180 ; Advance one packet RPY-6
   Sleep 500
 }
 Loop 4
 {
-  Click 188 155 ; Go back one packet
+  Click 188 180 ; Go back one packet
   Sleep 500
 }
 Sleep 1000
-Click 737 155 ; Go to the end
+Click 737 180 ; Go to the end
 Sleep 500
-Click 625 155 ; Advance one packet RPY-5
+Click 625 180 ; Advance one packet RPY-5
 Sleep 500
-Click 75 155 ; Rewind
+Click 75 180 ; Rewind
 Sleep 500
-Click 188 155 ; Go back one packet RPY-5
+Click 188 180 ; Go back one packet RPY-5
 Sleep 1000
 
-Click 100 183 ; Delay dropdown RPY-4
+Click 100 207 ; Delay dropdown RPY-4
 Sleep 500
-Click 100 332
+Click 100 352
 Sleep 1000
-Click 515 155 ; Play
+Click 515 180 ; Play
 Sleep 5000
-Click 408 155 ; Stop
+Click 408 180 ; Stop
 Sleep 500
-Click 75 155 ; Rewind
+Click 75 180 ; Rewind
 Sleep 500
 
-MouseClickDrag, L, 32, 300, 800, 300, 60 ; Move the bar right RPY-7
+MouseClickDrag, L, 32, 322, 750, 322, 60 ; Move the bar right RPY-7
 Sleep 1000
-MouseClickDrag, L, 800, 300, 15, 300, 60 ; Move the bar left
-
-; Start CmdTlmServer RPY-3
-Run ruby.exe %A_ScriptDir%/CmdTlmServer
-Sleep 4000
-
-; Shut down the CTS
-WinActivate, Command and Telemetry Server
-Sleep 500
-Send {Enter}
+MouseClickDrag, L, 750, 322, 15, 322, 60 ; Move the bar left
 
 ; Quit Replay
 WinActivate, Replay
 Sleep 1000
 Send ^q
-Sleep 500
+Sleep 1000
+Send {Enter}

data/autohotkey/tools/script_runner.ahk

@@ -327,23 +327,17 @@ Sleep 500
 Send puts "blank"
 Sleep 500
 
-Click 470 790 ; Toggle Run/Step SR-22
+Click 320 90 ; Step SR-22
 Sleep 500
-
-Click 400 90 ; Start SR-4, SR-5
-Sleep 500
-Click 400 90 ; Go
+Click 320 90 ; Step
 Sleep 500
-Click 400 90 ; Go
+Click 320 90 ; Step
 Sleep 500
 Click 480 90 ; Pause SR-6
 Sleep 500
 Click 550 90 ; Stop SR-7
 Sleep 500
 
-Click 470 790 ; Toggle Run/Step
-Sleep 500
-
 Send ^t ; Toggle Disconnect SR-20
 WinWaitActive Server
 Send {Enter}

data/cosmos.gemspec

@@ -87,7 +87,7 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency 'snmp', '~> 1.0'
   s.add_runtime_dependency 'rubyzip', '~> 1.2.1'
   s.add_runtime_dependency 'nokogiri', '~> 1.6'
-  s.add_runtime_dependency 'opengl', '>= 0.7', '< 0.10' if RUBY_ENGINE == 'ruby' # MRI Only
+  s.add_runtime_dependency 'opengl', '~> 0.10' if RUBY_ENGINE == 'ruby' # MRI Only
   s.add_runtime_dependency 'qtbindings', '~> 4.8.6', '>= 4.8.6.2' if RUBY_ENGINE == 'ruby' # MRI Only
   s.add_runtime_dependency 'puma', '~> 3.10.0'
   s.add_runtime_dependency 'rack', '~> 2.0.3'

data/data/config/interface_modifiers.yaml

@@ -42,3 +42,26 @@ LOG_RAW:
   description: LOG_RAW does not add any COSMOS headers and thus can not be read by COSMOS tools.
     It is primarily useful for low level debugging of an interface. You will have to
     manually parse these logs yourself using a hex editor or other application.
+PROTOCOL:
+  summary: Protocols modify the interface by processing the data
+  description: Protocols can be either READ, WRITE, or READ_WRITE. READ protocols act on the data
+    received by the interface while write acts on the data before it is sent out. READ_WRITE applies
+    the protocol to both reading and writing.<br/><br/>
+    There is only one built in protocol implemented by override_protocol.rb.
+    This protocol allows for Scripts to use the override_tlm() and normalize_tlm() methods to permanently
+    change a telemetry value. Note, this differs from set_tlm() as set_tlm() is over-written by new
+    incoming telemetry.<br/><br/>
+    For information on creating your own custom protocol please see <a href="http://cosmosrb.com/docs/protocols">cosmosrb.com/docs/protocols</a>
+  since: 4.0.0
+  parameters:
+    - name: Type
+      required: true
+      description: Whether to apply the protocol on incoming data, outgoing data, or both
+      values: ['READ', 'WRITE', 'READ_WRITE']
+    - name: Protocol Filename or Classname
+      required: true
+      description: Ruby file name or class name which implements the protocol
+      values: .*
+    - name: Protocol specific parameters
+      required: false
+      description: Additional parameters used by the protocol

data/data/config/screen.yaml

@@ -127,7 +127,7 @@ SUBSETTING:
       values: .*
 NAMED_WIDGET:
   summary: Name a widget to allow access to it via the get_named_widget method
-  description: To programatically accesss parts of a telemetry screen you need
+  description: To programatically access parts of a telemetry screen you need
     to name the widget. This is useful when creating screens with buttons that
     read values from other widgets.
   warning: get_named_widget returns the widget itself and thus must be operated

data/data/crc.txt

@@ -18,7 +18,7 @@
 "lib/cosmos/processors/processor.rb" 0x1FEB7030
 "lib/cosmos/processors/statistics_processor.rb" 0xE732AE7F
 "lib/cosmos/processors/watermark_processor.rb" 0x8829E260
-"lib/cosmos/version.rb" 0x41926471
+"lib/cosmos/version.rb" 0xB56C2898
 "lib/cosmos/conversions/new_packet_log_conversion.rb" 0x4AA03555
 "lib/cosmos/conversions/segmented_polynomial_conversion.rb" 0xC498CE81
 "lib/cosmos/conversions/processor_conversion.rb" 0xC72B73BD
@@ -48,7 +48,7 @@
 "lib/cosmos/gui/dialogs/select_dialog.rb" 0x5DA0A692
 "lib/cosmos/gui/dialogs/legal_dialog.rb" 0x74F13554
 "lib/cosmos/gui/dialogs/about_dialog.rb" 0xDED08AF9
-"lib/cosmos/gui/dialogs/exception_dialog.rb" 0xA782F7D5
+"lib/cosmos/gui/dialogs/exception_dialog.rb" 0x2FD04B65
 "lib/cosmos/gui/dialogs/details_dialog.rb" 0x6CE432E1
 "lib/cosmos/gui/dialogs/calendar_dialog.rb" 0xB91051CB
 "lib/cosmos/gui/dialogs/cmd_tlm_raw_dialog.rb" 0xD9C26802
@@ -91,6 +91,7 @@
 "lib/cosmos/gui/choosers/string_chooser.rb" 0x1326AF82
 "lib/cosmos/gui/choosers/value_chooser.rb" 0x2374B886
 "lib/cosmos/gui/choosers/telemetry_chooser.rb" 0xF8DC6A15
+"lib/cosmos/packets/parsers/xtce_parser.rb" 0x939FA9BE
 "lib/cosmos/packets/parsers/format_string_parser.rb" 0x38813037
 "lib/cosmos/packets/parsers/limits_parser.rb" 0xD680A7A1
 "lib/cosmos/packets/parsers/packet_item_parser.rb" 0x10F83156
@@ -99,14 +100,15 @@
 "lib/cosmos/packets/parsers/state_parser.rb" 0xF8F43468
 "lib/cosmos/packets/parsers/processor_parser.rb" 0xEC75BA88
 "lib/cosmos/packets/parsers/packet_parser.rb" 0x26478943
+"lib/cosmos/packets/parsers/xtce_converter.rb" 0x6B530ACF
 "lib/cosmos/packets/telemetry.rb" 0xD779DE95
 "lib/cosmos/packets/binary_accessor.rb" 0xCD678EF6
 "lib/cosmos/packets/packet.rb" 0xCB2557A5
 "lib/cosmos/packets/structure.rb" 0x1BADD8D4
 "lib/cosmos/packets/commands.rb" 0xD310F0E6
 "lib/cosmos/packets/limits_response.rb" 0xB836D388
-"lib/cosmos/packets/packet_config.rb" 0x48956BD6
-"lib/cosmos/packets/packet_item.rb" 0xE6734330
+"lib/cosmos/packets/packet_config.rb" 0x30D58A5E
+"lib/cosmos/packets/packet_item.rb" 0xFA47EA74
 "lib/cosmos/packets/limits.rb" 0x93BE03A8
 "lib/cosmos/packets/packet_item_limits.rb" 0xC4534EAB
 "lib/cosmos/packets/structure_item.rb" 0x99EF4057
@@ -121,15 +123,15 @@
 "lib/cosmos/interfaces/cmd_tlm_server_interface.rb" 0x8921CFC1
 "lib/cosmos/interfaces/serial_interface.rb" 0x5042BC9B
 "lib/cosmos/interfaces/stream_interface.rb" 0x621E6153
-"lib/cosmos/interfaces/protocols/template_protocol.rb" 0x247944DC
-"lib/cosmos/interfaces/protocols/length_protocol.rb" 0xD4314327
-"lib/cosmos/interfaces/protocols/preidentified_protocol.rb" 0xECCB350A
-"lib/cosmos/interfaces/protocols/protocol.rb" 0xA3AE3AB8
-"lib/cosmos/interfaces/protocols/terminated_protocol.rb" 0x975AA36F
-"lib/cosmos/interfaces/protocols/crc_protocol.rb" 0x020BD76E
-"lib/cosmos/interfaces/protocols/burst_protocol.rb" 0x2AA39BD2
-"lib/cosmos/interfaces/protocols/override_protocol.rb" 0xEA200EEC
-"lib/cosmos/interfaces/protocols/fixed_protocol.rb" 0x39C64956
+"lib/cosmos/interfaces/protocols/template_protocol.rb" 0x10AE1DEC
+"lib/cosmos/interfaces/protocols/length_protocol.rb" 0x95412E32
+"lib/cosmos/interfaces/protocols/preidentified_protocol.rb" 0xA87E48F9
+"lib/cosmos/interfaces/protocols/protocol.rb" 0x13F588BE
+"lib/cosmos/interfaces/protocols/terminated_protocol.rb" 0xE6AAACCA
+"lib/cosmos/interfaces/protocols/crc_protocol.rb" 0x1E3E5AFB
+"lib/cosmos/interfaces/protocols/burst_protocol.rb" 0xCF4EE7A5
+"lib/cosmos/interfaces/protocols/override_protocol.rb" 0x64479CFF
+"lib/cosmos/interfaces/protocols/fixed_protocol.rb" 0x587F0176
 "lib/cosmos/interfaces/simulated_target_interface.rb" 0xA09DBFF7
 "lib/cosmos/interfaces/interface.rb" 0x0A161A72
 "lib/cosmos/interfaces/linc_interface.rb" 0xA85A43C1
@@ -175,7 +177,7 @@
 "lib/cosmos/core_ext/range.rb" 0x5D3E08D1
 "lib/cosmos/core_ext/file.rb" 0x988C5632
 "lib/cosmos/core_ext/kernel.rb" 0xFF4DF6CF
-"lib/cosmos/tools/config_editor/config_editor.rb" 0xCAF19C07
+"lib/cosmos/tools/config_editor/config_editor.rb" 0x4A68E1AB
 "lib/cosmos/tools/config_editor/config_editor_frame.rb" 0x68487058
 "lib/cosmos/tools/launcher/launcher.rb" 0xD924A01D
 "lib/cosmos/tools/launcher/launcher_multitool.rb" 0x1020A3D0
@@ -192,8 +194,8 @@
 "lib/cosmos/tools/cmd_sequence/cmd_sequence.rb" 0x86E87D8C
 "lib/cosmos/tools/cmd_sequence/sequence_list.rb" 0x4AD01295
 "lib/cosmos/tools/cmd_sequence/sequence_item.rb" 0x4385B8CD
-"lib/cosmos/tools/tlm_viewer/tlm_viewer_config.rb" 0x6B9ACA77
-"lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x2587EBBE
+"lib/cosmos/tools/tlm_viewer/tlm_viewer_config.rb" 0xBF274A70
+"lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x815F6A88
 "lib/cosmos/tools/tlm_viewer/widgets/labeltrendlimitsbar_widget.rb" 0xD8A2AADE
 "lib/cosmos/tools/tlm_viewer/widgets/matrixbycolumns_widget.rb" 0xC65C7F90
 "lib/cosmos/tools/tlm_viewer/widgets/labelvaluerangecolumn_widget.rb" 0x5935BAC8
@@ -258,7 +260,7 @@
 "lib/cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb" 0x3B2B3BAD
 "lib/cosmos/tools/tlm_viewer/widgets/canvaslabelvalue_widget.rb" 0x14270A26
 "lib/cosmos/tools/tlm_viewer/widgets.rb" 0x31655A9F
-"lib/cosmos/tools/tlm_viewer/screen.rb" 0x0848D007
+"lib/cosmos/tools/tlm_viewer/screen.rb" 0xBBA2E00E
 "lib/cosmos/tools/data_viewer/data_viewer.rb" 0x4870B3D2
 "lib/cosmos/tools/data_viewer/dump_component.rb" 0x6942C5D6
 "lib/cosmos/tools/data_viewer/data_viewer_component.rb" 0xD25BA6EB
@@ -340,7 +342,7 @@
 "lib/cosmos/tools/script_runner/script_runner_config.rb" 0xD5A30025
 "lib/cosmos/conversions.rb" 0x43679D05
 "lib/cosmos/script.rb" 0x25BB611B
-"lib/cosmos/config/config_parser.rb" 0x55018FEE
+"lib/cosmos/config/config_parser.rb" 0x3CCA586C
 "lib/cosmos/config/meta_config_parser.rb" 0xE4521B6B
 "lib/cosmos/utilities/csv.rb" 0x754FDC86
 "lib/cosmos/utilities/ruby_lex_utils.rb" 0x340218C1

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

@@ -3,4 +3,4 @@
 
 INTERFACE INST_INT simulated_target_interface.rb sim_inst.rb
   TARGET INST
-  PROTOCOL READ_WRITE OverrideProtocol
+  PROTOCOL READ OverrideProtocol

data/lib/cosmos/config/config_parser.rb

@@ -146,7 +146,7 @@ module Cosmos
 
     # Called by the ERB template to render a partial
     def render(template_name, options = {})
-      raise Error.new(self, "Partial name '#{template_name}' must begin with an underscore.") if template_name[0] != '_'
+      raise Error.new(self, "Partial name '#{template_name}' must begin with an underscore.") if File.basename(template_name)[0] != '_'
       b = binding
       if options[:locals]
         if RUBY_VERSION.split('.')[0..1].join.to_i >= 21
@@ -162,7 +162,12 @@ module Cosmos
         end
       end
       # Assume the file is there. If not we raise a pretty obvious error
-      ERB.new(File.read(File.join(File.dirname(@filename), template_name))).result(b)
+      if File.expand_path(template_name) == template_name # absolute path
+        path = template_name
+      else # relative to the current @filename
+        path = File.join(File.dirname(@filename), template_name)
+      end
+      ERB.new(File.read(path)).result(b)
     end
 
     # Processes a file and yields |config| to the given block
@@ -179,7 +184,7 @@ module Cosmos
                    yield_non_keyword_lines = false,
                    remove_quotes = true,
                    &block)
-      raise "Configuration file #{filename} does not exist." unless filename && File.exist?(filename)
+      raise Error.new(self, "Configuration file #{filename} does not exist.") unless filename && File.exist?(filename)
       @filename = filename
 
       # Create a temp file where we write the ERB parsed output

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

@@ -50,11 +50,26 @@ module Cosmos
           # by the ConfigParser
           when ConfigParser::Error
             # Substitute the html tags '<' and '>' and then replace newlines with html breaks
-            usage = exception.usage.gsub("<", "&#060;").gsub(">", "&#062;").gsub("\n", "<br/>")
-            message = exception.message.gsub("<", "&#060;").gsub(">", "&#062;").gsub("\n", "<br/>")
-            line = exception.keyword + ' ' + exception.parameters.join(' ').gsub("<", "&#060;").gsub(">", "&#062;").gsub("\n", "<br/>")
-            text = "Error at #{exception.filename}:#{exception.line_number}<br/><br/>#{line}<br/><br/>Usage: #{usage}<br/><br/>#{message}"
-            unless exception.url.nil?
+            if exception.usage && !exception.usage.empty?
+              usage = "Usage: #{exception.usage.gsub("<", "&#060;").gsub(">", "&#062;").gsub("\n", "<br/>")}<br/><br/>"
+            else
+              usage = ''
+            end
+            if exception.message && !exception.message.empty?
+              message = exception.message.gsub("<", "&#060;").gsub(">", "&#062;").gsub("\n", "<br/>")
+            else
+              message = ''
+            end
+            if exception.keyword && exception.parameters
+              line = exception.keyword + ' ' + exception.parameters.join(' ').gsub("<", "&#060;").gsub(">", "&#062;").gsub("\n", "<br/>") + "<br/><br/>"
+            else
+              line = ''
+            end
+            text = "#{line}#{usage}#{message}"
+            if exception.filename && exception.line_number
+              text = "Error at #{exception.filename}:#{exception.line_number}<br/><br/>#{text}"
+            end
+            if exception.url && !exception.url.empty?
               text << "<br/><br/>For more information see <a href='#{exception.url}'>#{exception.url}</a>."
             end
           # FatalErrors are errors explicitly raised when a known fatal issue