cosmos 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3b5933b0b42e6b0a29439cad8a1c5caeb1331d0
-  data.tar.gz: f12282bd56e9d88999a8c1aec6ef0fb652f63a49
+  metadata.gz: 03a5fb5559e97c328a048705f0e90a85f3655899
+  data.tar.gz: e3c8be6334821135b794171b088571c6dbb75062
 SHA512:
-  metadata.gz: 45e4e2ab72b0069f1616b8af96342dacf2731778047f8f4ebea2cab592dbbc60283d2f023fc7f471dec61ab66d3dcaa22c40cf7fd20d1810d2e40bb53efe213e
-  data.tar.gz: 54ff36f53c2187b1dc92253194d91c27a47c224c5346dfe565baed10ac461a6d9ec23db2323db18c7af82fe4dd846bb53a54a8b6288ce09423be98f6034dfdd9
+  metadata.gz: ce712ead10d1c094ca7e811705036e66e3c9b279059f91bae5b7c5e90ae4dfc15d95be6802a467dea693b1ff957b36182f89e742b0f22e7ad723ad83f26642ea
+  data.tar.gz: e8ce4d0a58e565a328c7d42cf821f86fdb26cc5a397ca7e3bb449c94e0f02b2aab6a93288e1342dc97d205a886f623453895ef3a6f05a024470f895efe38386b

data/Gemfile

@@ -3,4 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'ruby-termios', '~> 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i
+group :development do
+  gem 'wdm', '>= 0.1.0', :platforms => [:mswin, :mingw]
+end
 gemspec

data/Manifest.txt

@@ -794,6 +794,7 @@ lib/cosmos/io/tcpip_server.rb
 lib/cosmos/io/udp_sockets.rb
 lib/cosmos/io/win32_serial_driver.rb
 lib/cosmos/packet_logs.rb
+lib/cosmos/packet_logs/ccsds_log_reader.rb
 lib/cosmos/packet_logs/meta_packet_log_writer.rb
 lib/cosmos/packet_logs/packet_log_reader.rb
 lib/cosmos/packet_logs/packet_log_writer.rb
@@ -806,6 +807,14 @@ lib/cosmos/packets/packet.rb
 lib/cosmos/packets/packet_config.rb
 lib/cosmos/packets/packet_item.rb
 lib/cosmos/packets/packet_item_limits.rb
+lib/cosmos/packets/parsers/format_string_parser.rb
+lib/cosmos/packets/parsers/limits_parser.rb
+lib/cosmos/packets/parsers/limits_response_parser.rb
+lib/cosmos/packets/parsers/macro_parser.rb
+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/structure.rb
 lib/cosmos/packets/structure_item.rb
 lib/cosmos/packets/telemetry.rb
@@ -1039,7 +1048,6 @@ spec/install/config/targets/INST/target.txt
 spec/install/config/targets/META/cmd_tlm/meta_cmd.txt
 spec/install/config/targets/META/cmd_tlm/meta_tlm.txt
 spec/install/config/targets/SYSTEM/cmd_tlm/limits_groups.txt
-spec/install/config/tools/cmd_tlm_server/cmd_tlm_server.txt
 spec/install/lib/README.txt
 spec/install/userpath.txt
 spec/interfaces/cmd_tlm_server_interface_spec.rb
@@ -1076,6 +1084,14 @@ spec/packets/packet_config_spec.rb
 spec/packets/packet_item_limits_spec.rb
 spec/packets/packet_item_spec.rb
 spec/packets/packet_spec.rb
+spec/packets/parsers/format_string_parser_spec.rb
+spec/packets/parsers/limits_parser_spec.rb
+spec/packets/parsers/limits_response_parser_spec.rb
+spec/packets/parsers/macro_parser_spec.rb
+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/structure_item_spec.rb
 spec/packets/structure_spec.rb
 spec/packets/telemetry_spec.rb

data/autohotkey/tools/test_runner2.ahk

@@ -33,6 +33,7 @@ Sleep 5000
 Click 760 195 ; Stop
 WinWaitActive Results
 Send {Enter}
+Sleep 2000
 
 ; Shut down the CTS
 WinActivate Command and Telemetry Server

data/autohotkey/tools/tlm_grapher.ahk

@@ -1,4 +1,4 @@
-SetWinDelay 500
+SetWinDelay 1000
 WinWaitActive Telemetry Grapher
 
 Send !f
@@ -522,6 +522,7 @@ Sleep 500
 Send !p
 Sleep 500
 Send {Down 4}{Enter} ; Edit plot data items
