cosmos 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c423aad01007a985141091d95e7b06f352802f25
-  data.tar.gz: 416d9b28b6afef24a335e58d17689e1655e97931
+  metadata.gz: e3b5933b0b42e6b0a29439cad8a1c5caeb1331d0
+  data.tar.gz: f12282bd56e9d88999a8c1aec6ef0fb652f63a49
 SHA512:
-  metadata.gz: 7b8574aad94621b0da897196616a18c29d39825beb10f375e612aa5e7ad094d00bb80623a0d746c0c8fa6b2e4be98bbd3bd25750c65b91f9f66947478792b34c
-  data.tar.gz: 2230561b09c4a2e5e0c844c5c6f2af7608fe68ee8721a3a9030d03ecb64870a9fde00d68311ec4586d13ffcf20115b963eec71158cf0e54bd334762806d2f55c
+  metadata.gz: 45e4e2ab72b0069f1616b8af96342dacf2731778047f8f4ebea2cab592dbbc60283d2f023fc7f471dec61ab66d3dcaa22c40cf7fd20d1810d2e40bb53efe213e
+  data.tar.gz: 54ff36f53c2187b1dc92253194d91c27a47c224c5346dfe565baed10ac461a6d9ec23db2323db18c7af82fe4dd846bb53a54a8b6288ce09423be98f6034dfdd9

data/Manifest.txt

@@ -843,6 +843,11 @@ lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb
 lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb
 lib/cosmos/tools/cmd_tlm_server/commanding.rb
 lib/cosmos/tools/cmd_tlm_server/connections.rb
+lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb
+lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb
+lib/cosmos/tools/cmd_tlm_server/gui/packets_tab.rb
+lib/cosmos/tools/cmd_tlm_server/gui/status_tab.rb
+lib/cosmos/tools/cmd_tlm_server/gui/targets_tab.rb
 lib/cosmos/tools/cmd_tlm_server/interface_thread.rb
 lib/cosmos/tools/cmd_tlm_server/interfaces.rb
 lib/cosmos/tools/cmd_tlm_server/packet_logging.rb
@@ -1105,6 +1110,7 @@ spec/tools/cmd_tlm_server/interfaces_spec.rb
 spec/tools/cmd_tlm_server/packet_logging_spec.rb
 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/top_level/top_level_spec.rb
 spec/utilities/crc_spec.rb
 spec/utilities/csv_spec.rb

data/autohotkey/config/tools/handbook_creator/templates/command_packets.html.erb

@@ -42,7 +42,7 @@
                       <tr>
                         <td>
                           <%= key %>
-                          <% if item.hazardous[key] %>
+                          <% if item.hazardous && item.hazardous[key] %>
                             <div><span style="font-size:18px;background:#555555;color:white;">Hazardous<br/><%= item.hazardous[key] %></span></div>
                           <% end %>
                         </td>

data/autohotkey/config/tools/handbook_creator/templates/footer.html.erb

@@ -3,7 +3,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'jquery-1.10.2.min.js') %>"></script>
-    <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'bootstrap.min.js') %>"></script>
+    <script src="<%= File.join('assets', 'js', 'jquery-1.10.2.min.js') %>"></script>
+    <script src="<%= File.join('assets', 'js', 'bootstrap.min.js') %>"></script>
   </body>
 </html>

data/autohotkey/config/tools/handbook_creator/templates/header.html.erb

@@ -10,14 +10,14 @@
     <title><%= title %></title>
 
     <!-- Bootstrap core CSS -->
-    <link href="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'css', 'bootstrap.min.css') %>" rel="stylesheet">
+    <link href="<%= File.join('assets', 'css', 'bootstrap.min.css') %>" rel="stylesheet">
     <!-- Bootstrap theme -->
-    <link href="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'css', 'bootstrap-theme.min.css') %>" rel="stylesheet">
+    <link href="<%= File.join('assets', 'css', 'bootstrap-theme.min.css') %>" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'html5shiv.js') %>"></script>
-      <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'respond.min.js') %>"></script>
+      <script src="<%= File.join('assets', 'js', 'html5shiv.js') %>"></script>
+      <script src="<%= File.join('assets', 'js', 'respond.min.js') %>"></script>
     <![endif]-->
   </head>
 

