Release COSMOS 3.6.0

BallAerospace · Aug 7, 2015 · 3b4f4bf · 3b4f4bf
1 parent c536539
commit 3b4f4bf
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 29 deletions.
diff --git a/Manifest.txt b/Manifest.txt
@@ -308,6 +308,8 @@ demo/config/targets/EXAMPLE/cmd_tlm/example_tlm.txt
 demo/config/targets/EXAMPLE/cmd_tlm_server.txt
 demo/config/targets/EXAMPLE/lib/example_interface.rb
 demo/config/targets/EXAMPLE/target.txt
+demo/config/targets/INST/cmd_tlm/_ccsds_cmd.txt
+demo/config/targets/INST/cmd_tlm/_ccsds_tlm.txt
 demo/config/targets/INST/cmd_tlm/inst_cmds.txt
 demo/config/targets/INST/cmd_tlm/inst_tlm.txt
 demo/config/targets/INST/cmd_tlm_server.txt
@@ -365,6 +367,7 @@ 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.txt
+demo/config/tools/tlm_extractor/_adcs_time.txt
 demo/config/tools/tlm_extractor/tlm_extractor.txt
 demo/config/tools/tlm_extractor/tlm_extractor2.txt
 demo/config/tools/tlm_extractor/tlm_extractor3.txt

diff --git 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" 0x196C6847
+"lib/cosmos/system/target.rb" 0x0D095C3F
 "lib/cosmos/system/system.rb" 0x9437DAD9
 "lib/cosmos/win32/win32_main.rb" 0x6D33DC6A
 "lib/cosmos/win32/win32.rb" 0xEF748B06
@@ -53,7 +53,7 @@
 "lib/cosmos/gui/dialogs/tlm_details_dialog.rb" 0x18B1DB71
 "lib/cosmos/gui/dialogs/calendar_dialog.rb" 0x688D3D3B
 "lib/cosmos/gui/qt_tool.rb" 0x5EC8FC5F
-"lib/cosmos/gui/utilities/script_module_gui.rb" 0x42BAAA94
+"lib/cosmos/gui/utilities/script_module_gui.rb" 0xA5A34AF5
 "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
@@ -90,7 +90,7 @@
 "lib/cosmos/gui/choosers/combobox_chooser.rb" 0xAD5383D5
 "lib/cosmos/gui/choosers/float_chooser.rb" 0x23B2FA77
 "lib/cosmos/tools/script_runner/script_runner_config.rb" 0x1E46E8AA
-"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0xB051DD25
+"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0x6FEE12DB
 "lib/cosmos/tools/script_runner/script_runner.rb" 0xA5890428
 "lib/cosmos/tools/script_runner/script_audit.rb" 0xB857FA4A
 "lib/cosmos/tools/cmd_extractor/cmd_extractor.rb" 0x41CF52C2
@@ -107,7 +107,7 @@
 "lib/cosmos/tools/tlm_extractor/tlm_extractor.rb" 0xBEE35D52
 "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/cmd_tlm_server_config.rb" 0xEFDAD3B8
 "lib/cosmos/tools/cmd_tlm_server/api.rb" 0x217CE77F
 "lib/cosmos/tools/cmd_tlm_server/connections.rb" 0x6DC54689
 "lib/cosmos/tools/cmd_tlm_server/background_task.rb" 0x448A2191
@@ -118,13 +118,13 @@
 "lib/cosmos/tools/cmd_tlm_server/gui/status_tab.rb" 0x9136F03E
 "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/gui/packets_tab.rb" 0xD9D405D2
 "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" 0x38E5ECE5
-"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0xA4795DC7
+"lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x7215DAF9
+"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0x50E37D3B
 "lib/cosmos/tools/limits_monitor/limits_monitor.rb" 0x0321B411
 "lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0x859EC490
 "lib/cosmos/tools/table_manager/table_manager.rb" 0x4FC4AE95
