diff --git a/Manifest.txt b/Manifest.txt index abd9c52f9..5629d037f 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -354,6 +354,7 @@ demo/config/targets/TEMPLATED/target.txt demo/config/tools/cmd_tlm_server/cmd_tlm_server.txt demo/config/tools/cmd_tlm_server/cmd_tlm_server2.txt demo/config/tools/data_viewer/data_viewer.txt +demo/config/tools/example_application.css demo/config/tools/handbook_creator/default_toc.xsl demo/config/tools/handbook_creator/handbook_creator.txt demo/config/tools/handbook_creator/templates/command_packets.html.erb @@ -369,7 +370,9 @@ demo/config/tools/handbook_creator/templates/pdf_header.html.erb demo/config/tools/handbook_creator/templates/telemetry_packets.html.erb demo/config/tools/handbook_creator/templates/telemetry_toc.html.erb demo/config/tools/handbook_creator/templates/title.html.erb +demo/config/tools/launcher/launcher.css demo/config/tools/launcher/launcher.txt +demo/config/tools/launcher/launcher2.css demo/config/tools/launcher/launcher2.txt demo/config/tools/limits_monitor/README.txt demo/config/tools/opengl_builder/README.txt @@ -380,6 +383,7 @@ demo/config/tools/table_manager/MCConfigurationTable_fsw1_def.txt demo/config/tools/table_manager/MCConfigurationTable_fsw2_def.txt demo/config/tools/table_manager/PPSSelectionTable_def.txt demo/config/tools/table_manager/TLMMonitoringTable_def.txt +demo/config/tools/test_runner/test_runner.css demo/config/tools/test_runner/test_runner.txt demo/config/tools/tlm_extractor/_adcs_time.txt demo/config/tools/tlm_extractor/tlm_extractor.txt @@ -828,6 +832,7 @@ lib/cosmos/gui/text/completion.rb lib/cosmos/gui/text/completion_line_edit.rb lib/cosmos/gui/text/completion_text_edit.rb lib/cosmos/gui/text/ruby_editor.rb +lib/cosmos/gui/utilities/analyze_log.rb lib/cosmos/gui/utilities/screenshot.rb lib/cosmos/gui/utilities/script_module_gui.rb lib/cosmos/gui/widgets/full_text_search_line_edit.rb @@ -1185,6 +1190,7 @@ spec/processors/watermark_processor_spec.rb spec/script/cmd_tlm_server_spec.rb spec/script/commands_disconnect_spec.rb spec/script/commands_spec.rb +spec/script/extract_spec.rb spec/script/limits_spec.rb spec/script/script_spec.rb spec/script/scripting_spec.rb @@ -1218,6 +1224,7 @@ spec/tools/cmd_tlm_server/router_thread_spec.rb spec/tools/cmd_tlm_server/routers_spec.rb spec/tools/launcher/launcher_config_spec.rb spec/tools/table_manager/table_config_spec.rb +spec/tools/table_manager/table_item_parser_spec.rb spec/tools/table_manager/table_item_spec.rb spec/tools/table_manager/table_parser_spec.rb spec/tools/table_manager/table_spec.rb diff --git a/data/crc.txt b/data/crc.txt index 60fd1054a..d3481960b 100644 --- a/data/crc.txt +++ b/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" 0xE1032860 +"lib/cosmos/version.rb" 0x26575DA9 "lib/cosmos/conversions/new_packet_log_conversion.rb" 0x4AA03555 "lib/cosmos/conversions/segmented_polynomial_conversion.rb" 0xC498CE81 "lib/cosmos/conversions/processor_conversion.rb" 0xC72B73BD @@ -56,12 +56,12 @@ "lib/cosmos/gui/dialogs/find_replace_dialog.rb" 0xE5BA1A34 "lib/cosmos/gui/dialogs/progress_dialog.rb" 0x0E0358D9 "lib/cosmos/gui/dialogs/tlm_details_dialog.rb" 0xFD3D4089 -"lib/cosmos/gui/dialogs/scroll_text_dialog.rb" 0x416683D3 +"lib/cosmos/gui/dialogs/scroll_text_dialog.rb" 0x65A1806D "lib/cosmos/gui/dialogs/cmd_details_dialog.rb" 0xCC67DC8A "lib/cosmos/gui/dialogs/tlm_edit_dialog.rb" 0x4610C6FD "lib/cosmos/gui/dialogs/exception_list_dialog.rb" 0xC3CB4034 "lib/cosmos/gui/text/completion_line_edit.rb" 0x16E0A174 -"lib/cosmos/gui/text/ruby_editor.rb" 0xBEDB4735 +"lib/cosmos/gui/text/ruby_editor.rb" 0xA5114083 "lib/cosmos/gui/text/completion_text_edit.rb" 0xCF57B24D "lib/cosmos/gui/text/completion.rb" 0x38329713 "lib/cosmos/gui/opengl/moon_model.rb" 0xC84B01EC @@ -77,8 +77,9 @@ "lib/cosmos/gui/opengl/gl_viewport.rb" 0x49CAD811 "lib/cosmos/gui/opengl/gl_material.rb" 0xA2356712 "lib/cosmos/gui/opengl/gl_shape.rb" 0x91186908 -"lib/cosmos/gui/qt_tool.rb" 0xF8447170 +"lib/cosmos/gui/qt_tool.rb" 0x72292154 "lib/cosmos/gui/qt.rb" 0x28A1B8BE +"lib/cosmos/gui/utilities/analyze_log.rb" 0x293FA18B "lib/cosmos/gui/utilities/screenshot.rb" 0x3E15E6FF "lib/cosmos/gui/utilities/script_module_gui.rb" 0xEEFA7D92 "lib/cosmos/gui/choosers/file_chooser.rb" 0x575A4333 @@ -105,8 +106,8 @@ "lib/cosmos/packets/packet_config.rb" 0xCC77F76F "lib/cosmos/packets/packet_item.rb" 0x6C30F01E "lib/cosmos/packets/limits.rb" 0x93BE03A8 -"lib/cosmos/packets/packet_item_limits.rb" 0xE187C389 -"lib/cosmos/packets/structure_item.rb" 0xBDC81085 +"lib/cosmos/packets/packet_item_limits.rb" 0xC4534EAB +"lib/cosmos/packets/structure_item.rb" 0x12BF9916 "lib/cosmos/core_ext.rb" 0x1951B346 "lib/cosmos/streams/stream_protocol.rb" 0xEC382CA0 "lib/cosmos/streams/tcpip_client_stream.rb" 0xA644ADBA @@ -126,7 +127,7 @@ "lib/cosmos/interfaces/serial_interface.rb" 0xC376DDA0 "lib/cosmos/interfaces/stream_interface.rb" 0xDC602D7B "lib/cosmos/interfaces/simulated_target_interface.rb" 0x15DC496F -"lib/cosmos/interfaces/interface.rb" 0x060825FA +"lib/cosmos/interfaces/interface.rb" 0x15466B1B "lib/cosmos/interfaces/linc_interface.rb" 0xEFBDE194 "lib/cosmos/interfaces/tcpip_server_interface.rb" 0xC8F6E908 "lib/cosmos/interfaces/tcpip_client_interface.rb" 0x5F0DB50D @@ -135,16 +136,16 @@ "lib/cosmos/packet_logs/packet_log_reader.rb" 0x6DA9EED7 "lib/cosmos/packet_logs/packet_log_writer.rb" 0x75E82380 "lib/cosmos/packet_logs/ccsds_log_reader.rb" 0x0B80AEA6 -"lib/cosmos/system/system.rb" 0xD6A6ADE9 +"lib/cosmos/system/system.rb" 0x9C0C244B "lib/cosmos/system/target.rb" 0x423D4370 "lib/cosmos/script/scripting.rb" 0x04B4FFF9 "lib/cosmos/script/telemetry.rb" 0x12573CAD "lib/cosmos/script/commands.rb" 0x5AE615BF -"lib/cosmos/script/extract.rb" 0xE6A1B6A1 -"lib/cosmos/script/cmd_tlm_server.rb" 0x15F91C95 +"lib/cosmos/script/extract.rb" 0x456A8C23 +"lib/cosmos/script/cmd_tlm_server.rb" 0x41C35E5A "lib/cosmos/script/limits.rb" 0x9CED41D8 "lib/cosmos/script/script.rb" 0xF1B3E1F2 -"lib/cosmos/script/tools.rb" 0x6323067F +"lib/cosmos/script/tools.rb" 0x3C9C1D99 "lib/cosmos/ccsds/ccsds_packet.rb" 0xA30EE27E "lib/cosmos/ccsds/ccsds_parser.rb" 0x89A5FB3A "lib/cosmos/win32/excel.rb" 0xB4D4195E @@ -169,12 +170,12 @@ "lib/cosmos/core_ext/range.rb" 0x5D3E08D1 "lib/cosmos/core_ext/file.rb" 0x9D899F88 "lib/cosmos/core_ext/kernel.rb" 0xF6437996 -"lib/cosmos/tools/launcher/launcher.rb" 0xAF399283 +"lib/cosmos/tools/launcher/launcher.rb" 0xCCADD3C6 "lib/cosmos/tools/launcher/launcher_multitool.rb" 0x1020A3D0 "lib/cosmos/tools/launcher/launcher_tool.rb" 0xE2F186A7 "lib/cosmos/tools/launcher/launcher_config.rb" 0x569C343D "lib/cosmos/tools/table_manager/table_item.rb" 0x98E1F9F5 -"lib/cosmos/tools/table_manager/table_manager.rb" 0x79A4E4DF +"lib/cosmos/tools/table_manager/table_manager.rb" 0x678800F2 "lib/cosmos/tools/table_manager/table_config.rb" 0xB2CBF85C "lib/cosmos/tools/table_manager/table_manager_core.rb" 0xEA6F255F "lib/cosmos/tools/table_manager/table_item_parser.rb" 0xA0F4A6F0 @@ -183,7 +184,7 @@ "lib/cosmos/tools/replay/replay.rb" 0x79D68481 "lib/cosmos/tools/replay/replay_server.rb" 0x307A7329 "lib/cosmos/tools/tlm_viewer/tlm_viewer_config.rb" 0x90964EBE -"lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x694F7C9F +"lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x9347719C "lib/cosmos/tools/tlm_viewer/widgets/labeltrendlimitsbar_widget.rb" 0xD8A2AADE "lib/cosmos/tools/tlm_viewer/widgets/matrixbycolumns_widget.rb" 0x219D3181 "lib/cosmos/tools/tlm_viewer/widgets/labelvaluerangecolumn_widget.rb" 0x5935BAC8 @@ -246,37 +247,37 @@ "lib/cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb" 0x9454DCA0 "lib/cosmos/tools/tlm_viewer/widgets/canvaslabelvalue_widget.rb" 0x5784F28C "lib/cosmos/tools/tlm_viewer/widgets.rb" 0xED06BC7C -"lib/cosmos/tools/tlm_viewer/screen.rb" 0xEBC2A043 -"lib/cosmos/tools/data_viewer/data_viewer.rb" 0x53FF80A9 +"lib/cosmos/tools/tlm_viewer/screen.rb" 0x36F35313 +"lib/cosmos/tools/data_viewer/data_viewer.rb" 0x0AD36F5A "lib/cosmos/tools/data_viewer/dump_component.rb" 0x6942C5D6 "lib/cosmos/tools/data_viewer/data_viewer_component.rb" 0x3525E13F "lib/cosmos/tools/test_runner/test.rb" 0x264AB62E "lib/cosmos/tools/test_runner/results_writer.rb" 0x1546565F "lib/cosmos/tools/test_runner/test_runner_chooser.rb" 0xB2BC3115 -"lib/cosmos/tools/test_runner/test_runner.rb" 0x4A015248 +"lib/cosmos/tools/test_runner/test_runner.rb" 0x552EC1E6 "lib/cosmos/tools/tlm_extractor/text_item_chooser.rb" 0x587768C6 -"lib/cosmos/tools/tlm_extractor/tlm_extractor.rb" 0xBEE35D52 +"lib/cosmos/tools/tlm_extractor/tlm_extractor.rb" 0x878B146C "lib/cosmos/tools/tlm_extractor/tlm_extractor_processor.rb" 0x2AA9C2F5 -"lib/cosmos/tools/tlm_extractor/tlm_extractor_config.rb" 0x7779DCEC +"lib/cosmos/tools/tlm_extractor/tlm_extractor_config.rb" 0x188E919F "lib/cosmos/tools/cmd_tlm_server/background_tasks.rb" 0xF4182B10 -"lib/cosmos/tools/cmd_tlm_server/routers.rb" 0xF8C93062 +"lib/cosmos/tools/cmd_tlm_server/routers.rb" 0xEBB57C08 "lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb" 0xADDA02A6 "lib/cosmos/tools/cmd_tlm_server/gui/targets_tab.rb" 0xC1D7D2BF "lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb" 0xFF291A22 "lib/cosmos/tools/cmd_tlm_server/gui/status_tab.rb" 0xE0667118 "lib/cosmos/tools/cmd_tlm_server/gui/packets_tab.rb" 0xD9D405D2 -"lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb" 0xF7739423 -"lib/cosmos/tools/cmd_tlm_server/commanding.rb" 0xC7C76CD8 +"lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb" 0x9363C9AB +"lib/cosmos/tools/cmd_tlm_server/commanding.rb" 0xF8EAED9C "lib/cosmos/tools/cmd_tlm_server/background_task.rb" 0xC2141E7E "lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0x50E37D3B -"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server.rb" 0x542F5C07 +"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server.rb" 0xB5B61323 "lib/cosmos/tools/cmd_tlm_server/connections.rb" 0x6DC54689 -"lib/cosmos/tools/cmd_tlm_server/api.rb" 0xD6CE9C48 -"lib/cosmos/tools/cmd_tlm_server/packet_logging.rb" 0x166BE402 -"lib/cosmos/tools/cmd_tlm_server/interfaces.rb" 0x10BC320E +"lib/cosmos/tools/cmd_tlm_server/api.rb" 0x5C103F37 +"lib/cosmos/tools/cmd_tlm_server/packet_logging.rb" 0xCE912CF1 +"lib/cosmos/tools/cmd_tlm_server/interfaces.rb" 0x0F55CAF5 "lib/cosmos/tools/cmd_tlm_server/router_thread.rb" 0x5070D428 -"lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x444F1DC6 -"lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0x5B5AADF1 +"lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x05428CB5 +"lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0xEFDFB336 "lib/cosmos/tools/cmd_sender/cmd_sender.rb" 0xC47CB417 "lib/cosmos/tools/cmd_sender/cmd_sender_item_delegate.rb" 0x8297CC9D "lib/cosmos/tools/cmd_sender/cmd_sender_text_edit.rb" 0xB192AF6E @@ -300,10 +301,10 @@ "lib/cosmos/tools/tlm_grapher/data_object_editors/singlexy_data_object_editor.rb" 0xB39257A1 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_tab.rb" 0xD0AC7888 "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_realtime_thread.rb" 0x91299B66 +"lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_realtime_thread.rb" 0xC9003F38 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_plot_editor.rb" 0xE9362CE6 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_tool.rb" 0xE1E3C58B -"lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_config.rb" 0x3DF56995 +"lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_config.rb" 0x8E0A65A0 "lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_logfile_thread.rb" 0x7A0CBD87 "lib/cosmos/tools/tlm_grapher/plot_editors/singlexy_plot_editor.rb" 0xA9B7CD4C "lib/cosmos/tools/tlm_grapher/plot_editors/linegraph_plot_editor.rb" 0x38E79C34 @@ -315,12 +316,12 @@ "lib/cosmos/tools/tlm_grapher/plots/xy_plot.rb" 0x98F7712F "lib/cosmos/tools/opengl_builder/scene_config.rb" 0x15B59793 "lib/cosmos/tools/opengl_builder/opengl_builder.rb" 0xB161B0F9 -"lib/cosmos/tools/limits_monitor/limits_monitor.rb" 0x6ADEE8B6 -"lib/cosmos/tools/cmd_extractor/cmd_extractor.rb" 0x41CF52C2 +"lib/cosmos/tools/limits_monitor/limits_monitor.rb" 0x379F9FE5 +"lib/cosmos/tools/cmd_extractor/cmd_extractor.rb" 0xDB33EFF8 "lib/cosmos/tools/handbook_creator/handbook_creator_config.rb" 0xC4B816DE "lib/cosmos/tools/handbook_creator/handbook_creator.rb" 0x729A16C4 -"lib/cosmos/tools/script_runner/script_runner.rb" 0xFEEE748B -"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0xAD10B328 +"lib/cosmos/tools/script_runner/script_runner.rb" 0xD755BD12 +"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0x6107EB5F "lib/cosmos/tools/script_runner/script_audit.rb" 0xB857FA4A "lib/cosmos/tools/script_runner/script_runner_config.rb" 0x1E46E8AA "lib/cosmos/conversions.rb" 0x43679D05 diff --git a/demo/config/data/crc.txt b/demo/config/data/crc.txt index 696f15a05..e50e9f9c8 100644 --- a/demo/config/data/crc.txt +++ b/demo/config/data/crc.txt @@ -20,7 +20,7 @@ "config/targets/INST/screens/limits.txt" 0x98430974 "config/targets/INST/screens/ground.txt" 0x2D89624D "config/targets/INST/screens/block.txt" 0x77C3F2F0 -"config/targets/INST/screens/adcs.txt" 0xBF096628 +"config/targets/INST/screens/adcs.txt" 0x73D61F93 "config/targets/INST/screens/other.txt" 0x2F7A1014 "config/targets/INST/screens/tabs.txt" 0x8C8BB548 "config/targets/INST/cmd_tlm_server.txt" 0x3FC45604 @@ -67,8 +67,11 @@ "config/data/vswitchon.gif" 0xD747AC45 "config/system/system.txt" 0xFA24EDAA "config/system/system2.txt" 0xC75EBA65 +"config/tools/launcher/launcher2.css" 0x69DA47AB "config/tools/launcher/launcher.txt" 0x1B96FE7C "config/tools/launcher/launcher2.txt" 0xB0B9B1D1 +"config/tools/launcher/launcher.css" 0x6314C0C0 +"config/tools/example_application.css" 0x2987FE3F "config/tools/table_manager/MCConfigurationTable_fsw1_def.txt" 0x6531613A "config/tools/table_manager/ConfigTables_def.txt" 0xC38DCB2A "config/tools/table_manager/ExampleTableDefinition.txt" 0x59060429 @@ -78,12 +81,13 @@ "config/tools/tlm_viewer/tlm_viewer.txt" 0x825AF31C "config/tools/data_viewer/data_viewer.txt" 0xCAC3B017 "config/tools/test_runner/test_runner.txt" 0x1EB7E49C +"config/tools/test_runner/test_runner.css" 0x06987062 "config/tools/tlm_extractor/tlm_extractor4.txt" 0x068824C2 "config/tools/tlm_extractor/tlm_extractor3.txt" 0x475006AA "config/tools/tlm_extractor/tlm_extractor.txt" 0x0B97FA7D "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" 0xF1C5C3B4 +"config/tools/cmd_tlm_server/cmd_tlm_server2.txt" 0x20C1091B "config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0xFAE90F35 "config/tools/tlm_grapher/README.txt" 0x93B2C07E "config/tools/opengl_builder/README.txt" 0x93B2C07E diff --git a/lib/cosmos/version.rb b/lib/cosmos/version.rb index ef3bac27b..10719651b 100644 --- a/lib/cosmos/version.rb +++ b/lib/cosmos/version.rb @@ -1,12 +1,12 @@ # encoding: ascii-8bit -COSMOS_VERSION = '3.9.1' +COSMOS_VERSION = '3.9.2' module Cosmos module Version MAJOR = '3' MINOR = '9' - PATCH = '1' - BUILD = '0d2d495007138d6145a42b4cba9176f3e606640d' + PATCH = '2' + BUILD = '82298a42b756edd3783b51c2d7d17535b6ab8f1a' end - VERSION = '3.9.1' + VERSION = '3.9.2' end