data/autohotkey/tools/autohotkey.rb

@@ -30,7 +30,7 @@ def autohotkey(command_name, ahk_script = nil)
   # Clean up CTS log files
   Dir["autohotkey/outputs/logs/*"].each do |file|
     next if File.basename(file) == "cmd.bin" || File.basename(file) == "tlm.bin" ||
-      File.basename(file) == "bigtlm.bin"
+      File.basename(file) == "bigtlm.bin" || File.basename(file).include?('exception')
     File.delete file
   end
 end

data/autohotkey/tools/cmd_tlm_server.ahk

@@ -82,6 +82,7 @@ Sleep 500
 Click 115 115 ; Limits set
 Sleep 500
 Click 115 145 ; TVAC CTS-15
+Sleep 1000
 
 Send ^q
 Sleep 500

data/autohotkey/tools/packet_viewer.ahk

@@ -1,3 +1,5 @@
+SetWinDelay 500
+SetTitleMatchMode 2 ; Contain the title anywhere to match
 WinWaitActive Packet Viewer
 Sleep 2000
 Run ruby.exe %A_ScriptDir%/CmdTlmServer
@@ -125,13 +127,54 @@ Sleep 500
 Send {Enter}
 Sleep 2000
 
+Click right 380, 595 ; TEMP1 details
+Sleep 500
+Send {Tab}{Enter}
+WinWaitActive TEMP1
+
+WinActivate Packet Viewer
+WinWaitActive Packet Viewer
+Click right 380, 685 ; ARY details
+Sleep 500
+Send {Tab}{Enter}
+WinWaitActive ARY
+
+WinActivate Packet Viewer
+WinWaitActive Packet Viewer
+Click right 380, 735 ; COLLECT_TYPE details
+Sleep 500
+Send {Tab}{Enter}
+WinWaitActive COLLECT_TYPE
+
+WinActivate TEMP1
+WinWaitActive TEMP1
+Sleep 5000
+
+Run ruby.exe %A_ScriptDir%/ScriptRunner -w 600 -t 600
+Sleep 2000
+WinActivate Script Runner
+Sleep 500
+Send set_limits("INST","HEALTH_STATUS","TEMP1",-110,-105,105,110,-100,100){ENTER}
+Send set_limits_set("CUSTOM"){ENTER}
+Sleep 500
+Click 400, 88 ; Start
+
+WinActivate TEMP1
+WinWaitActive TEMP1
+Sleep 1000
+
+WinActivate Script Runner
+WinWaitActive Script Runner
+Send ^q
+WinWaitActive Save
+Send n
+
 ; Close down command and telemetry server
 WinActivate Command and Telemetry Server
-Sleep 500
+WinWaitActive Command and Telemetry Server
 Send ^q
 Sleep 500
 Send {Enter}
-Sleep 500
 
 ; Cleanup and last of the options (help menu selections)
 WinActivate Packet Viewer

data/data/crc.txt

@@ -18,9 +18,9 @@
 "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" 0xB3D60212
+"lib/cosmos/top_level.rb" 0xDC00359C
 "lib/cosmos/packet_logs/meta_packet_log_writer.rb" 0x860D1FD8
-"lib/cosmos/packet_logs/packet_log_writer.rb" 0xBE83A4F9
+"lib/cosmos/packet_logs/packet_log_writer.rb" 0x7C6FCFEC
 "lib/cosmos/packet_logs/packet_log_writer_pair.rb" 0xB4DCA156
 "lib/cosmos/packet_logs/packet_log_reader.rb" 0xA347D992
 "lib/cosmos/utilities/message_log.rb" 0x005DD08A
@@ -32,7 +32,7 @@
 "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" 0x4D79133C
+"lib/cosmos/gui/qt.rb" 0x124A05FD
 "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" 0xC06443BE