@@ -134,7 +134,7 @@
 "lib/cosmos/tools/table_manager/table_config.rb" 0x94E3D8AF
 "lib/cosmos/tools/opengl_builder/scene_config.rb" 0x15B59793
 "lib/cosmos/tools/opengl_builder/opengl_builder.rb" 0xB161B0F9
-"lib/cosmos/tools/cmd_sender/cmd_sender.rb" 0xCE30B8BE
+"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
 "lib/cosmos/tools/test_runner/test_runner_chooser.rb" 0xB2BC3115
@@ -234,7 +234,7 @@
 "lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x895983E9
 "lib/cosmos/system.rb" 0x735DFB42
 "lib/cosmos/conversions.rb" 0x43679D05
-"lib/cosmos/version.rb" 0x46847B0C
+"lib/cosmos/version.rb" 0x57B2D7DE
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/interfaces.rb" 0x7E3EA326
 "lib/cosmos/processors.rb" 0x5241327D
@@ -247,10 +247,10 @@
 "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
+"lib/cosmos/streams/tcpip_socket_stream.rb" 0x7096E4FA
 "lib/cosmos/streams/preidentified_stream_protocol.rb" 0xC258238E
 "lib/cosmos/script.rb" 0x25BB611B
-"lib/cosmos/config/config_parser.rb" 0x89526FF1
+"lib/cosmos/config/config_parser.rb" 0x96FBE8D7
 "lib/cosmos/packet_logs.rb" 0xA2EDBB00
 "lib/cosmos/packets/limits.rb" 0x9758BB50
 "lib/cosmos/packets/limits_response.rb" 0x9C5E8444
@@ -263,9 +263,9 @@
 "lib/cosmos/packets/parsers/processor_parser.rb" 0xEC75BA88
 "lib/cosmos/packets/parsers/limits_parser.rb" 0xFCFB27D0
 "lib/cosmos/packets/parsers/state_parser.rb" 0xCA3BFDFC
-"lib/cosmos/packets/parsers/macro_parser.rb" 0x8454D5AE
+"lib/cosmos/packets/parsers/macro_parser.rb" 0x4CC8096D
 "lib/cosmos/packets/parsers/limits_response_parser.rb" 0x05979119
-"lib/cosmos/packets/packet_config.rb" 0xFDD8F251
+"lib/cosmos/packets/packet_config.rb" 0x37D677AC
 "lib/cosmos/packets/binary_accessor.rb" 0x7D41D474
 "lib/cosmos/packets/packet.rb" 0x043EF800
 "lib/cosmos/packets/structure_item.rb" 0xBDC81085
@@ -277,16 +277,16 @@
 "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" 0x9825D709
+"lib/cosmos/io/json_drb_object.rb" 0x1E49F4E5
 "lib/cosmos/io/cosmos_snmp.rb" 0x64541158
 "lib/cosmos/io/json_rpc.rb" 0xAF9D95D5
-"lib/cosmos/io/tcpip_server.rb" 0xBAA24660
+"lib/cosmos/io/tcpip_server.rb" 0x2A294912
 "lib/cosmos/io/posix_serial_driver.rb" 0x6DD5B8B4
 "lib/cosmos/io/udp_sockets.rb" 0xB1B138CD
 "lib/cosmos/io/serial_driver.rb" 0x9A2515F4
 "lib/cosmos/io/raw_logger_pair.rb" 0x7A0A3F00
 "lib/cosmos/io/raw_logger.rb" 0x42BC42CC
-"lib/cosmos/io/json_drb.rb" 0xEB371784
+"lib/cosmos/io/json_drb.rb" 0x495EB58B
 "lib/cosmos/io/stderr.rb" 0x401624AF
 "lib/cosmos/io/io_multiplexer.rb" 0xD183938D
 "lib/cosmos/io/win32_serial_driver.rb" 0xECBFE8FD
