cosmos 3.3.3 → 3.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (109) hide show
  1. checksums.yaml +4 -4
  2. data/.gitattributes +2 -0
  3. data/.travis.yml +2 -1
  4. data/Gemfile +4 -3
  5. data/Manifest.txt +22 -0
  6. data/autohotkey/tools/handbook_creator.ahk +9 -0
  7. data/autohotkey/tools/packet_viewer.ahk +4 -0
  8. data/bin/exchndl20-x64.dll +0 -0
  9. data/bin/exchndl20.dll +0 -0
  10. data/bin/exchndl21-x64.dll +0 -0
  11. data/bin/exchndl21.dll +0 -0
  12. data/bin/exchndl22-x64.dll +0 -0
  13. data/bin/exchndl22.dll +0 -0
  14. data/bin/mgwhelp-x64.dll +0 -0
  15. data/bin/mgwhelp.dll +0 -0
  16. data/cosmos.gemspec +1 -0
  17. data/data/crc.txt +30 -24
  18. data/demo/config/data/crc.txt +3 -3
  19. data/demo/config/tools/handbook_creator/templates/command_packets.html.erb +3 -1
  20. data/demo/config/tools/handbook_creator/templates/telemetry_packets.html.erb +3 -1
  21. data/demo/procedures/cosmos_api_test.rb +1 -1
  22. data/ext/cosmos/ext/low_fragmentation_array/low_fragmentation_array.c +4 -0
  23. data/ext/cosmos/ext/platform/platform.c +22 -2
  24. data/ext/cosmos/ext/structure/structure.c +631 -104
  25. data/ext/cosmos/ext/telemetry/telemetry.c +3 -2
  26. data/lib/cosmos/gui/line_graph/line_graph_drawing.rb +71 -92
  27. data/lib/cosmos/gui/line_graph/overview_graph.rb +1 -1
  28. data/lib/cosmos/gui/qt.rb +38 -24
  29. data/lib/cosmos/gui/text/ruby_editor.rb +1 -1
  30. data/lib/cosmos/packets/binary_accessor.rb +1 -288
  31. data/lib/cosmos/packets/telemetry.rb +2 -1
  32. data/lib/cosmos/script/cmd_tlm_server.rb +110 -0
  33. data/lib/cosmos/script/commands.rb +166 -0
  34. data/lib/cosmos/script/extract.rb +2 -2
  35. data/lib/cosmos/script/limits.rb +108 -0
  36. data/lib/cosmos/script/script.rb +28 -1487
  37. data/lib/cosmos/script/scripting.rb +889 -0
  38. data/lib/cosmos/script/telemetry.rb +174 -0
  39. data/lib/cosmos/script/tools.rb +138 -0
  40. data/lib/cosmos/streams/stream_protocol.rb +9 -6
  41. data/lib/cosmos/system/target.rb +55 -38
  42. data/lib/cosmos/tools/cmd_tlm_server/api.rb +6 -3
  43. data/lib/cosmos/tools/cmd_tlm_server/connections.rb +0 -1
  44. data/lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb +17 -7
  45. data/lib/cosmos/tools/cmd_tlm_server/interface_thread.rb +15 -4
  46. data/lib/cosmos/tools/handbook_creator/handbook_creator.rb +15 -8
  47. data/lib/cosmos/tools/handbook_creator/handbook_creator_config.rb +41 -13
  48. data/lib/cosmos/tools/packet_viewer/packet_viewer.rb +18 -1
  49. data/lib/cosmos/tools/tlm_viewer/widgets/canvasline_widget.rb +1 -1
  50. data/lib/cosmos/tools/tlm_viewer/widgets/canvaslinevalue_widget.rb +1 -1
  51. data/lib/cosmos/tools/tlm_viewer/widgets/limitsbar_widget.rb +1 -1
  52. data/lib/cosmos/tools/tlm_viewer/widgets/rangebar_widget.rb +1 -1
  53. data/lib/cosmos/top_level.rb +1 -1
  54. data/lib/cosmos/utilities/ruby_lex_utils.rb +1 -1
  55. data/lib/cosmos/version.rb +5 -5
  56. data/spec/gui/line_graph/line_clip_spec.rb +6 -6
  57. data/spec/gui/qt_spec.rb +102 -0
  58. data/spec/interfaces/interface_spec.rb +9 -9
  59. data/spec/interfaces/linc_interface_spec.rb +72 -15
  60. data/spec/interfaces/serial_interface_spec.rb +9 -9
  61. data/spec/interfaces/simulated_target_interface_spec.rb +7 -7
  62. data/spec/interfaces/stream_interface_spec.rb +4 -4
  63. data/spec/interfaces/tcpip_client_interface_spec.rb +8 -8
  64. data/spec/interfaces/tcpip_server_interface_spec.rb +9 -9
  65. data/spec/interfaces/udp_interface_spec.rb +20 -20
  66. data/spec/io/json_drb_spec.rb +4 -4
  67. data/spec/io/raw_logger_pair_spec.rb +20 -20
  68. data/spec/io/raw_logger_spec.rb +3 -3
  69. data/spec/io/tcpip_server_spec.rb +9 -9
  70. data/spec/io/udp_sockets_spec.rb +2 -2
  71. data/spec/io/win32_serial_driver_spec.rb +2 -2
  72. data/spec/packets/binary_accessor_spec.rb +143 -6
  73. data/spec/packets/commands_spec.rb +5 -5
  74. data/spec/packets/limits_spec.rb +15 -15
  75. data/spec/packets/packet_config_spec.rb +19 -19
  76. data/spec/packets/packet_item_limits_spec.rb +3 -3
  77. data/spec/packets/packet_item_spec.rb +4 -4
  78. data/spec/packets/packet_spec.rb +33 -33
  79. data/spec/packets/structure_item_spec.rb +19 -19
  80. data/spec/packets/telemetry_spec.rb +6 -6
  81. data/spec/script/cmd_tlm_server_spec.rb +110 -0
  82. data/spec/script/commands_disconnect_spec.rb +270 -0
  83. data/spec/script/commands_spec.rb +288 -0
  84. data/spec/script/limits_spec.rb +153 -0
  85. data/spec/script/script_spec.rb +32 -696
  86. data/spec/script/scripting_spec.rb +436 -0
  87. data/spec/script/telemetry_spec.rb +130 -0
  88. data/spec/script/tools_spec.rb +117 -0
  89. data/spec/spec_helper.rb +10 -5
  90. data/spec/streams/preidentified_stream_protocol_spec.rb +4 -4
  91. data/spec/streams/serial_stream_spec.rb +8 -8
  92. data/spec/streams/stream_protocol_spec.rb +4 -4
  93. data/spec/streams/tcpip_client_stream_spec.rb +3 -3
  94. data/spec/streams/tcpip_socket_stream_spec.rb +7 -7
  95. data/spec/streams/template_stream_protocol_spec.rb +1 -1
  96. data/spec/system/system_spec.rb +6 -6
  97. data/spec/system/target_spec.rb +2 -0
  98. data/spec/tools/cmd_tlm_server/api_spec.rb +17 -17
  99. data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb +5 -5
  100. data/spec/tools/cmd_tlm_server/interface_thread_spec.rb +3 -3
  101. data/spec/top_level/top_level_spec.rb +8 -8
  102. data/spec/utilities/csv_spec.rb +3 -3
  103. data/spec/utilities/message_log_spec.rb +3 -3
  104. data/spec/utilities/ruby_lex_utils_spec.rb +7 -7
  105. data/test/performance/config/tools/launcher/launcher_threads.txt +8 -1
  106. data/test/performance/tools/CmdTlmServerMemProf +1 -1
  107. data/test/performance/tools/TlmGrapherMemProf +19 -0
  108. data/test/performance/tools/TlmGrapherMemProf.bat +59 -0
  109. metadata +38 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6905be44f898d646376eed7979589f246db902fc