@@ -49,7 +49,7 @@
 "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" 0xFC55BE9F
+"lib/cosmos/gui/dialogs/tlm_details_dialog.rb" 0xE0AB01AD
 "lib/cosmos/gui/dialogs/calendar_dialog.rb" 0x688D3D3B
 "lib/cosmos/gui/qt_tool.rb" 0x840EF801
 "lib/cosmos/gui/utilities/script_module_gui.rb" 0x4923717B
@@ -64,7 +64,7 @@
 "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" 0x4B0B9EA3
+"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/completion_line_edit.rb" 0x16E0A174
@@ -98,7 +98,7 @@
 "lib/cosmos/tools/data_viewer/data_viewer.rb" 0x0F59420B
 "lib/cosmos/tools/launcher/launcher_multitool.rb" 0x1020A3D0
 "lib/cosmos/tools/launcher/launcher_tool.rb" 0x0501F2F4
-"lib/cosmos/tools/launcher/launcher_config.rb" 0x615EB853
+"lib/cosmos/tools/launcher/launcher_config.rb" 0xFF0CB90A
 "lib/cosmos/tools/launcher/launcher.rb" 0x0FFB42EC
 "lib/cosmos/tools/replay/replay_server.rb" 0x307A7329
 "lib/cosmos/tools/replay/replay.rb" 0xB8521242
@@ -106,19 +106,24 @@
 "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" 0xDB9B6253
+"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb" 0xA54471CD
 "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
 "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" 0xFE9543B4
+"lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb" 0xD1671DC4
+"lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb" 0xFF291A22
+"lib/cosmos/tools/cmd_tlm_server/gui/packets_tab.rb" 0xD5554174
 "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" 0x0668F33F
-"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0x3B5AC02D
+"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0x138FCD7A
 "lib/cosmos/tools/limits_monitor/limits_monitor.rb" 0xAA19533E
 "lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0x12D1B643
 "lib/cosmos/tools/table_manager/table_manager.rb" 0x4FC4AE95
@@ -132,8 +137,8 @@
 "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" 0x182F00C6
-"lib/cosmos/tools/test_runner/results_writer.rb" 0xC713C9A6
-"lib/cosmos/tools/test_runner/test_runner.rb" 0x7E9B3CE3
+"lib/cosmos/tools/test_runner/results_writer.rb" 0xF8CF9306
+"lib/cosmos/tools/test_runner/test_runner.rb" 0x4165ADBC
 "lib/cosmos/tools/test_runner/test.rb" 0xD2BE7F1C
 "lib/cosmos/tools/tlm_grapher/plots/xy_plot.rb" 0x98F7712F
 "lib/cosmos/tools/tlm_grapher/plots/singlexy_plot.rb" 0xA01649EC
@@ -163,11 +168,11 @@
 "lib/cosmos/tools/tlm_grapher/plot_gui_objects/singlexy_plot_gui_object.rb" 0x4FC1C15C
 "lib/cosmos/tools/tlm_grapher/plot_gui_objects/linegraph_plot_gui_object.rb" 0xC1B25F76
 "lib/cosmos/tools/tlm_grapher/plot_gui_objects/xy_plot_gui_object.rb" 0xA500650F
-"lib/cosmos/tools/tlm_grapher/data_objects/xy_data_object.rb" 0x9B1D76D4
+"lib/cosmos/tools/tlm_grapher/data_objects/xy_data_object.rb" 0xCD684000
 "lib/cosmos/tools/tlm_grapher/data_objects/singlexy_data_object.rb" 0x1D037935
-"lib/cosmos/tools/tlm_grapher/data_objects/housekeeping_data_object.rb" 0x7AB837F4
+"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" 0x38FA91FC
+"lib/cosmos/tools/tlm_grapher/data_objects/data_object.rb" 0xE3D40CD6
 "lib/cosmos/tools/handbook_creator/handbook_creator_config.rb" 0x689D876A
 "lib/cosmos/tools/handbook_creator/handbook_creator.rb" 0x06AD12D2
 "lib/cosmos/tools/tlm_viewer/screen.rb" 0xEBC2A043