+Sleep 500
 WinWaitActive Edit
 Send {Esc}
 WinWaitActive Edit
@@ -600,26 +601,35 @@ WinWaitActive Telemetry Grapher
 
 ; Close down command and telemetry server
 WinActivate Command and Telemetry Server
+Sleep 1000
 Send ^q
 Sleep 500
 Send {Enter}
+Sleep 500
 
 ; Process a log file TG-4
 WinActivate Telemetry Grapher
+Sleep 500
 Send ^o
 WinWaitActive Process
+Sleep 500
 Send {Enter}
 WinWaitActive Select
+Sleep 500
 Send bigtlm.bin{Enter}
 WinWaitActive Process
+Sleep 500
 Click 167 375
 Sleep 500
 Click 380 309 ; Cancel
 WinWaitActive Telemetry Grapher
+Sleep 500
 Send ^o
 WinWaitActive Process
+Sleep 500
 Send {Enter}
 WinWaitActive Select
+Sleep 500
 Send bigtlm.bin{Enter}
 Sleep 500
 Click 167 375
@@ -630,10 +640,12 @@ Send ^q
 Sleep 500
 Send {Enter}
 WinWaitActive Telemetry Grapher
+Sleep 500
 Send ^q
 Sleep 500
 Send y
 WinWaitActive Save
+Sleep 500
 Send {Enter}
 Sleep 500
 Send y

data/data/crc.txt

@@ -1,6 +1,6 @@
 "lib/cosmos/ccsds/ccsds_parser.rb" 0x89A5FB3A
 "lib/cosmos/ccsds/ccsds_packet.rb" 0xA30EE27E
-"lib/cosmos/system/target.rb" 0x27C776DE
+"lib/cosmos/system/target.rb" 0x52287176
 "lib/cosmos/system/system.rb" 0x46C9FAA0
 "lib/cosmos/win32/win32_main.rb" 0x75FB669C
 "lib/cosmos/win32/win32.rb" 0xEF748B06
@@ -18,12 +18,13 @@
 "lib/cosmos/conversions/polynomial_conversion.rb" 0xF6440F21
 "lib/cosmos/conversions/received_count_conversion.rb" 0xD61BEB37
 "lib/cosmos/utilities.rb" 0xBE9CEAF4
-"lib/cosmos/top_level.rb" 0xDC00359C
+"lib/cosmos/top_level.rb" 0x4306956B
 "lib/cosmos/packet_logs/meta_packet_log_writer.rb" 0x860D1FD8
 "lib/cosmos/packet_logs/packet_log_writer.rb" 0x7C6FCFEC
 "lib/cosmos/packet_logs/packet_log_writer_pair.rb" 0xB4DCA156
+"lib/cosmos/packet_logs/ccsds_log_reader.rb" 0x20BEB38D
 "lib/cosmos/packet_logs/packet_log_reader.rb" 0xA347D992
-"lib/cosmos/utilities/message_log.rb" 0x005DD08A
+"lib/cosmos/utilities/message_log.rb" 0xB34783DF
 "lib/cosmos/utilities/crc.rb" 0xCDAFB844
 "lib/cosmos/utilities/ruby_lex_utils.rb" 0x5FC7DF77
 "lib/cosmos/utilities/logger.rb" 0xD39FB903
@@ -38,7 +39,7 @@
 "lib/cosmos/gui/dialogs/exception_dialog.rb" 0xC06443BE
 "lib/cosmos/gui/dialogs/tlm_edit_dialog.rb" 0xCD877DDA
 "lib/cosmos/gui/dialogs/splash.rb" 0x82A89062
-"lib/cosmos/gui/dialogs/about_dialog.rb" 0xFB48DB40
+"lib/cosmos/gui/dialogs/about_dialog.rb" 0x2222837B
 "lib/cosmos/gui/dialogs/cmd_details_dialog.rb" 0x58C4A059
 "lib/cosmos/gui/dialogs/scroll_text_dialog.rb" 0x7C21F1DA
 "lib/cosmos/gui/dialogs/details_dialog.rb" 0x6E5FC2DE
@@ -49,10 +50,10 @@
 "lib/cosmos/gui/dialogs/pry_dialog.rb" 0xA9E57481
 "lib/cosmos/gui/dialogs/select_dialog.rb" 0xDBD24F83
 "lib/cosmos/gui/dialogs/exception_list_dialog.rb" 0x304EE4DC