4
- data.tar.gz: 31e036723f65f5f99c15a063e771a47e9ca5bde4
3
+ metadata.gz: b04a97dbca71b76b18ea80142176aa1546e4f505
4
+ data.tar.gz: 33eff7d613a595b3680b7a10d37fce8c36beb1bb
5
5
  SHA512:
6
- metadata.gz: 8f2ab3c2735dde4c3e5c3cc7a3e7bb61cb1547474ecc24a443771e6cd1637a11edc55d9c5ec20e717ddd55932da3e6beddf4c121ee251b458111dfb76f43f0ee
7
- data.tar.gz: cf468aa9f08a9b411d0ac2429b94dc00dc377e70f911cd4e2e9dd414e598a287c1f3fb82735a6cce67f8ce709e9ebaf1c3fdbb7e4a3cbf066f9528556e4c15ff
6
+ metadata.gz: 9b37d0e0e7bdaec78e12fdaf98988209b0fdda1ff0a576f937dec3e237b0d9cfe5acf7068eebbf3743debc76ef9a89c9f9768711d574bf95199da6f99f002d05
7
+ data.tar.gz: d4bbff05fb3fd13f8851603d6175833fec77758b8ca505fa7236730a9a2f84d4b5ee0dae1e1049a56e331bed2924c8181f31146b0fb18989564e0feaffa85d13
@@ -0,0 +1,2 @@
1
+ # Declare files that will always have CRLF line endings on checkout.
2
+ *.bat text eol=crlf
@@ -3,5 +3,6 @@ sudo: false
3
3
  cache: bundler
4
4
  rvm:
5
5
  - 2.0.0
6
- - 2.1.3
6
+ - 2.1.6
7
+ - 2.2.2
7
8
  script: bundle exec rake build spec
data/Gemfile CHANGED
@@ -3,7 +3,8 @@
3
3
  source 'https://rubygems.org'
4
4
 
5
5
  gem 'ruby-termios', '~> 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i