@@ -228,7 +233,7 @@
 "lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0xB7B0D77D
 "lib/cosmos/system.rb" 0x735DFB42
 "lib/cosmos/conversions.rb" 0x43679D05
-"lib/cosmos/version.rb" 0x5DB0B8F4
+"lib/cosmos/version.rb" 0x9DA328D2
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/interfaces.rb" 0x7E3EA326
 "lib/cosmos/processors.rb" 0x5241327D
@@ -285,7 +290,7 @@
 "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" 0x9CAF9170
+"lib/cosmos/script/script.rb" 0xDA302537
 "lib/cosmos/script/extract.rb" 0xF3243476
 "lib/cosmos/core_ext/range.rb" 0x0D55D9D1
 "lib/cosmos/core_ext/stringio.rb" 0x28B64FB4

data/demo/Rakefile

@@ -14,6 +14,22 @@ def create_crc_file(official)
   count = 0
   ignore = [
     # Add filenames here if you don't want them to be CRCed
+    "tools/mac/CmdExtractor.app/Contents/MacOS/CmdExtractor",
+    "tools/mac/CmdSender.app/Contents/MacOS/CmdSender",
+    "tools/mac/CmdTlmServer.app/Contents/MacOS/CmdTlmServer",
+    "tools/mac/DataViewer.app/Contents/MacOS/DataViewer",
+    "tools/mac/HandbookCreator.app/Contents/MacOS/HandbookCreator",
+    "tools/mac/Launcher.app/Contents/MacOS/Launcher",
+    "tools/mac/LimitsMonitor.app/Contents/MacOS/LimitsMonitor",
+    "tools/mac/OpenGLBuilder.app/Contents/MacOS/OpenGLBuilder",
+    "tools/mac/PacketViewer.app/Contents/MacOS/PacketViewer",
+    "tools/mac/Replay.app/Contents/MacOS/Replay",
+    "tools/mac/ScriptRunner.app/Contents/MacOS/ScriptRunner",
+    "tools/mac/TableManager.app/Contents/MacOS/TableManager",
+    "tools/mac/TestRunner.app/Contents/MacOS/TestRunner",
+    "tools/mac/TlmExtractor.app/Contents/MacOS/TlmExtractor",
+    "tools/mac/TlmGrapher.app/Contents/MacOS/TlmGrapher",
+    "tools/mac/TlmViewer.app/Contents/MacOS/TlmViewer",
   ]
   # Create the crc.txt file
   crc = Cosmos::Crc32.new(Cosmos::Crc32::DEFAULT_POLY, Cosmos::Crc32::DEFAULT_SEED, true, false)

data/demo/config/data/crc.txt

@@ -85,12 +85,12 @@
 "config/tools/handbook_creator/templates/pdf_cover.html.erb" 0x7AAB9A42
 "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" 0xB6530BE1
+"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/limits_groups.html.erb" 0x40FDF34C
 "config/tools/handbook_creator/templates/nav.html.erb" 0xDF65AAEA
-"config/tools/handbook_creator/templates/footer.html.erb" 0x3A99B2AD
+"config/tools/handbook_creator/templates/footer.html.erb" 0x0E1F9800
 "config/tools/handbook_creator/templates/pdf_footer.html.erb" 0xF0D3EB77
 "config/tools/handbook_creator/templates/overview.html.erb" 0xDC4DD2B8
 "config/tools/tlm_viewer/tlm_viewer.txt" 0x825AF31C
@@ -199,7 +199,7 @@
 "procedures/collect_util.rb" 0x3952EB08
 "procedures/run_example_test.rb" 0x0F244140
 "procedures/clear_util.rb" 0x5B3C1279
-"procedures/example_test.rb" 0x7D98C401
+"procedures/example_test.rb" 0x4FBA73C1
 "procedures/cosmos_api_test.rb" 0x57AE9ED2
 "procedures/test.rb" 0xCE4DA55A
 "procedures/checks.rb" 0x34EEF3E2