-"lib/cosmos/gui/dialogs/tlm_details_dialog.rb" 0xE0AB01AD
+"lib/cosmos/gui/dialogs/tlm_details_dialog.rb" 0xCAD1848F
 "lib/cosmos/gui/dialogs/calendar_dialog.rb" 0x688D3D3B
 "lib/cosmos/gui/qt_tool.rb" 0x840EF801
-"lib/cosmos/gui/utilities/script_module_gui.rb" 0x4923717B
+"lib/cosmos/gui/utilities/script_module_gui.rb" 0xBD605F5C
 "lib/cosmos/gui/utilities/screenshot.rb" 0x65F75371
 "lib/cosmos/gui/widgets/full_text_search_line_edit.rb" 0x7AAF694C
 "lib/cosmos/gui/widgets/realtime_button_bar.rb" 0xEB0CE858
@@ -60,7 +61,7 @@
 "lib/cosmos/gui/line_graph/line_graph.rb" 0x6761DE9A
 "lib/cosmos/gui/line_graph/line_graph_popups.rb" 0x6B6BD351
 "lib/cosmos/gui/line_graph/line_graph_drawing.rb" 0x42C08FB0
-"lib/cosmos/gui/line_graph/overview_graph.rb" 0x28C4E215
+"lib/cosmos/gui/line_graph/overview_graph.rb" 0xEDD6D64A
 "lib/cosmos/gui/line_graph/line_graph_dialog.rb" 0xF73F68CB
 "lib/cosmos/gui/line_graph/lines.rb" 0x871CA030
 "lib/cosmos/gui/line_graph/line_graph_script.rb" 0x9FD973A1
@@ -106,7 +107,7 @@
 "lib/cosmos/tools/tlm_extractor/tlm_extractor.rb" 0xC6B38C94
 "lib/cosmos/tools/tlm_extractor/tlm_extractor_config.rb" 0x7779DCEC
 "lib/cosmos/tools/tlm_extractor/text_item_chooser.rb" 0x587768C6
-"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb" 0xA54471CD
+"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb" 0x167BC6BD
 "lib/cosmos/tools/cmd_tlm_server/api.rb" 0xB1819524
 "lib/cosmos/tools/cmd_tlm_server/connections.rb" 0x6657A0FB
 "lib/cosmos/tools/cmd_tlm_server/background_task.rb" 0x448A2191
@@ -122,9 +123,9 @@
 "lib/cosmos/tools/cmd_tlm_server/packet_logging.rb" 0x166BE402
 "lib/cosmos/tools/cmd_tlm_server/commanding.rb" 0xC7C76CD8
 "lib/cosmos/tools/cmd_tlm_server/interfaces.rb" 0x10BC320E
-"lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x0668F33F
+"lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x38ED08CB
 "lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0x138FCD7A
-"lib/cosmos/tools/limits_monitor/limits_monitor.rb" 0xAA19533E
+"lib/cosmos/tools/limits_monitor/limits_monitor.rb" 0xF155D8CC
 "lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0x12D1B643
 "lib/cosmos/tools/table_manager/table_manager.rb" 0x4FC4AE95
 "lib/cosmos/tools/table_manager/table.rb" 0x923A8589
@@ -153,7 +154,7 @@
 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_tool.rb" 0x4F1158B4
 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_data_object_editor.rb" 0xF016E145
 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_plot_editor.rb" 0xE9362CE6
-"lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_realtime_thread.rb" 0x0F6B7C35
+"lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_realtime_thread.rb" 0x91299B66
 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_tab.rb" 0xD0AC7888
 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_config.rb" 0x08E6FA35
 "lib/cosmos/tools/tlm_grapher/tlm_grapher.rb" 0xBBFC2272
@@ -230,10 +231,10 @@
 "lib/cosmos/tools/tlm_viewer/widgets/canvaslinevalue_widget.rb" 0x69740A8B
 "lib/cosmos/tools/tlm_viewer/widgets/button_widget.rb" 0x189ED964
 "lib/cosmos/tools/tlm_viewer/widgets/block_widget.rb" 0x03D30FA7
-"lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0xB7B0D77D
+"lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x03D59CCB
 "lib/cosmos/system.rb" 0x735DFB42
 "lib/cosmos/conversions.rb" 0x43679D05
-"lib/cosmos/version.rb" 0x9DA328D2
+"lib/cosmos/version.rb" 0x3FF1E990
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/interfaces.rb" 0x7E3EA326
 "lib/cosmos/processors.rb" 0x5241327D