6
- group :development do
7
- gem 'wdm', '>= 0.1.0', :platforms => [:mswin, :mingw]
8
- end
6
+ # This is commented out because wdm does not currently support Ruby 2.2
7
+ #group :development do
8
+ # gem 'wdm', '>= 0.1.0', :platforms => [:mswin, :mingw]
9
+ #end
9
10
  gemspec
@@ -1,4 +1,5 @@
1
1
  .coveralls.yml
2
+ .gitattributes
2
3
  .gitignore
3
4
  .travis.yml
4
5
  CONTRIBUTING.txt
@@ -181,8 +182,13 @@ autohotkey/tools/tlm_viewer5.ahk
181
182
  autohotkey/userpath.txt
182
183
  bin/cosmos
183
184
  bin/cstol_converter
185
+ bin/exchndl20-x64.dll
184
186
  bin/exchndl20.dll
187
+ bin/exchndl21-x64.dll
185
188
  bin/exchndl21.dll
189
+ bin/exchndl22-x64.dll
190
+ bin/exchndl22.dll
191
+ bin/mgwhelp-x64.dll
186
192
  bin/mgwhelp.dll
187
193
  bin/rubysloc
188
194
  cosmos.gemspec
@@ -825,8 +831,14 @@ lib/cosmos/processors/processor.rb
825
831
  lib/cosmos/processors/statistics_processor.rb
826
832
  lib/cosmos/processors/watermark_processor.rb
827
833
  lib/cosmos/script.rb
834
+ lib/cosmos/script/cmd_tlm_server.rb
835
+ lib/cosmos/script/commands.rb
828
836
  lib/cosmos/script/extract.rb
837
+ lib/cosmos/script/limits.rb
829
838
  lib/cosmos/script/script.rb
839
+ lib/cosmos/script/scripting.rb
840
+ lib/cosmos/script/telemetry.rb
841
+ lib/cosmos/script/tools.rb
830
842
  lib/cosmos/streams/burst_stream_protocol.rb
831
843
  lib/cosmos/streams/fixed_stream_protocol.rb
832
844
  lib/cosmos/streams/length_stream_protocol.rb
@@ -1032,6 +1044,7 @@ spec/core_ext/string_spec.rb
1032
1044
  spec/core_ext/stringio_spec.rb
1033
1045
  spec/core_ext/time_spec.rb
1034
1046
  spec/gui/line_graph/line_clip_spec.rb
1047
+ spec/gui/qt_spec.rb
1035
1048
  spec/install/config/system/system.txt
1036
1049
  spec/install/config/targets/COSMOS/cmd_tlm/cosmos_server_cmds.txt
1037
1050
  spec/install/config/targets/COSMOS/cmd_tlm/cosmos_server_tlm.txt
@@ -1100,7 +1113,14 @@ spec/processors/new_packet_log_processor_spec.rb
1100
1113
  spec/processors/processor_spec.rb
1101
1114
  spec/processors/statistics_processor_spec.rb
1102
1115
  spec/processors/watermark_processor_spec.rb
1116
+ spec/script/cmd_tlm_server_spec.rb
1117
+ spec/script/commands_disconnect_spec.rb
1118
+ spec/script/commands_spec.rb
1119
+ spec/script/limits_spec.rb
1103
1120
  spec/script/script_spec.rb
1121
+ spec/script/scripting_spec.rb
1122
+ spec/script/telemetry_spec.rb
1123
+ spec/script/tools_spec.rb
1104
1124
  spec/spec_helper.rb
1105
1125
  spec/streams/burst_stream_protocol_spec.rb
1106
1126
  spec/streams/fixed_stream_protocol_spec.rb
@@ -1265,6 +1285,8 @@ test/performance/tools/TlmExtractor
1265
1285
  test/performance/tools/TlmExtractor.bat
1266
1286
  test/performance/tools/TlmGrapher
1267
1287
  test/performance/tools/TlmGrapher.bat
1288
+ test/performance/tools/TlmGrapherMemProf
1289
+ test/performance/tools/TlmGrapherMemProf.bat
1268
1290
  test/performance/tools/TlmViewer
1269
1291
  test/performance/tools/TlmViewer.bat
1270
1292
  test/performance/tools/mac/CmdExtractor.app/Contents/Info.plist
@@ -19,5 +19,14 @@ Click 55 165 ; Open in browser HC-4
19
19
  Sleep 2000
20
20
  WinActivate Handbook Creator
21
21
  Sleep 500
22
+ Send ^h ; Hide ignored parameters / items
23
+ Sleep 500
24
+ Click 55 75 ; Create HTML HC-1
25
+ WinWaitActive Done
26
+ Send {Enter}
27
+ WinWaitActive Handbook Creator
28
+ Click 55 165 ; Open in browser HC-4
29
+ Sleep 2000
30
+ WinActivate Handbook Creator
22
31
  Send ^q
23
32
 
@@ -57,6 +57,10 @@ Send ^b ; Toggle colorblind mode PV-7, PV-9
57
57
  Sleep 500
58
58
  Send ^c ; Switch to normal converted telemetry display PV-10