data/demo/config/tools/handbook_creator/templates/footer.html.erb

@@ -3,7 +3,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'jquery-1.10.2.min.js') %>"></script>
-    <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'bootstrap.min.js') %>"></script>
+    <script src="<%= File.join('assets', 'js', 'jquery-1.10.2.min.js') %>"></script>
+    <script src="<%= File.join('assets', 'js', 'bootstrap.min.js') %>"></script>
   </body>
 </html>

data/demo/config/tools/handbook_creator/templates/header.html.erb

@@ -10,14 +10,14 @@
     <title><%= title %></title>
 
     <!-- Bootstrap core CSS -->
-    <link href="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'css', 'bootstrap.min.css') %>" rel="stylesheet">
+    <link href="<%= File.join('assets', 'css', 'bootstrap.min.css') %>" rel="stylesheet">
     <!-- Bootstrap theme -->
-    <link href="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'css', 'bootstrap-theme.min.css') %>" rel="stylesheet">
+    <link href="<%= File.join('assets', 'css', 'bootstrap-theme.min.css') %>" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'html5shiv.js') %>"></script>
-      <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'respond.min.js') %>"></script>
+      <script src="<%= File.join('assets', 'js', 'html5shiv.js') %>"></script>
+      <script src="<%= File.join('assets', 'js', 'respond.min.js') %>"></script>
     <![endif]-->
   </head>
 

data/demo/procedures/example_test.rb

@@ -45,7 +45,7 @@ class ExampleTest < Cosmos::Test
   end
 end
 
-# This is an ExampleTestSuiste which only runs ExampleTest
+# This is an ExampleTestSuite which only runs ExampleTest
 class ExampleTestSuite < Cosmos::TestSuite
   def initialize
     super()

data/install/Rakefile

@@ -14,6 +14,22 @@ def create_crc_file(official)
   count = 0
   ignore = [
     # Add filenames here if you don't want them to be CRCed
+    "tools/mac/CmdExtractor.app/Contents/MacOS/CmdExtractor",
+    "tools/mac/CmdSender.app/Contents/MacOS/CmdSender",
+    "tools/mac/CmdTlmServer.app/Contents/MacOS/CmdTlmServer",
+    "tools/mac/DataViewer.app/Contents/MacOS/DataViewer",
+    "tools/mac/HandbookCreator.app/Contents/MacOS/HandbookCreator",
+    "tools/mac/Launcher.app/Contents/MacOS/Launcher",
+    "tools/mac/LimitsMonitor.app/Contents/MacOS/LimitsMonitor",
+    "tools/mac/OpenGLBuilder.app/Contents/MacOS/OpenGLBuilder",
+    "tools/mac/PacketViewer.app/Contents/MacOS/PacketViewer",
+    "tools/mac/Replay.app/Contents/MacOS/Replay",
+    "tools/mac/ScriptRunner.app/Contents/MacOS/ScriptRunner",
+    "tools/mac/TableManager.app/Contents/MacOS/TableManager",
+    "tools/mac/TestRunner.app/Contents/MacOS/TestRunner",
+    "tools/mac/TlmExtractor.app/Contents/MacOS/TlmExtractor",
+    "tools/mac/TlmGrapher.app/Contents/MacOS/TlmGrapher",
+    "tools/mac/TlmViewer.app/Contents/MacOS/TlmViewer",
   ]
   # Create the crc.txt file
   crc = Cosmos::Crc32.new(Cosmos::Crc32::DEFAULT_POLY, Cosmos::Crc32::DEFAULT_SEED, true, false)

data/install/config/data/crc.txt

@@ -25,12 +25,12 @@
 "config/tools/handbook_creator/templates/pdf_cover.html.erb" 0x7AAB9A42
 "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" 0xB6530BE1
+"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/limits_groups.html.erb" 0x40FDF34C
 "config/tools/handbook_creator/templates/nav.html.erb" 0xDF65AAEA