@@ -241,25 +242,33 @@
 "lib/cosmos/streams/length_stream_protocol.rb" 0x400CD6F2
 "lib/cosmos/streams/template_stream_protocol.rb" 0x6E466274
 "lib/cosmos/streams/terminated_stream_protocol.rb" 0x5DBDE591
-"lib/cosmos/streams/stream.rb" 0xFAF4D913
-"lib/cosmos/streams/serial_stream.rb" 0x7B6F3D50
-"lib/cosmos/streams/stream_protocol.rb" 0xC7ED90F1
+"lib/cosmos/streams/stream.rb" 0xFD0A41B9
+"lib/cosmos/streams/serial_stream.rb" 0x9F0BBA1D
+"lib/cosmos/streams/stream_protocol.rb" 0x5EA23890
 "lib/cosmos/streams/fixed_stream_protocol.rb" 0x5F6F224B
-"lib/cosmos/streams/tcpip_client_stream.rb" 0x8C3E5015
-"lib/cosmos/streams/tcpip_socket_stream.rb" 0x8F66A853
+"lib/cosmos/streams/tcpip_client_stream.rb" 0x974ED23F
+"lib/cosmos/streams/tcpip_socket_stream.rb" 0xD635732F
 "lib/cosmos/streams/preidentified_stream_protocol.rb" 0xC258238E
 "lib/cosmos/script.rb" 0x25BB611B
 "lib/cosmos/config/config_parser.rb" 0x89526FF1
-"lib/cosmos/packet_logs.rb" 0xA3D909A0
+"lib/cosmos/packet_logs.rb" 0xA2EDBB00
 "lib/cosmos/packets/limits.rb" 0x66FCFD29
 "lib/cosmos/packets/limits_response.rb" 0x9C5E8444
 "lib/cosmos/packets/commands.rb" 0x0025C398
-"lib/cosmos/packets/structure.rb" 0x250CDDCA
+"lib/cosmos/packets/structure.rb" 0x39FE3731
 "lib/cosmos/packets/telemetry.rb" 0xF43901DF
-"lib/cosmos/packets/packet_config.rb" 0xE366C215
+"lib/cosmos/packets/parsers/format_string_parser.rb" 0x8015C5E3
+"lib/cosmos/packets/parsers/packet_parser.rb" 0xEA0AF2C6
+"lib/cosmos/packets/parsers/packet_item_parser.rb" 0x8DB06663
+"lib/cosmos/packets/parsers/processor_parser.rb" 0xEC75BA88
+"lib/cosmos/packets/parsers/limits_parser.rb" 0xB9747994
+"lib/cosmos/packets/parsers/state_parser.rb" 0xDD331AA5
+"lib/cosmos/packets/parsers/macro_parser.rb" 0x767AD192
+"lib/cosmos/packets/parsers/limits_response_parser.rb" 0x05979119
+"lib/cosmos/packets/packet_config.rb" 0xFDD8F251
 "lib/cosmos/packets/binary_accessor.rb" 0xF913F2EA
-"lib/cosmos/packets/packet.rb" 0x87ACE672
-"lib/cosmos/packets/structure_item.rb" 0x0977C0F4
+"lib/cosmos/packets/packet.rb" 0xF6D1CB14
+"lib/cosmos/packets/structure_item.rb" 0xBDC81085
 "lib/cosmos/packets/packet_item_limits.rb" 0xE187C389
 "lib/cosmos/packets/packet_item.rb" 0x2A07D5B4
 "lib/cosmos/processors/statistics_processor.rb" 0x29D933FE
@@ -268,10 +277,10 @@
 "lib/cosmos/processors/watermark_processor.rb" 0xDADF4580
 "lib/cosmos/io/stdout.rb" 0xAC9CC4B1
 "lib/cosmos/io/buffered_file.rb" 0x70A3B880
-"lib/cosmos/io/json_drb_object.rb" 0x73BE35A0
+"lib/cosmos/io/json_drb_object.rb" 0xD48FA273
 "lib/cosmos/io/cosmos_snmp.rb" 0x64541158
 "lib/cosmos/io/json_rpc.rb" 0x8EAA13F8
-"lib/cosmos/io/tcpip_server.rb" 0xCE9421DA
+"lib/cosmos/io/tcpip_server.rb" 0xAB7A0F48
 "lib/cosmos/io/posix_serial_driver.rb" 0x6DD5B8B4
 "lib/cosmos/io/udp_sockets.rb" 0xB1B138CD
 "lib/cosmos/io/serial_driver.rb" 0x9A2515F4