59
59
  Sleep 500
60
+ Send ^h ; Hide ignored items
61
+ Sleep 2000
62
+ Send ^h ; Show ignored items
63
+ Sleep 1000
60
64
  Click 450 95
61
65
  Sleep 500
62
66
  Send {Down}{Enter} ; Target: INST/IMAGE
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
@@ -93,6 +93,7 @@ spec = Gem::Specification.new do |s|
93
93
  s.add_development_dependency 'simplecov', '~> 0.9'
94
94
  s.add_development_dependency 'ruby-prof', '~> 0.15'
95
95
  s.add_development_dependency 'coveralls', '~> 0.7'
96
+ s.add_development_dependency 'benchmark-ips', '~> 2'
96
97
 
97
98
  s.post_install_message = "Thanks for installing Ball Aerospace COSMOS!\nStart your first project with: cosmos demo demo\n"
98
99
  end
@@ -1,6 +1,6 @@
1
1
  "lib/cosmos/ccsds/ccsds_parser.rb" 0x89A5FB3A
2
2
  "lib/cosmos/ccsds/ccsds_packet.rb" 0xA30EE27E
3
- "lib/cosmos/system/target.rb" 0x52287176
3
+ "lib/cosmos/system/target.rb" 0x9AA2537D
4
4
  "lib/cosmos/system/system.rb" 0x6C509559
5
5
  "lib/cosmos/win32/win32_main.rb" 0xC71EBE12
6
6
  "lib/cosmos/win32/win32.rb" 0xEF748B06
@@ -18,7 +18,7 @@
18
18
  "lib/cosmos/conversions/polynomial_conversion.rb" 0xF6440F21
19
19
  "lib/cosmos/conversions/received_count_conversion.rb" 0xD61BEB37
20
20
  "lib/cosmos/utilities.rb" 0xBE9CEAF4
21
- "lib/cosmos/top_level.rb" 0xA70518D6
21
+ "lib/cosmos/top_level.rb" 0x10625804
22
22
  "lib/cosmos/packet_logs/meta_packet_log_writer.rb" 0x860D1FD8
23
23
  "lib/cosmos/packet_logs/packet_log_writer.rb" 0x75E82380
24
24
  "lib/cosmos/packet_logs/packet_log_writer_pair.rb" 0xB4DCA156
@@ -26,14 +26,14 @@
26
26
  "lib/cosmos/packet_logs/packet_log_reader.rb" 0xA347D992
27
27
  "lib/cosmos/utilities/message_log.rb" 0xB34783DF
28
28
  "lib/cosmos/utilities/crc.rb" 0xCDAFB844
29
- "lib/cosmos/utilities/ruby_lex_utils.rb" 0x270B0580
29
+ "lib/cosmos/utilities/ruby_lex_utils.rb" 0x58A6CAF8
30
30
  "lib/cosmos/utilities/logger.rb" 0xD39FB903
31
31
  "lib/cosmos/utilities/sleeper.rb" 0x650C3CEB
32
32
  "lib/cosmos/utilities/quaternion.rb" 0xCCB7A898
33
33
  "lib/cosmos/utilities/csv.rb" 0x9F794965
34
34
  "lib/cosmos/utilities/low_fragmentation_array.rb" 0x7E797C76
35
35
  "lib/cosmos/utilities/simulated_target.rb" 0x7EE7A3FF
36
- "lib/cosmos/gui/qt.rb" 0xE384005F
36
+ "lib/cosmos/gui/qt.rb" 0xD90E0333
37
37
  "lib/cosmos/gui/dialogs/find_replace_dialog.rb" 0x4627C7A5
38
38
  "lib/cosmos/gui/dialogs/set_tlm_dialog.rb" 0x02A207C9
39
39
  "lib/cosmos/gui/dialogs/exception_dialog.rb" 0xEAC9F814
@@ -60,14 +60,14 @@
60
60
  "lib/cosmos/gui/widgets/packet_log_frame.rb" 0xF9312CBD
61
61
  "lib/cosmos/gui/line_graph/line_graph.rb" 0x6761DE9A
62
62
  "lib/cosmos/gui/line_graph/line_graph_popups.rb" 0x6B6BD351
63
- "lib/cosmos/gui/line_graph/line_graph_drawing.rb" 0xA68F7552
64
- "lib/cosmos/gui/line_graph/overview_graph.rb" 0xEDD6D64A
63
+ "lib/cosmos/gui/line_graph/line_graph_drawing.rb" 0x718C2DDA
64
+ "lib/cosmos/gui/line_graph/overview_graph.rb" 0x8FCDCE33
65
65
  "lib/cosmos/gui/line_graph/line_graph_dialog.rb" 0xF73F68CB
66
66
  "lib/cosmos/gui/line_graph/lines.rb" 0x871CA030
67
67
  "lib/cosmos/gui/line_graph/line_graph_script.rb" 0x9FD973A1
68
68
  "lib/cosmos/gui/line_graph/line_graph_scaling.rb" 0xBF57D9F7