-"config/tools/handbook_creator/templates/footer.html.erb" 0x3A99B2AD
+"config/tools/handbook_creator/templates/footer.html.erb" 0x0E1F9800
 "config/tools/handbook_creator/templates/pdf_footer.html.erb" 0xF0D3EB77
 "config/tools/handbook_creator/templates/overview.html.erb" 0xDC4DD2B8
 "config/tools/tlm_viewer/tlm_viewer.txt" 0xD9071527

data/install/config/tools/handbook_creator/templates/footer.html.erb

@@ -3,7 +3,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'jquery-1.10.2.min.js') %>"></script>
-    <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'bootstrap.min.js') %>"></script>
+    <script src="<%= File.join('assets', 'js', 'jquery-1.10.2.min.js') %>"></script>
+    <script src="<%= File.join('assets', 'js', 'bootstrap.min.js') %>"></script>
   </body>
 </html>

data/install/config/tools/handbook_creator/templates/header.html.erb

@@ -10,14 +10,14 @@
     <title><%= title %></title>
 
     <!-- Bootstrap core CSS -->
-    <link href="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'css', 'bootstrap.min.css') %>" rel="stylesheet">
+    <link href="<%= File.join('assets', 'css', 'bootstrap.min.css') %>" rel="stylesheet">
     <!-- Bootstrap theme -->
-    <link href="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'css', 'bootstrap-theme.min.css') %>" rel="stylesheet">
+    <link href="<%= File.join('assets', 'css', 'bootstrap-theme.min.css') %>" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'html5shiv.js') %>"></script>
-      <script src="file:///<%= File.join(System.paths['HANDBOOKS'], 'assets', 'js', 'respond.min.js') %>"></script>
+      <script src="<%= File.join('assets', 'js', 'html5shiv.js') %>"></script>
+      <script src="<%= File.join('assets', 'js', 'respond.min.js') %>"></script>
     <![endif]-->
   </head>
 

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

@@ -126,74 +126,22 @@ module Cosmos
       begin
         # Gather updated values
         values, limits_states, limits_settings, limits_set = get_tlm_values(@item_array, VALUE_TYPES)
-        if limits_settings[0]
-          if @limits_labels[limits_set]
-            if limits_settings[0][4] and limits_settings[0][5]
-              @limits_labels[limits_set].text = "RL/#{limits_settings[0][0]} YL/#{limits_settings[0][1]} YH/#{limits_settings[0][2]} RH/#{limits_settings[0][3]} GL/#{limits_settings[0][4]} GH/#{limits_settings[0][5]}"
-            else
-              @limits_labels[limits_set].text = "RL/#{limits_settings[0][0]} YL/#{limits_settings[0][1]} YH/#{limits_settings[0][2]} RH/#{limits_settings[0][3]}"
-            end
-          elsif @limits_layout
-            if limits_settings[0][4] and limits_settings[0][5]
-              label = Qt::Label.new("RL/#{limits_settings[0][0]} YL/#{limits_settings[0][1]} YH/#{limits_settings[0][2]} RH/#{limits_settings[0][3]} GL/#{limits_settings[0][4]} GH/#{limits_settings[0][5]}")
-            else
-              label = Qt::Label.new("RL/#{limits_settings[0][0]} YL/#{limits_settings[0][1]} YH/#{limits_settings[0][2]} RH/#{limits_settings[0][3]}")
-            end
-            @limits_labels[limits_set] = label
-            @limits_layout.addRow(tr("#{limits_set}:"), label)
-          end
-        end
-
-        # Determine color
-        color = nil
-        case limits_states[0]
-        when :RED, :RED_HIGH
-          color = Cosmos::RED
-        when :RED_LOW
-          color = Cosmos::RED
-        when :YELLOW, :YELLOW_HIGH
-          color = Cosmos::YELLOW
-        when :YELLOW_LOW
-          color = Cosmos::YELLOW
-        when :GREEN, :GREEN_HIGH
-          color = Cosmos::GREEN
-        when :GREEN_LOW
-          color = Cosmos::GREEN
-        when :BLUE
-          color = Cosmos::BLUE
-        when :STALE
-          color = Cosmos::PURPLE
-        else
-          color = Cosmos::BLACK
-        end
-
-        # Update text fields
-        @raw_value.setColors(color, Cosmos::WHITE)
-        @raw_value.text = values[0].to_s
-        if @hex_raw_value
-          @hex_raw_value.setColors(color, Cosmos::WHITE)
-          set_hex_value(values[0])
-        end
-        @converted_value.setColors(color, Cosmos::WHITE)
-        @converted_value.text = values[1].to_s
-        @formatted_value.setColors(color, Cosmos::WHITE)
-        @formatted_value.text = values[2].to_s
-        @formatted_with_units_value.setColors(color, Cosmos::WHITE)
-        @formatted_with_units_value.text = values[3].to_s
-        @limits_state.setColors(color, Cosmos::WHITE)
-        @limits_state.text = limits_states[0].to_s
+        update_limits_details(limits_settings, limits_set)
+        update_text_fields(values, limits_states[0])
       rescue DRb::DRbConnError
         # Just do nothing
       end
     end
 