@@ -283,14 +292,14 @@
 "lib/cosmos/io/win32_serial_driver.rb" 0xA7E055CA
 "lib/cosmos/interfaces/linc_interface.rb" 0x77B8F1B2
 "lib/cosmos/interfaces/cmd_tlm_server_interface.rb" 0x36E0796A
-"lib/cosmos/interfaces/interface.rb" 0xB050AA46
-"lib/cosmos/interfaces/stream_interface.rb" 0xFD55ACED
+"lib/cosmos/interfaces/interface.rb" 0x060825FA
+"lib/cosmos/interfaces/stream_interface.rb" 0xDC602D7B
 "lib/cosmos/interfaces/simulated_target_interface.rb" 0x15DC496F
 "lib/cosmos/interfaces/serial_interface.rb" 0xC376DDA0
 "lib/cosmos/interfaces/tcpip_client_interface.rb" 0x5F0DB50D
 "lib/cosmos/interfaces/udp_interface.rb" 0xA991C213
-"lib/cosmos/interfaces/tcpip_server_interface.rb" 0x7E90C892
-"lib/cosmos/script/script.rb" 0xDA302537
+"lib/cosmos/interfaces/tcpip_server_interface.rb" 0xC8F6E908
+"lib/cosmos/script/script.rb" 0x139256FE
 "lib/cosmos/script/extract.rb" 0xF3243476
 "lib/cosmos/core_ext/range.rb" 0x0D55D9D1
 "lib/cosmos/core_ext/stringio.rb" 0x28B64FB4
@@ -308,4 +317,4 @@
 "lib/cosmos/core_ext/string.rb" 0x2079C392
 "lib/cosmos/core_ext/hash.rb" 0x99038BE1
 "lib/cosmos/core_ext/matrix.rb" 0xC7ABFF88
-"lib/cosmos.rb" 0x2F8F8E00
+"lib/cosmos.rb" 0xE8930592

data/demo/config/data/crc.txt

@@ -51,7 +51,7 @@
 "config/targets/TEMPLATED/cmd_tlm/templated_cmds.txt" 0x36D65799
 "config/targets/TEMPLATED/cmd_tlm_server.txt" 0x727CDBEB
 "config/targets/TEMPLATED/target.txt" 0xDE6DDA2D
-"config/targets/TEMPLATED/lib/templated_interface.rb" 0xD8075CE2
+"config/targets/TEMPLATED/lib/templated_interface.rb" 0x924A3AFE
 "config/targets/COSMOS/cmd_tlm/cosmos_server_tlm.txt" 0xC667CCD6
 "config/targets/COSMOS/cmd_tlm/cosmos_server_cmds.txt" 0xE2F62B11
 "config/targets/COSMOS/cmd_tlm_server.txt" 0xE53A4164
@@ -66,8 +66,8 @@
 "config/tools/tlm_extractor/tlm_extractor2.txt" 0x210DED6A
 "config/tools/tlm_extractor/tlm_extractor.txt" 0x51B791DF
 "config/tools/tlm_extractor/tlm_extractor3.txt" 0x3A25E012
-"config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0xE5A0E6F0
-"config/tools/cmd_tlm_server/cmd_tlm_server2.txt" 0xE2D57EDF
+"config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0x5F467E20
+"config/tools/cmd_tlm_server/cmd_tlm_server2.txt" 0xF1C5C3B4
 "config/tools/limits_monitor/README.txt" 0x93B2C07E
 "config/tools/table_manager/PPSSelectionTable_def.txt" 0xE7A1E70B
 "config/tools/table_manager/ConfigTables_def.txt" 0xC38DCB2A

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

@@ -32,6 +32,8 @@ module Cosmos
             cmd("#{@target_names[0]} GET_SETPT_VOLTAGE")
             break if @sleeper.sleep(1)
           end
+        rescue Errno::ECONNRESET
+          # This typically means the target disconnected
         rescue Exception => err
           Logger.error "Polling Thread Unexpectedly Died.\n#{err.formatted}"
         end
@@ -42,7 +44,7 @@ module Cosmos
       super()
       # Note: This must be after super or the disconnect process will be interrupted by killing
       # the thread
-      Cosmos.kill_thread(self, @polling_thread)
+      Cosmos.kill_thread(self, @polling_thread) if Thread.current != @polling_thread
       @polling_thread = nil
     end
 

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

@@ -19,14 +19,20 @@ INTERFACE COSMOS_INT cmd_tlm_server_interface.rb
   TARGET COSMOS
   DISABLE_DISCONNECT
   LOG COSMOSLOG