69
69
  "lib/cosmos/gui/text/completion_text_edit.rb" 0xCF57B24D
70
- "lib/cosmos/gui/text/ruby_editor.rb" 0xEE6E87E6
70
+ "lib/cosmos/gui/text/ruby_editor.rb" 0x25FF81E3
71
71
  "lib/cosmos/gui/text/completion_line_edit.rb" 0x16E0A174
72
72
  "lib/cosmos/gui/text/completion.rb" 0x38329713
73
73
  "lib/cosmos/gui/opengl/stl_shape.rb" 0xDC46B33A
@@ -108,25 +108,25 @@
108
108
  "lib/cosmos/tools/tlm_extractor/tlm_extractor_config.rb" 0x7779DCEC
109
109
  "lib/cosmos/tools/tlm_extractor/text_item_chooser.rb" 0x587768C6
110
110
  "lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb" 0xA1C38662
111
- "lib/cosmos/tools/cmd_tlm_server/api.rb" 0xB1819524
112
- "lib/cosmos/tools/cmd_tlm_server/connections.rb" 0x6657A0FB
111
+ "lib/cosmos/tools/cmd_tlm_server/api.rb" 0x43A203B4
112
+ "lib/cosmos/tools/cmd_tlm_server/connections.rb" 0x6DC54689
113
113
  "lib/cosmos/tools/cmd_tlm_server/background_task.rb" 0x448A2191
114
114
  "lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server.rb" 0x73AC5F0A
115
115
  "lib/cosmos/tools/cmd_tlm_server/router_thread.rb" 0x5070D428
116
116
  "lib/cosmos/tools/cmd_tlm_server/background_tasks.rb" 0xAE192026
117
117
  "lib/cosmos/tools/cmd_tlm_server/gui/targets_tab.rb" 0xC1D7D2BF
118
118
  "lib/cosmos/tools/cmd_tlm_server/gui/status_tab.rb" 0x9136F03E
119
- "lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb" 0x305FBD73
119
+ "lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb" 0xEFB119C2
120
120
  "lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb" 0xFF291A22
121
121
  "lib/cosmos/tools/cmd_tlm_server/gui/packets_tab.rb" 0xD8916AE8
122
122
  "lib/cosmos/tools/cmd_tlm_server/routers.rb" 0xF8C93062
123
123
  "lib/cosmos/tools/cmd_tlm_server/packet_logging.rb" 0x166BE402
124
124
  "lib/cosmos/tools/cmd_tlm_server/commanding.rb" 0xC7C76CD8
125
125
  "lib/cosmos/tools/cmd_tlm_server/interfaces.rb" 0x10BC320E
126
- "lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x5144683A
126
+ "lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x38E5ECE5
127
127
  "lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0x6C738F54
128
128
  "lib/cosmos/tools/limits_monitor/limits_monitor.rb" 0xD33984F4
129
- "lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0x12D1B643
129
+ "lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0x859EC490
130
130
  "lib/cosmos/tools/table_manager/table_manager.rb" 0x4FC4AE95
131
131
  "lib/cosmos/tools/table_manager/table.rb" 0x923A8589
132
132
  "lib/cosmos/tools/table_manager/table_item.rb" 0x08A9A262
@@ -174,8 +174,8 @@
174
174
  "lib/cosmos/tools/tlm_grapher/data_objects/housekeeping_data_object.rb" 0x0485208B
175
175
  "lib/cosmos/tools/tlm_grapher/data_objects/linegraph_data_object.rb" 0x58D45CBE
176
176
  "lib/cosmos/tools/tlm_grapher/data_objects/data_object.rb" 0xE3D40CD6
177
- "lib/cosmos/tools/handbook_creator/handbook_creator_config.rb" 0x11198CC9
178
- "lib/cosmos/tools/handbook_creator/handbook_creator.rb" 0x263A9DD2
177
+ "lib/cosmos/tools/handbook_creator/handbook_creator_config.rb" 0x28A7060A
178
+ "lib/cosmos/tools/handbook_creator/handbook_creator.rb" 0x1D78FFD9
179
179
  "lib/cosmos/tools/tlm_viewer/screen.rb" 0xEBC2A043
180
180
  "lib/cosmos/tools/tlm_viewer/tlm_viewer_config.rb" 0xD1C9093A
181
181
  "lib/cosmos/tools/tlm_viewer/widgets.rb" 0x6D47EAF0
@@ -186,7 +186,7 @@
186
186
  "lib/cosmos/tools/tlm_viewer/widgets/aging_widget.rb" 0xF86604BD
187
187
  "lib/cosmos/tools/tlm_viewer/widgets/labelvalue_widget.rb" 0x3A167C64
188
188
  "lib/cosmos/tools/tlm_viewer/widgets/sectionheader_widget.rb" 0x0CDABB7D