+    protected
+
     def set_hex_value(value)
       if Array === value
         text = "["
         value[0..-2].each do |part|
           text << sprintf("0x%0#{@hex_raw_num_digits}X, ", part.to_i)
         end
-        text << sprintf("0x%0#{@hex_raw_num_digits}X", value[-1].to_i) if values[-1]
+        text << sprintf("0x%0#{@hex_raw_num_digits}X", value[-1].to_i) if value[-1]
         text << "]"
         @hex_raw_value.text = text
       else
@@ -201,6 +149,65 @@ module Cosmos
       end
     end
 
+    def update_limits_details(limits_settings, limits_set)
+      if limits_settings[0]
+        label_text = "RL/#{limits_settings[0][0]} YL/#{limits_settings[0][1]} YH/#{limits_settings[0][2]} RH/#{limits_settings[0][3]}"
+        if limits_settings[0][4] and limits_settings[0][5]
+          label_text += " GL/#{limits_settings[0][4]} GH/#{limits_settings[0][5]}"
+        end
+        if @limits_labels[limits_set]
+          @limits_labels[limits_set].text = label_text
+        elsif @limits_layout
+          label = Qt::Label.new(label_text)
+          @limits_labels[limits_set] = label
+          @limits_layout.addRow(tr("#{limits_set}:"), label)
+        end
+      end
+    end
+
+    def determine_limits_color(limit_state)
+      color = nil
+      case limit_state
+      when :RED, :RED_HIGH
+        color = Cosmos::RED
+      when :RED_LOW
+        color = Cosmos::RED
+      when :YELLOW, :YELLOW_HIGH
+        color = Cosmos::YELLOW
+      when :YELLOW_LOW
+        color = Cosmos::YELLOW
+      when :GREEN, :GREEN_HIGH
+        color = Cosmos::GREEN
+      when :GREEN_LOW
+        color = Cosmos::GREEN
+      when :BLUE
+        color = Cosmos::BLUE
+      when :STALE
+        color = Cosmos::PURPLE
+      else
+        color = Cosmos::BLACK
+      end
+      color
+    end
+
+    def update_text_fields(values, limits_state)
+      color = determine_limits_color(limits_state)
+      @raw_value.setColors(color, Cosmos::WHITE)
+      @raw_value.text = values[0].to_s
+      if @hex_raw_value
+        @hex_raw_value.setColors(color, Cosmos::WHITE)
+        set_hex_value(values[0])
+      end
+      @converted_value.setColors(color, Cosmos::WHITE)
+      @converted_value.text = values[1].to_s
+      @formatted_value.setColors(color, Cosmos::WHITE)
+      @formatted_value.text = values[2].to_s
+      @formatted_with_units_value.setColors(color, Cosmos::WHITE)
+      @formatted_with_units_value.text = values[3].to_s
+      @limits_state.setColors(color, Cosmos::WHITE)
+      @limits_state.text = limits_state.to_s
+    end
+
   end # class TlmDetailsDialog
 
 end # module Cosmos