@@ -303,7 +303,7 @@
 "lib/cosmos/script/commands.rb" 0x58ABA373
 "lib/cosmos/script/telemetry.rb" 0x2AFB0DCB
 "lib/cosmos/script/cmd_tlm_server.rb" 0x15F91C95
-"lib/cosmos/script/scripting.rb" 0x8569530F
+"lib/cosmos/script/scripting.rb" 0xB79087E5
 "lib/cosmos/script/tools.rb" 0x8565EDC5
 "lib/cosmos/script/script.rb" 0xF1B3E1F2
 "lib/cosmos/script/extract.rb" 0xCF4666D3

diff --git a/demo/config/data/crc.txt b/demo/config/data/crc.txt
@@ -23,8 +23,10 @@
 "config/targets/SYSTEM/cmd_tlm/override.txt" 0x8FE016FF
 "config/targets/SYSTEM/cmd_tlm/limits_groups.txt" 0x16AF4BA3
 "config/targets/SYSTEM/screens/status.txt" 0x89B616E5
-"config/targets/INST/cmd_tlm/inst_tlm.txt" 0x41CB35D2
-"config/targets/INST/cmd_tlm/inst_cmds.txt" 0x5E6ADC2F
+"config/targets/INST/cmd_tlm/_ccsds_tlm.txt" 0xE833D935
+"config/targets/INST/cmd_tlm/inst_tlm.txt" 0xB051D393
+"config/targets/INST/cmd_tlm/inst_cmds.txt" 0xB1512DFA
+"config/targets/INST/cmd_tlm/_ccsds_cmd.txt" 0x30F646E8
 "config/targets/INST/cmd_tlm_server.txt" 0x3FC45604
 "config/targets/INST/target.txt" 0x3C3A6F4A
 "config/targets/INST/screens/graphs.txt" 0x82EF35B4
@@ -62,18 +64,19 @@
 "config/tools/data_viewer/data_viewer.txt" 0xCAC3B017
 "config/tools/launcher/launcher.txt" 0x1B96FE7C
 "config/tools/launcher/launcher2.txt" 0xB0B9B1D1
-"config/tools/tlm_extractor/tlm_extractor4.txt" 0x7BFDC27A
-"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/tlm_extractor/tlm_extractor4.txt" 0x068824C2
+"config/tools/tlm_extractor/_adcs_time.txt" 0x3DAD5094
+"config/tools/tlm_extractor/tlm_extractor2.txt" 0x5C780BD2
+"config/tools/tlm_extractor/tlm_extractor.txt" 0x0B97FA7D
+"config/tools/tlm_extractor/tlm_extractor3.txt" 0x475006AA
 "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
 "config/tools/table_manager/ExampleTableDefinition.txt" 0x5476588C
 "config/tools/table_manager/MCConfigurationTable_fsw1_def.txt" 0x9DE18AEA
-"config/tools/table_manager/TLMMonitoringTable_def.txt" 0x70DABA45
+"config/tools/table_manager/TLMMonitoringTable_def.txt" 0xBD70F0A7
 "config/tools/table_manager/MCConfigurationTable_fsw2_def.txt" 0x9DE18AEA
 "config/tools/opengl_builder/README.txt" 0x93B2C07E
 "config/tools/test_runner/test_runner.txt" 0x1EB7E49C

diff --git a/lib/cosmos/version.rb b/lib/cosmos/version.rb
@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.5.3'
+COSMOS_VERSION = '3.6.0'
 module Cosmos
   module Version
     MAJOR = '3'
-    MINOR = '5'
-    PATCH = '3'
-    BUILD = '351455c115f9d09210eb410fa47da30f60787489'
+    MINOR = '6'
+    PATCH = '0'
+    BUILD = 'c536539999e6ee8e176d875a88e4ae639bb1e196'
   end
-  VERSION = '3.5.3'
+  VERSION = '3.6.0'
 end