189
- "lib/cosmos/tools/tlm_viewer/widgets/limitsbar_widget.rb" 0xABADAEE7
189
+ "lib/cosmos/tools/tlm_viewer/widgets/limitsbar_widget.rb" 0x37B72108
190
190
  "lib/cosmos/tools/tlm_viewer/widgets/labelvaluedesc_widget.rb" 0x9FDF915A
191
191
  "lib/cosmos/tools/tlm_viewer/widgets/progressbar_widget.rb" 0x88E04062
192
192
  "lib/cosmos/tools/tlm_viewer/widgets/trendbar_widget.rb" 0xCC7F70CC
@@ -200,7 +200,7 @@
200
200
  "lib/cosmos/tools/tlm_viewer/widgets/scrollwindow_widget.rb" 0x9CF64770
201
201
  "lib/cosmos/tools/tlm_viewer/widgets/label_widget.rb" 0x5158C883
202
202
  "lib/cosmos/tools/tlm_viewer/widgets/labelvaluelimitsbar_widget.rb" 0xF8B0AEA6
203
- "lib/cosmos/tools/tlm_viewer/widgets/rangebar_widget.rb" 0x6795FA4E
203
+ "lib/cosmos/tools/tlm_viewer/widgets/rangebar_widget.rb" 0x6264A25A
204
204
  "lib/cosmos/tools/tlm_viewer/widgets/textbox_widget.rb" 0x9208702E
205
205
  "lib/cosmos/tools/tlm_viewer/widgets/layout_widget.rb" 0x799D4376
206
206
  "lib/cosmos/tools/tlm_viewer/widgets/value_widget.rb" 0x4D6A92A7
@@ -220,7 +220,7 @@
220
220
  "lib/cosmos/tools/tlm_viewer/widgets/canvasvalue_widget.rb" 0x607D0CD1
221
221
  "lib/cosmos/tools/tlm_viewer/widgets/canvasimagevalue_widget.rb" 0xBDC6E676
222
222
  "lib/cosmos/tools/tlm_viewer/widgets/linegraph_widget.rb" 0xB44C5BB5
223
- "lib/cosmos/tools/tlm_viewer/widgets/canvasline_widget.rb" 0xCE712FD9
223
+ "lib/cosmos/tools/tlm_viewer/widgets/canvasline_widget.rb" 0xB92B5C5F
224
224
  "lib/cosmos/tools/tlm_viewer/widgets/valuelimitsbar_widget.rb" 0x6AB7A663
225
225
  "lib/cosmos/tools/tlm_viewer/widgets/canvasimage_widget.rb" 0xBE7452ED
226
226
  "lib/cosmos/tools/tlm_viewer/widgets/vertical_widget.rb" 0x3EB40B71
@@ -228,13 +228,13 @@
228
228
  "lib/cosmos/tools/tlm_viewer/widgets/tabbook_widget.rb" 0xD19A5F86
229
229
  "lib/cosmos/tools/tlm_viewer/widgets/radiobutton_widget.rb" 0x192594BB
230
230
  "lib/cosmos/tools/tlm_viewer/widgets/tabitem_widget.rb" 0x390CA44D
231
- "lib/cosmos/tools/tlm_viewer/widgets/canvaslinevalue_widget.rb" 0x69740A8B
231
+ "lib/cosmos/tools/tlm_viewer/widgets/canvaslinevalue_widget.rb" 0xA2867A1C
232
232
  "lib/cosmos/tools/tlm_viewer/widgets/button_widget.rb" 0x189ED964
233
233
  "lib/cosmos/tools/tlm_viewer/widgets/block_widget.rb" 0x03D30FA7
234
234
  "lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x1D2090F6
235
235
  "lib/cosmos/system.rb" 0x735DFB42
236
236
  "lib/cosmos/conversions.rb" 0x43679D05
237
- "lib/cosmos/version.rb" 0x8E278DA3
237
+ "lib/cosmos/version.rb" 0x577222AD
238
238
  "lib/cosmos/core_ext.rb" 0x1951B346
239
239
  "lib/cosmos/interfaces.rb" 0x7E3EA326
240
240
  "lib/cosmos/processors.rb" 0x5241327D
@@ -244,7 +244,7 @@
244
244
  "lib/cosmos/streams/terminated_stream_protocol.rb" 0x5DBDE591
245
245
  "lib/cosmos/streams/stream.rb" 0xFD0A41B9
246
246
  "lib/cosmos/streams/serial_stream.rb" 0x9F0BBA1D
247
- "lib/cosmos/streams/stream_protocol.rb" 0x5EA23890
247
+ "lib/cosmos/streams/stream_protocol.rb" 0xEC382CA0
248
248
  "lib/cosmos/streams/fixed_stream_protocol.rb" 0x5F6F224B
249
249
  "lib/cosmos/streams/tcpip_client_stream.rb" 0xA644ADBA
250
250
  "lib/cosmos/streams/tcpip_socket_stream.rb" 0xC66F984E
@@ -256,7 +256,7 @@
256
256
  "lib/cosmos/packets/limits_response.rb" 0x9C5E8444
257
257
  "lib/cosmos/packets/commands.rb" 0x1A33428E
