From fbc41db94ea70a1c3344f41c89141eebc670eb1f Mon Sep 17 00:00:00 2001 From: Ryan Melton Date: Mon, 27 Apr 2015 10:06:48 -0600 Subject: [PATCH] Release COSMOS 3.4.0 --- Manifest.txt | 22 ++++++++++++++++ data/crc.txt | 54 ++++++++++++++++++++++------------------ demo/config/data/crc.txt | 6 ++--- lib/cosmos/version.rb | 10 ++++---- 4 files changed, 60 insertions(+), 32 deletions(-) diff --git a/Manifest.txt b/Manifest.txt index cd92d0662..151a86bed 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -1,4 +1,5 @@ .coveralls.yml +.gitattributes .gitignore .travis.yml CONTRIBUTING.txt @@ -181,8 +182,13 @@ autohotkey/tools/tlm_viewer5.ahk autohotkey/userpath.txt bin/cosmos bin/cstol_converter +bin/exchndl20-x64.dll bin/exchndl20.dll +bin/exchndl21-x64.dll bin/exchndl21.dll +bin/exchndl22-x64.dll +bin/exchndl22.dll +bin/mgwhelp-x64.dll bin/mgwhelp.dll bin/rubysloc cosmos.gemspec @@ -825,8 +831,14 @@ lib/cosmos/processors/processor.rb lib/cosmos/processors/statistics_processor.rb lib/cosmos/processors/watermark_processor.rb lib/cosmos/script.rb +lib/cosmos/script/cmd_tlm_server.rb +lib/cosmos/script/commands.rb lib/cosmos/script/extract.rb +lib/cosmos/script/limits.rb lib/cosmos/script/script.rb +lib/cosmos/script/scripting.rb +lib/cosmos/script/telemetry.rb +lib/cosmos/script/tools.rb lib/cosmos/streams/burst_stream_protocol.rb lib/cosmos/streams/fixed_stream_protocol.rb lib/cosmos/streams/length_stream_protocol.rb @@ -1032,6 +1044,7 @@ spec/core_ext/string_spec.rb spec/core_ext/stringio_spec.rb spec/core_ext/time_spec.rb spec/gui/line_graph/line_clip_spec.rb +spec/gui/qt_spec.rb spec/install/config/system/system.txt spec/install/config/targets/COSMOS/cmd_tlm/cosmos_server_cmds.txt spec/install/config/targets/COSMOS/cmd_tlm/cosmos_server_tlm.txt @@ -1100,7 +1113,14 @@ spec/processors/new_packet_log_processor_spec.rb spec/processors/processor_spec.rb spec/processors/statistics_processor_spec.rb 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/limits_spec.rb spec/script/script_spec.rb +spec/script/scripting_spec.rb +spec/script/telemetry_spec.rb +spec/script/tools_spec.rb spec/spec_helper.rb spec/streams/burst_stream_protocol_spec.rb spec/streams/fixed_stream_protocol_spec.rb @@ -1265,6 +1285,8 @@ test/performance/tools/TlmExtractor test/performance/tools/TlmExtractor.bat test/performance/tools/TlmGrapher test/performance/tools/TlmGrapher.bat +test/performance/tools/TlmGrapherMemProf +test/performance/tools/TlmGrapherMemProf.bat test/performance/tools/TlmViewer test/performance/tools/TlmViewer.bat test/performance/tools/mac/CmdExtractor.app/Contents/Info.plist diff --git a/data/crc.txt b/data/crc.txt index 2479a51a9..5f3b458d9 100644 --- a/data/crc.txt +++ b/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" 0x52287176 +"lib/cosmos/system/target.rb" 0x9AA2537D "lib/cosmos/system/system.rb" 0x6C509559 "lib/cosmos/win32/win32_main.rb" 0xC71EBE12 "lib/cosmos/win32/win32.rb" 0xEF748B06 @@ -18,7 +18,7 @@ "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" 0xA70518D6 +"lib/cosmos/top_level.rb" 0x10625804 "lib/cosmos/packet_logs/meta_packet_log_writer.rb" 0x860D1FD8 "lib/cosmos/packet_logs/packet_log_writer.rb" 0x75E82380 "lib/cosmos/packet_logs/packet_log_writer_pair.rb" 0xB4DCA156 @@ -26,14 +26,14 @@ "lib/cosmos/packet_logs/packet_log_reader.rb" 0xA347D992 "lib/cosmos/utilities/message_log.rb" 0xB34783DF "lib/cosmos/utilities/crc.rb" 0xCDAFB844 -"lib/cosmos/utilities/ruby_lex_utils.rb" 0x270B0580 +"lib/cosmos/utilities/ruby_lex_utils.rb" 0x58A6CAF8 "lib/cosmos/utilities/logger.rb" 0xD39FB903 "lib/cosmos/utilities/sleeper.rb" 0x650C3CEB "lib/cosmos/utilities/quaternion.rb" 0xCCB7A898 "lib/cosmos/utilities/csv.rb" 0x9F794965 "lib/cosmos/utilities/low_fragmentation_array.rb" 0x7E797C76 "lib/cosmos/utilities/simulated_target.rb" 0x7EE7A3FF -"lib/cosmos/gui/qt.rb" 0xE384005F +"lib/cosmos/gui/qt.rb" 0xD90E0333 "lib/cosmos/gui/dialogs/find_replace_dialog.rb" 0x4627C7A5 "lib/cosmos/gui/dialogs/set_tlm_dialog.rb" 0x02A207C9 "lib/cosmos/gui/dialogs/exception_dialog.rb" 0xEAC9F814 @@ -60,14 +60,14 @@ "lib/cosmos/gui/widgets/packet_log_frame.rb" 0xF9312CBD "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" 0xA68F7552 -"lib/cosmos/gui/line_graph/overview_graph.rb" 0xEDD6D64A +"lib/cosmos/gui/line_graph/line_graph_drawing.rb" 0x718C2DDA +"lib/cosmos/gui/line_graph/overview_graph.rb" 0x8FCDCE33 "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 "lib/cosmos/gui/line_graph/line_graph_scaling.rb" 0xBF57D9F7 "lib/cosmos/gui/text/completion_text_edit.rb" 0xCF57B24D -"lib/cosmos/gui/text/ruby_editor.rb" 0xEE6E87E6 +"lib/cosmos/gui/text/ruby_editor.rb" 0x25FF81E3 "lib/cosmos/gui/text/completion_line_edit.rb" 0x16E0A174 "lib/cosmos/gui/text/completion.rb" 0x38329713 "lib/cosmos/gui/opengl/stl_shape.rb" 0xDC46B33A @@ -108,25 +108,25 @@ "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" 0xA1C38662 -"lib/cosmos/tools/cmd_tlm_server/api.rb" 0xB1819524 -"lib/cosmos/tools/cmd_tlm_server/connections.rb" 0x6657A0FB +"lib/cosmos/tools/cmd_tlm_server/api.rb" 0x43A203B4 +"lib/cosmos/tools/cmd_tlm_server/connections.rb" 0x6DC54689 "lib/cosmos/tools/cmd_tlm_server/background_task.rb" 0x448A2191 "lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server.rb" 0x73AC5F0A "lib/cosmos/tools/cmd_tlm_server/router_thread.rb" 0x5070D428 "lib/cosmos/tools/cmd_tlm_server/background_tasks.rb" 0xAE192026 "lib/cosmos/tools/cmd_tlm_server/gui/targets_tab.rb" 0xC1D7D2BF "lib/cosmos/tools/cmd_tlm_server/gui/status_tab.rb" 0x9136F03E -"lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb" 0x305FBD73 +"lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb" 0xEFB119C2 "lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb" 0xFF291A22 "lib/cosmos/tools/cmd_tlm_server/gui/packets_tab.rb" 0xD8916AE8 "lib/cosmos/tools/cmd_tlm_server/routers.rb" 0xF8C93062 "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" 0x5144683A +"lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x38E5ECE5 "lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0x6C738F54 "lib/cosmos/tools/limits_monitor/limits_monitor.rb" 0xD33984F4 -"lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0x12D1B643 +"lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0x859EC490 "lib/cosmos/tools/table_manager/table_manager.rb" 0x4FC4AE95 "lib/cosmos/tools/table_manager/table.rb" 0x923A8589 "lib/cosmos/tools/table_manager/table_item.rb" 0x08A9A262 @@ -174,8 +174,8 @@ "lib/cosmos/tools/tlm_grapher/data_objects/housekeeping_data_object.rb" 0x0485208B "lib/cosmos/tools/tlm_grapher/data_objects/linegraph_data_object.rb" 0x58D45CBE "lib/cosmos/tools/tlm_grapher/data_objects/data_object.rb" 0xE3D40CD6 -"lib/cosmos/tools/handbook_creator/handbook_creator_config.rb" 0x11198CC9 -"lib/cosmos/tools/handbook_creator/handbook_creator.rb" 0x263A9DD2 +"lib/cosmos/tools/handbook_creator/handbook_creator_config.rb" 0x28A7060A +"lib/cosmos/tools/handbook_creator/handbook_creator.rb" 0x1D78FFD9 "lib/cosmos/tools/tlm_viewer/screen.rb" 0xEBC2A043 "lib/cosmos/tools/tlm_viewer/tlm_viewer_config.rb" 0xD1C9093A "lib/cosmos/tools/tlm_viewer/widgets.rb" 0x6D47EAF0 @@ -186,7 +186,7 @@ "lib/cosmos/tools/tlm_viewer/widgets/aging_widget.rb" 0xF86604BD "lib/cosmos/tools/tlm_viewer/widgets/labelvalue_widget.rb" 0x3A167C64 "lib/cosmos/tools/tlm_viewer/widgets/sectionheader_widget.rb" 0x0CDABB7D -"lib/cosmos/tools/tlm_viewer/widgets/limitsbar_widget.rb" 0xABADAEE7 +"lib/cosmos/tools/tlm_viewer/widgets/limitsbar_widget.rb" 0x37B72108 "lib/cosmos/tools/tlm_viewer/widgets/labelvaluedesc_widget.rb" 0x9FDF915A "lib/cosmos/tools/tlm_viewer/widgets/progressbar_widget.rb" 0x88E04062 "lib/cosmos/tools/tlm_viewer/widgets/trendbar_widget.rb" 0xCC7F70CC @@ -200,7 +200,7 @@ "lib/cosmos/tools/tlm_viewer/widgets/scrollwindow_widget.rb" 0x9CF64770 "lib/cosmos/tools/tlm_viewer/widgets/label_widget.rb" 0x5158C883 "lib/cosmos/tools/tlm_viewer/widgets/labelvaluelimitsbar_widget.rb" 0xF8B0AEA6 -"lib/cosmos/tools/tlm_viewer/widgets/rangebar_widget.rb" 0x6795FA4E +"lib/cosmos/tools/tlm_viewer/widgets/rangebar_widget.rb" 0x6264A25A "lib/cosmos/tools/tlm_viewer/widgets/textbox_widget.rb" 0x9208702E "lib/cosmos/tools/tlm_viewer/widgets/layout_widget.rb" 0x799D4376 "lib/cosmos/tools/tlm_viewer/widgets/value_widget.rb" 0x4D6A92A7 @@ -220,7 +220,7 @@ "lib/cosmos/tools/tlm_viewer/widgets/canvasvalue_widget.rb" 0x607D0CD1 "lib/cosmos/tools/tlm_viewer/widgets/canvasimagevalue_widget.rb" 0xBDC6E676 "lib/cosmos/tools/tlm_viewer/widgets/linegraph_widget.rb" 0xB44C5BB5 -"lib/cosmos/tools/tlm_viewer/widgets/canvasline_widget.rb" 0xCE712FD9 +"lib/cosmos/tools/tlm_viewer/widgets/canvasline_widget.rb" 0xB92B5C5F "lib/cosmos/tools/tlm_viewer/widgets/valuelimitsbar_widget.rb" 0x6AB7A663 "lib/cosmos/tools/tlm_viewer/widgets/canvasimage_widget.rb" 0xBE7452ED "lib/cosmos/tools/tlm_viewer/widgets/vertical_widget.rb" 0x3EB40B71 @@ -228,13 +228,13 @@ "lib/cosmos/tools/tlm_viewer/widgets/tabbook_widget.rb" 0xD19A5F86 "lib/cosmos/tools/tlm_viewer/widgets/radiobutton_widget.rb" 0x192594BB "lib/cosmos/tools/tlm_viewer/widgets/tabitem_widget.rb" 0x390CA44D -"lib/cosmos/tools/tlm_viewer/widgets/canvaslinevalue_widget.rb" 0x69740A8B +"lib/cosmos/tools/tlm_viewer/widgets/canvaslinevalue_widget.rb" 0xA2867A1C "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" 0x1D2090F6 "lib/cosmos/system.rb" 0x735DFB42 "lib/cosmos/conversions.rb" 0x43679D05 -"lib/cosmos/version.rb" 0x8E278DA3 +"lib/cosmos/version.rb" 0x577222AD "lib/cosmos/core_ext.rb" 0x1951B346 "lib/cosmos/interfaces.rb" 0x7E3EA326 "lib/cosmos/processors.rb" 0x5241327D @@ -244,7 +244,7 @@ "lib/cosmos/streams/terminated_stream_protocol.rb" 0x5DBDE591 "lib/cosmos/streams/stream.rb" 0xFD0A41B9 "lib/cosmos/streams/serial_stream.rb" 0x9F0BBA1D -"lib/cosmos/streams/stream_protocol.rb" 0x5EA23890 +"lib/cosmos/streams/stream_protocol.rb" 0xEC382CA0 "lib/cosmos/streams/fixed_stream_protocol.rb" 0x5F6F224B "lib/cosmos/streams/tcpip_client_stream.rb" 0xA644ADBA "lib/cosmos/streams/tcpip_socket_stream.rb" 0xC66F984E @@ -256,7 +256,7 @@ "lib/cosmos/packets/limits_response.rb" 0x9C5E8444 "lib/cosmos/packets/commands.rb" 0x1A33428E "lib/cosmos/packets/structure.rb" 0xC8524C43 -"lib/cosmos/packets/telemetry.rb" 0x5A769DE7 +"lib/cosmos/packets/telemetry.rb" 0xFBD85016 "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 @@ -266,7 +266,7 @@ "lib/cosmos/packets/parsers/macro_parser.rb" 0x8454D5AE "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/binary_accessor.rb" 0x7D41D474 "lib/cosmos/packets/packet.rb" 0x043EF800 "lib/cosmos/packets/structure_item.rb" 0xBDC81085 "lib/cosmos/packets/packet_item_limits.rb" 0xE187C389 @@ -299,8 +299,14 @@ "lib/cosmos/interfaces/tcpip_client_interface.rb" 0x5F0DB50D "lib/cosmos/interfaces/udp_interface.rb" 0xCE4532AD "lib/cosmos/interfaces/tcpip_server_interface.rb" 0xC8F6E908 -"lib/cosmos/script/script.rb" 0x472901A7 -"lib/cosmos/script/extract.rb" 0xF3243476 +"lib/cosmos/script/limits.rb" 0x5876951A +"lib/cosmos/script/commands.rb" 0xA69088BE +"lib/cosmos/script/telemetry.rb" 0x2AFB0DCB +"lib/cosmos/script/cmd_tlm_server.rb" 0x15F91C95 +"lib/cosmos/script/scripting.rb" 0xCE39AAE9 +"lib/cosmos/script/tools.rb" 0x8565EDC5 +"lib/cosmos/script/script.rb" 0xF1B3E1F2 +"lib/cosmos/script/extract.rb" 0xD5C628EF "lib/cosmos/core_ext/range.rb" 0x0D55D9D1 "lib/cosmos/core_ext/stringio.rb" 0x28B64FB4 "lib/cosmos/core_ext/file.rb" 0x1309270C diff --git a/demo/config/data/crc.txt b/demo/config/data/crc.txt index 63031225a..5154be8d6 100644 --- a/demo/config/data/crc.txt +++ b/demo/config/data/crc.txt @@ -86,8 +86,8 @@ "config/tools/handbook_creator/templates/pdf_header.html.erb" 0x3020FEE1 "config/tools/handbook_creator/templates/telemetry_toc.html.erb" 0x610E3BC5 "config/tools/handbook_creator/templates/header.html.erb" 0x1E490C2A -"config/tools/handbook_creator/templates/telemetry_packets.html.erb" 0x44BD9695 -"config/tools/handbook_creator/templates/command_packets.html.erb" 0x9897CA7A +"config/tools/handbook_creator/templates/telemetry_packets.html.erb" 0x86F3E5E0 +"config/tools/handbook_creator/templates/command_packets.html.erb" 0xFAD7FDA1 "config/tools/handbook_creator/templates/limits_groups.html.erb" 0x40FDF34C "config/tools/handbook_creator/templates/nav.html.erb" 0xDF65AAEA "config/tools/handbook_creator/templates/footer.html.erb" 0x0E1F9800 @@ -200,7 +200,7 @@ "procedures/run_example_test.rb" 0x0F244140 "procedures/clear_util.rb" 0x5B3C1279 "procedures/example_test.rb" 0x4FBA73C1 -"procedures/cosmos_api_test.rb" 0x57AE9ED2 +"procedures/cosmos_api_test.rb" 0x54B5DC56 "procedures/test.rb" 0xCE4DA55A "procedures/checks.rb" 0x34EEF3E2 "procedures/collect.rb" 0x3E52C327 diff --git a/lib/cosmos/version.rb b/lib/cosmos/version.rb index 33854096e..028eb6240 100644 --- a/lib/cosmos/version.rb +++ b/lib/cosmos/version.rb @@ -1,12 +1,12 @@ # encoding: ascii-8bit -COSMOS_VERSION = '3.3.3' +COSMOS_VERSION = '3.4.0' module Cosmos module Version MAJOR = '3' - MINOR = '3' - PATCH = '3' - BUILD = '0c7720497e1ce22a447e7e6d571db7b4c0ffd886' + MINOR = '4' + PATCH = '0' + BUILD = '9a5a2f777b1122ed55b49caf2febf113a223eeaa' end - VERSION = '3.3.3' + VERSION = '3.4.0' end