+  # DONT_LOG
   # DONT_CONNECT
   # DONT_RECONNECT
   # RECONNECT_DELAY 15.0
   # LOG_RAW
 
 ROUTER INST_ROUTER tcpip_server_interface.rb 2055 2055 10.0 nil LENGTH 32 16 7
+  OPTION LISTEN_ADDRESS 127.0.0.1
   ROUTE INST_INT
-  # ROUTER_LOG_RAW
+  # DONT_CONNECT
+  # DONT_RECONNECT
+  # DISABLE_DISCONNECT
+  # RECONNECT_DELAY 15.0
+  # LOG_RAW
 
 BACKGROUND_TASK example_background_task.rb
 

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

@@ -17,6 +17,7 @@ INTERFACE COSMOS_INT cmd_tlm_server_interface.rb
   TARGET COSMOS
   DISABLE_DISCONNECT
   LOG COSMOSLOG
+  # DONT_LOG
   # DONT_CONNECT
   # DONT_RECONNECT
   # RECONNECT_DELAY 15.0
@@ -24,6 +25,10 @@ INTERFACE COSMOS_INT cmd_tlm_server_interface.rb
 
 ROUTER INST_ROUTER tcpip_server_interface.rb 3055 3055 10.0 nil LENGTH 32 16 7
   ROUTE INST_INT
-  # ROUTER_LOG_RAW
+  # DONT_CONNECT
+  # DONT_RECONNECT
+  # DISABLE_DISCONNECT
+  # RECONNECT_DELAY 15.0
+  # LOG_RAW
 
 BACKGROUND_TASK example_background_task.rb

data/lib/cosmos.rb

@@ -40,7 +40,7 @@ require 'cosmos/ext/platform'
 saved_verbose = $VERBOSE; $VERBOSE = nil
 begin
   require 'dl'
-rescue LoadError
+rescue Exception
 end
 $VERBOSE = saved_verbose
 
@@ -58,6 +58,6 @@ require 'cosmos/system'
 
 begin
   require 'user_version'
-rescue LoadError
+rescue Exception
   # Not defined
 end

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

@@ -67,10 +67,9 @@ module Cosmos
       configurable_about_text = File.read(filename)
       configurable_about_text.gsub!("\r", '') unless Kernel.is_windows?
       if Kernel.is_windows?
-        configurable_about_text += "\n" + ABOUT_COSMOS + "\n" + "Main Application x:#{parent.x} y:#{parent.y} width:#{parent.frameGeometry.width + 16} height:#{parent.frameGeometry.height + 38}"
+        configurable_about_text += "\n" + "Main Application x:#{parent.x} y:#{parent.y} width:#{parent.frameGeometry.width + 16} height:#{parent.frameGeometry.height + 38}\n\n" +  ABOUT_COSMOS
       else
-        configurable_about_text += "\n" + ABOUT_COSMOS + "\n" + "Main Application x:#{parent.x} y:#{parent.y} width:#{parent.frameGeometry.width} height:#{parent.frameGeometry.height}"
-      end
+        configurable_about_text += "\n" + "Main Application x:#{parent.x} y:#{parent.y} width:#{parent.frameGeometry.width} height:#{parent.frameGeometry.height}\n\n" +  ABOUT_COSMOS      end
 
       # Set the application about text
       about = Qt::Label.new(about_string + "\n\n" + configurable_about_text)
@@ -89,8 +88,22 @@ module Cosmos
       end
 
       self.layout = Qt::VBoxLayout.new do
-        addLayout(icon_layout)
-        addWidget(about)
+        scroll_area = Qt::ScrollArea.new
+        scroll_area.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff)
+        addWidget(scroll_area)
+        scroll_widget = Qt::Widget.new
+        scroll_area.setWidget(scroll_widget)
+        interior_layout = Qt::VBoxLayout.new
+        interior_layout.addLayout(icon_layout)
+        interior_layout.addWidget(about)
+        scroll_widget.setLayout(interior_layout)
+        if scroll_widget.minimumSizeHint.height < 800
+          scroll_area.setMinimumHeight(scroll_widget.minimumSizeHint.height + 80)
+          scroll_area.setMinimumWidth(scroll_widget.minimumSizeHint.width)
+        else
+          scroll_area.setMinimumWidth(scroll_widget.minimumSizeHint.width + 20)
+        end
+        scroll_widget.adjustSize
         addLayout(button_layout)
       end