258
258
  "lib/cosmos/packets/structure.rb" 0xC8524C43
259
- "lib/cosmos/packets/telemetry.rb" 0x5A769DE7
259
+ "lib/cosmos/packets/telemetry.rb" 0xFBD85016
260
260
  "lib/cosmos/packets/parsers/format_string_parser.rb" 0x8015C5E3
261
261
  "lib/cosmos/packets/parsers/packet_parser.rb" 0xEA0AF2C6
262
262
  "lib/cosmos/packets/parsers/packet_item_parser.rb" 0x8DB06663
@@ -266,7 +266,7 @@
266
266
  "lib/cosmos/packets/parsers/macro_parser.rb" 0x8454D5AE
267
267
  "lib/cosmos/packets/parsers/limits_response_parser.rb" 0x05979119
268
268
  "lib/cosmos/packets/packet_config.rb" 0xFDD8F251
269
- "lib/cosmos/packets/binary_accessor.rb" 0xF913F2EA
269
+ "lib/cosmos/packets/binary_accessor.rb" 0x7D41D474
270
270
  "lib/cosmos/packets/packet.rb" 0x043EF800
271
271
  "lib/cosmos/packets/structure_item.rb" 0xBDC81085
272
272
  "lib/cosmos/packets/packet_item_limits.rb" 0xE187C389
@@ -299,8 +299,14 @@
299
299
  "lib/cosmos/interfaces/tcpip_client_interface.rb" 0x5F0DB50D
300
300
  "lib/cosmos/interfaces/udp_interface.rb" 0xCE4532AD
301
301
  "lib/cosmos/interfaces/tcpip_server_interface.rb" 0xC8F6E908
302
- "lib/cosmos/script/script.rb" 0x472901A7
303
- "lib/cosmos/script/extract.rb" 0xF3243476
302
+ "lib/cosmos/script/limits.rb" 0x5876951A
303
+ "lib/cosmos/script/commands.rb" 0xA69088BE
304
+ "lib/cosmos/script/telemetry.rb" 0x2AFB0DCB
305
+ "lib/cosmos/script/cmd_tlm_server.rb" 0x15F91C95
306
+ "lib/cosmos/script/scripting.rb" 0xCE39AAE9
307
+ "lib/cosmos/script/tools.rb" 0x8565EDC5
308
+ "lib/cosmos/script/script.rb" 0xF1B3E1F2
309
+ "lib/cosmos/script/extract.rb" 0xD5C628EF
304
310
  "lib/cosmos/core_ext/range.rb" 0x0D55D9D1
305
311
  "lib/cosmos/core_ext/stringio.rb" 0x28B64FB4
306
312
  "lib/cosmos/core_ext/file.rb" 0x1309270C
@@ -86,8 +86,8 @@
86
86
  "config/tools/handbook_creator/templates/pdf_header.html.erb" 0x3020FEE1
87
87
  "config/tools/handbook_creator/templates/telemetry_toc.html.erb" 0x610E3BC5
88
88
  "config/tools/handbook_creator/templates/header.html.erb" 0x1E490C2A
89
- "config/tools/handbook_creator/templates/telemetry_packets.html.erb" 0x44BD9695
90
- "config/tools/handbook_creator/templates/command_packets.html.erb" 0x9897CA7A
89
+ "config/tools/handbook_creator/templates/telemetry_packets.html.erb" 0x86F3E5E0
90
+ "config/tools/handbook_creator/templates/command_packets.html.erb" 0xFAD7FDA1
91
91
  "config/tools/handbook_creator/templates/limits_groups.html.erb" 0x40FDF34C
92
92
  "config/tools/handbook_creator/templates/nav.html.erb" 0xDF65AAEA
93
93
  "config/tools/handbook_creator/templates/footer.html.erb" 0x0E1F9800
@@ -200,7 +200,7 @@
200
200
  "procedures/run_example_test.rb" 0x0F244140
201
201
  "procedures/clear_util.rb" 0x5B3C1279
202
202
  "procedures/example_test.rb" 0x4FBA73C1
203
- "procedures/cosmos_api_test.rb" 0x57AE9ED2
203
+ "procedures/cosmos_api_test.rb" 0x54B5DC56
204
204
  "procedures/test.rb" 0xCE4DA55A
205
205
  "procedures/checks.rb" 0x34EEF3E2
206
206
  "procedures/collect.rb" 0x3E52C327
@@ -4,6 +4,8 @@
4
4
  <h2><%= "#{packet.target_name} #{packet.packet_name}" %></h2>
5
5
  <div><span style="font-size:18px;background:#555555;color:white;"><%= packet.hazardous ? 'Hazardous' : '' %></span></div>
6
6
  <div><%= packet.description %></div>
7
+ <% items = packet.sorted_items.reject{|item| ignored[packet.target_name].include? item.name} %>
8
+ <% next if items.empty? %>
7
9
  <table class="table table-striped">
8
10
  <thead>
9
11
  <tr>
@@ -19,7 +21,7 @@
19
21
  </tr>
20
22
  <thead>
21
23
  <tbody>
22
- <% packet.sorted_items.each do |item| %>
24
+ <% items.each do |item| %>
23
25
  <tr>
24
26
  <td>
25
27
  <%= item.name %>
@@ -3,6 +3,8 @@
3
3
  <div id="tlm_<%= "#{packet.target_name}_#{packet.packet_name}" %>">
4
4
  <h2><%= "#{packet.target_name} #{packet.packet_name}" %></h2>
5
5
  <div><%= packet.description %></div>
6
+ <% items = packet.sorted_items.reject{|item| ignored[packet.target_name].include? item.name} %>
7
+ <% next if items.empty? %>
6
8
  <table class="table table-striped">
7
9
  <thead>
8
10
  <tr>
@@ -16,7 +18,7 @@
16
18
  </tr>
17
19
  <thead>
18
20
  <tbody>
19
- <% packet.sorted_items.each do |item| %>
21
+ <% items.each do |item| %>
20
22
  <tr>
21
23
  <td><%= item.name %></td>
22
24
  <td>
@@ -162,7 +162,7 @@ expected_list = [["CCSDSVER", 0, nil, "CCSDS primary header version number", nil
162
162
  ["CCSDSAPID", 999, nil, "CCSDS primary header application id", nil, nil, false],
163
163
  ["CCSDSSEQFLAGS", 3, nil, "CCSDS primary header sequence flags", nil, nil, false],
164
164
  ["CCSDSSEQCNT", 0, nil, "CCSDS primary header sequence count", nil, nil, false],
165
- ["CCSDSLENGTH", 0, nil, "CCSDS primary header packet length", nil, nil, false],
165
+ ["CCSDSLENGTH", 12, nil, "CCSDS primary header packet length", nil, nil, false],
166
166
  ["PKTID", 1, nil, "Packet id", nil, nil, false],
167
167
  ["TYPE", 0, {"NORMAL"=>0, "SPECIAL"=>1}, "Collect type", nil, nil, true],
168
168
  ["DURATION", 1.0, nil, "Collect duration", nil, nil, false],
@@ -243,7 +243,11 @@ static VALUE capacity (VALUE self)
243
243
  */
244
244
  static VALUE pointer (VALUE self)
245
245
  {
246
+ #if __x86_64__
247
+ return LL2NUM((long long) RARRAY_PTR(self));
248
+ #else
246
249
  return LONG2NUM((long) RARRAY_PTR(self));
250
+ #endif
247
251
  }
248
252
 
249
253
  /*
@@ -29,6 +29,7 @@ VALUE cSegFault = Qnil;
29
29
  time_t rawtime;
30
30
  struct tm *timeinfo;
31
31
  char filename[256];
32
+ FILE* file = NULL;
32
33
 
33
34
  signal(SIGSEGV, SIG_DFL);
34
35
  signal(SIGILL, SIG_DFL);
@@ -47,8 +48,13 @@ VALUE cSegFault = Qnil;
47
48
  timeinfo->tm_hour,
48
49
  timeinfo->tm_min,
49
50
  timeinfo->tm_sec);
50
- freopen(filename, "a", stderr);
51
- rb_bug("COSMOS caught segfault");
51
+ file = freopen(filename, "a", stderr);
52
+ /* Using file removes a warning */
53
+ if (file) {
54
+ rb_bug("COSMOS caught segfault");
55
+ } else {
56
+ rb_bug("COSMOS caught segfault");
57
+ }
52
58
  }
53
59
  #endif
54
60
 
@@ -65,11 +71,25 @@ void Init_platform (void) {
65
71
  #ifdef _WIN32
66
72
  VALUE ruby_version = rb_const_get(rb_cObject, rb_intern("RUBY_VERSION"));
67
73
  char* rversion = RSTRING_PTR(ruby_version);
74
+
75
+ #if __x86_64__
76
+ if ((rversion[0] == '2') && (rversion[2] == '0')) {
77
+ LoadLibraryA("exchndl20-x64.dll");
78
+ } else if ((rversion[0] == '2') && (rversion[2] == '1')) {
79
+ LoadLibraryA("exchndl21-x64.dll");
80
+ } else if ((rversion[0] == '2') && (rversion[2] == '2')) {
81
+ LoadLibraryA("exchndl22-x64.dll");
82
+ }
83
+ #else
68
84
  if ((rversion[0] == '2') && (rversion[2] == '0')) {
69
85
  LoadLibraryA("exchndl20.dll");
70
86
  } else if ((rversion[0] == '2') && (rversion[2] == '1')) {
71
87
  LoadLibraryA("exchndl21.dll");
88
+ } else if ((rversion[0] == '2') && (rversion[2] == '2')) {
89
+ LoadLibraryA("exchndl22.dll");
72
90
  }
91
+ #endif
92
+
73
93
  #else
74
94
  signal(SIGSEGV, catch_sigsegv);
75
95
  signal(SIGILL, catch_sigsegv);