cosmos 3.5.3 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df21dbeb06b5f5b922a79b5c7806640c169a9e96
-  data.tar.gz: 070302ef24249cb71e190b8e71af1f75b1ba6be8
+  metadata.gz: 46c831622d8bb205d35bbb73d5b72d93c9923028
+  data.tar.gz: 5dd0f0bbf288ba2595cb4e541b019bc1069f3ab3
 SHA512:
-  metadata.gz: d5f38472e2de8025beca2d3e5fbaa90180a34ad7db0814f4c9361a5d7a0735ca1ef79582836e64c71aadfe1f629364020d6654224ed1230dc82328de1dac3f7b
-  data.tar.gz: f08e5e614bdcd3a4435bd6b8c70f753e73689620eaf462a8b01ee396616d3813bbcfa813e479b81ed05751ad2117a582a1146885b4bf83e8cef334dacc242d64
+  metadata.gz: 0dcd9a36210998709f829d5488f4f90a7ed69029df35f20fcc080027e212b23e26911c80a6957115829ca0b97691d0df8ffd59d86825cb0af0829462e1bbb77f
+  data.tar.gz: 2912f264846633602ffcd2fcaeed692ed39b1ad8fc38a69678eb540b185fdc40c7b8cdf44dde502eb7a3d6701c450dd1cdf6e3e409ad8afd984d15ac6d66cfaa

data/Gemfile

@@ -1,6 +1,6 @@
 # encoding: ascii-8bit
 
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 
 gem 'ruby-termios', '~> 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i
 # This is commented out because wdm does not currently support Ruby 2.2

data/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

data/autohotkey/procedures/script_test.rb

@@ -14,4 +14,8 @@ step_mode
 wait 0.5
 run_mode
 show_backtrace
+puts save_file_dialog()
+puts open_file_dialog(Dir.pwd)
+puts open_files_dialog(__FILE__, "Select something!!!")
+puts open_directory_dialog()
 start("clear_util.rb")

data/autohotkey/tools/script_runner2.ahk

@@ -20,6 +20,19 @@ Sleep 500
 Click 400 90 ; Go
 Sleep 500
 Click 400 90 ; Go
+Sleep 1000
+WinWaitActive Save File
+Sleep 500
+Send {Esc}
+WinWaitActive Open File
+Sleep 500
+Send {Esc}
+WinWaitActive Select something!!!
+Sleep 500
+Send {Esc}
+WinWaitActive Open Directory
+Sleep 500
+Send {Esc}
 Sleep 3000
 
 WinActivate Telemetry Viewer

data/cosmos.gemspec

@@ -90,9 +90,9 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'listen', '~> 2.0'
   s.add_development_dependency 'guard-bundler', '~> 2.0'
   s.add_development_dependency 'guard-rspec', '~> 4.0'
-  s.add_development_dependency 'simplecov', '~> 0.9.0'
+  s.add_development_dependency 'simplecov', '~> 0.10'
   s.add_development_dependency 'ruby-prof', '~> 0.15.0'
-  s.add_development_dependency 'coveralls', '~> 0.7.0'
+  s.add_development_dependency 'coveralls', '~> 0.8'
   s.add_development_dependency 'benchmark-ips', '~> 2.0'
 
   s.post_install_message = "Thanks for installing Ball Aerospace COSMOS!\nStart your first project with: cosmos demo demo\n"

data/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

data/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,10 +64,11 @@
 "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
@@ -73,7 +76,7 @@
 "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

data/demo/config/targets/INST/cmd_tlm/_ccsds_cmd.txt

@@ -0,0 +1,9 @@
+  PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
+  PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
+  PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
+  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
+  PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
+  PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
+    OVERFLOW TRUNCATE
+  PARAMETER    CCSDSLENGTH    32  16  UINT  0 65535   12 "CCSDS primary header packet length"
+  ID_PARAMETER PKTID          48  16  UINT  0 65535   <%= id %> "Packet id"

data/demo/config/targets/INST/cmd_tlm/_ccsds_tlm.txt

@@ -0,0 +1,19 @@
+  APPEND_ITEM CCSDSVER      3 UINT   "CCSDS packet version number (See CCSDS 133.0-B-1)"
+  APPEND_ITEM CCSDSTYPE     1 UINT   "CCSDS packet type (command or telemetry)"
+    STATE TLM 0
+    STATE CMD 1
+  APPEND_ITEM CCSDSSHF      1 UINT   "CCSDS secondary header flag"
+    STATE FALSE 0
+    STATE TRUE 1
+  APPEND_ID_ITEM CCSDSAPID 11 UINT <%= apid %> "CCSDS application process id"
+  APPEND_ITEM CCSDSSEQFLAGS 2 UINT   "CCSDS sequence flags"
+    STATE FIRST 1
+    STATE CONT 0
+    STATE LAST 2
+    STATE NOGROUP 3
+  APPEND_ITEM CCSDSSEQCNT  14 UINT   "CCSDS packet sequence count"
+    OVERFLOW TRUNCATE
+  APPEND_ITEM CCSDSLENGTH  16 UINT   "CCSDS packet data length"
+  APPEND_ITEM TIMESEC      32 UINT   "Seconds since epoch (January 1st, 1970, midnight)"
+  APPEND_ITEM TIMEUS       32 UINT   "Microseconds of second"
+  APPEND_ID_ITEM PKTID     16 UINT 1 "Packet id (The combination of CCSDS_APID and PACKET_ID identify the packet)"

data/demo/config/targets/INST/cmd_tlm/inst_cmds.txt

@@ -1,13 +1,5 @@
 COMMAND INST COLLECT BIG_ENDIAN "Starts a collect on the instrument"
-  PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
-  PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
-  PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
-  PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
-  PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
-    OVERFLOW TRUNCATE
-  PARAMETER    CCSDSLENGTH    32  16  UINT  0 65535   12 "CCSDS primary header packet length"
-  ID_PARAMETER PKTID          48  16  UINT  0 65535   1 "Packet id"
+  <%= render "_ccsds_cmd.txt", locals: {id: 1} %>
   PARAMETER    TYPE           64  16  UINT  0 65535   0 "Collect type"
     REQUIRED
     STATE NORMAL  0
@@ -19,103 +11,46 @@ COMMAND INST COLLECT BIG_ENDIAN "Starts a collect on the instrument"
     UNITS Celcius C
 
 COMMAND INST ABORT BIG_ENDIAN "Aborts a collect on the instrument"
-  PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
-  PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
-  PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
-  PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
-  PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
-    OVERFLOW TRUNCATE
-  PARAMETER    CCSDSLENGTH    32  16  UINT  0 65535   1 "CCSDS primary header packet length"
-  ID_PARAMETER PKTID          48  16  UINT  0 65535   2 "Packet id"
+  <%= render "_ccsds_cmd.txt", locals: {id: 2} %>
 
 COMMAND INST CLEAR BIG_ENDIAN "Clears counters on the instrument"
   HAZARDOUS "Clearing counters may lose valuable information."
-  PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
-  PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
-  PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
-  PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
-  PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
-    OVERFLOW TRUNCATE
-  PARAMETER    CCSDSLENGTH    32  16  UINT  0 65535   1 "CCSDS primary header packet length"
-  ID_PARAMETER PKTID          48  16  UINT  0 65535   3 "Packet id"
+  <%= render "_ccsds_cmd.txt", locals: {id: 3} %>
 
 COMMAND INST SETPARAMS BIG_ENDIAN "Sets numbered parameters"
-  PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
-  PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
-  PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
-  PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
-  PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
-    OVERFLOW TRUNCATE
-  PARAMETER    CCSDSLENGTH    32  16  UINT  0 65535   11 "CCSDS primary header packet length"
-  ID_PARAMETER PKTID          48  16  UINT  0 65535   4 "Packet id"
-  MACRO_APPEND_START 1 5
-    APPEND_PARAMETER VALUE 16 UINT 0 5 0 "A value setting"
-  MACRO_APPEND_END
+  <%= render "_ccsds_cmd.txt", locals: {id: 4} %>
+  # Old deprecated MACRO syntax:
+  # MACRO_APPEND_START 1 5
+  #   APPEND_PARAMETER VALUE 16 UINT 0 5 0 "A value setting"
+  # MACRO_APPEND_END
+
+  # New more flexible ERB syntax:
+  <% (1..5).each do |i| %>
+    APPEND_PARAMETER VALUE<%= i %> 16 UINT 0 5 0 "Value <%= i %> setting"
+  <% end %>
+
   SELECT_PARAMETER VALUE5
     POLY_WRITE_CONVERSION 0 2
 
 COMMAND INST ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
-  PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
-  PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
-  PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
-  PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
-  PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
-    OVERFLOW TRUNCATE
-  PARAMETER    CCSDSLENGTH    32  16  UINT  0 65535   257 "CCSDS primary header packet length"
-  ID_PARAMETER PKTID          48  16  UINT  0 65535   5 "Packet id"
+  <%= render "_ccsds_cmd.txt", locals: {id: 5} %>
   PARAMETER    STRING         64  2048 STRING "NOOP"    "Enumerated string parameter"
     STATE "NOOP" "NOOP"
     STATE "ARM LASER" "ARM LASER" HAZARDOUS "Arming the laser poses an eye safety hazard."
     STATE "FIRE LASER" "FIRE LASER" HAZARDOUS "WARNING Laser will be fired!"
 
 COMMAND INST FLTCMD BIG_ENDIAN "Command with float parameters"
-  PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
-  PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
-  PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
-  PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
-  PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
-    OVERFLOW TRUNCATE
-  PARAMETER    CCSDSLENGTH    32  16  UINT  0 65535   13 "CCSDS primary header packet length"
-  ID_PARAMETER PKTID          48  16  UINT  0 65535   6 "Packet id"
+  <%= render "_ccsds_cmd.txt", locals: {id: 6} %>
   PARAMETER    FLOAT32        64  32  FLOAT MIN_FLOAT32 MAX_FLOAT32 0.0 "Float32 parameter"
   PARAMETER    FLOAT64        96  64  FLOAT MIN_FLOAT64 MAX_FLOAT64 0.0 "Float64 parameter"
 
 COMMAND INST ARYCMD BIG_ENDIAN "Command with array parameter"
-  PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
-  PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
-  PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
-  PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
-  PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
-    OVERFLOW TRUNCATE
-  PARAMETER    CCSDSLENGTH    32  16  UINT  0 65535   81 "CCSDS primary header packet length"
-  ID_PARAMETER PKTID          48  16  UINT  0 65535   6 "Packet id"
+  <%= render "_ccsds_cmd.txt", locals: {id: 7} %>
   ARRAY_PARAMETER ARRAY       64  32  UINT -8 "Array parameter"
   PARAMETER    CRC            -8   8  UINT  0   255   0 "CRC"
 
 COMMAND INST SLRPNLDEPLOY BIG_ENDIAN "Deploy solar array panels"
-  PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
-  PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
-  PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
-  PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
-  PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
-    OVERFLOW TRUNCATE
-  PARAMETER    CCSDSLENGTH    32  16  UINT  0 65535   1 "CCSDS primary header packet length"
-  ID_PARAMETER PKTID          48  16  UINT  0 65535   8 "Packet id"
+  <%= render "_ccsds_cmd.txt", locals: {id: 8} %>
 
 COMMAND INST SLRPNLRESET BIG_ENDIAN "Reset solar array panels"
-  PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
-  PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
-  PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
-  PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
-  PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
-    OVERFLOW TRUNCATE
-  PARAMETER    CCSDSLENGTH    32  16  UINT  0 65535   1 "CCSDS primary header packet length"
-  ID_PARAMETER PKTID          48  16  UINT  0 65535   9 "Packet id"
+  <%= render "_ccsds_cmd.txt", locals: {id: 9} %>

data/demo/config/targets/INST/cmd_tlm/inst_tlm.txt

@@ -1,25 +1,7 @@
 TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the instrument"
-  ITEM CCSDSVER           0  3 UINT     "CCSDS packet version number (See CCSDS 133.0-B-1)"
-  ITEM CCSDSTYPE          3  1 UINT     "CCSDS packet type (command or telemetry)"
-    STATE TLM 0
-    STATE CMD 1
-  ITEM CCSDSSHF           4  1 UINT     "CCSDS secondary header flag"
-    STATE FALSE 0
-    STATE TRUE 1
-  ID_ITEM CCSDSAPID       5 11 UINT   1 "CCSDS application process id"
-  ITEM CCSDSSEQFLAGS     16  2 UINT     "CCSDS sequence flags"
-    STATE FIRST 1
-    STATE CONT 0
-    STATE LAST 2
-    STATE NOGROUP 3
-  ITEM CCSDSSEQCNT       18 14 UINT     "CCSDS packet sequence count"
-    OVERFLOW TRUNCATE
-  ITEM CCSDSLENGTH       32 16 UINT     "CCSDS packet data length"
-  ITEM TIMESEC           48 32 UINT     "Seconds since epoch (January 1st, 1970, midnight)"
-  ITEM TIMEUS            80 32 UINT     "Microseconds of second"
-  ID_ITEM PKTID         112 16 UINT   1 "Packet id (The combination of CCSDS_APID and PACKET_ID identify the packet)"
-  ITEM COLLECTS         128 16 UINT     "Number of collects"
-  ITEM TEMP1            144 16 UINT     "Temperature #1"
+  <%= render "_ccsds_tlm.txt", locals: {apid: 1} %>
+  APPEND_ITEM COLLECTS         16 UINT     "Number of collects"
+  APPEND_ITEM TEMP1            16 UINT     "Temperature #1"
     POLY_READ_CONVERSION  -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
     UNITS CELCIUS C
@@ -27,33 +9,33 @@ TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the instrument"
     LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0 -20.0 20.0
     LIMITS TVAC 1     ENABLED -80.0 -30.0 30.0 80.0
     LIMITS_RESPONSE example_limits_response.rb
-  ITEM TEMP2            160 16 UINT     "Temperature #2"
+  APPEND_ITEM TEMP2            16 UINT     "Temperature #2"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
     UNITS CELCIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -60.0 -55.0 30.0 35.0
     LIMITS TVAC 1 ENABLED -60.0 20.0 30.0 35.0
-  ITEM TEMP3            176 16 UINT     "Temperature #3"
+  APPEND_ITEM TEMP3            16 UINT     "Temperature #3"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
     UNITS CELCIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -25.0 -10.0 50.0 55.0
     LIMITS TVAC 1 ENABLED -15.0 -10.0 20.0 30.0
-  ITEM TEMP4            192 16 UINT     "Temperature #4"
+  APPEND_ITEM TEMP4            16 UINT     "Temperature #4"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
     UNITS CELCIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0
-  ARRAY_ITEM ARY              208 8 UINT 80 "Array data"
+  APPEND_ARRAY_ITEM ARY         8 UINT 80 "Array data"
     UNITS VOLTS V
   APPEND_ITEM DURATION 32 FLOAT "Most recent collect duration"
   APPEND_ITEM COLLECT_TYPE 16 UINT "Most recent collect type"
     STATE NORMAL  0
     STATE SPECIAL 1
-  APPEND_ARRAY_ITEM ARY2      64 FLOAT 640 "Double array"
+  APPEND_ARRAY_ITEM ARY2       64 FLOAT 640 "Double array"
     UNITS CELCIUS C
   APPEND_ITEM ASCIICMD 2048 STRING "Most recent ASCIICMD string"
     STATE "NOOP" "NOOP"
@@ -88,25 +70,7 @@ TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the instrument"
 
 TELEMETRY INST ADCS BIG_ENDIAN "Position and attitude data"
   META TYPE 'struct adcs'
-  ITEM CCSDSVER           0  3 UINT     "CCSDS packet version number (See CCSDS 133.0-B-1)"
-  ITEM CCSDSTYPE          3  1 UINT     "CCSDS packet type (command or telemetry)"
-    STATE TLM 0
-    STATE CMD 1
-  ITEM CCSDSSHF           4  1 UINT     "CCSDS secondary header flag"
-    STATE FALSE 0
-    STATE TRUE 1
-  ID_ITEM CCSDSAPID       5 11 UINT   2 "CCSDS APPLICATION PROCESS ID"
-  ITEM CCSDSSEQFLAGS     16  2 UINT     "CCSDS sequence flags"
-    STATE FIRST 1
-    STATE CONT 0
-    STATE LAST 2
-    STATE NOGROUP 3
-  ITEM CCSDSSEQCNT       18 14 UINT     "CCSDS packet sequence count"
-    OVERFLOW TRUNCATE
-  ITEM CCSDSLENGTH       32 16 UINT     "CCSDS packet data length"
-  ITEM TIMESEC           48 32 UINT     "Seconds since epoch (January 1st, 1970, midnight)"
-  ITEM TIMEUS            80 32 UINT     "Microseconds of second"
-  ID_ITEM PKTID         112 16 UINT   1 "Packet id (The combination of CCSDS_APID and PACKET_ID identify the packet)"
+  <%= render "_ccsds_tlm.txt", locals: {apid: 2} %>
   ITEM POSX             128 32 FLOAT "Position X"
     UNITS METERS M
   ITEM POSY             160 32 FLOAT "Position Y"
@@ -137,11 +101,9 @@ TELEMETRY INST ADCS BIG_ENDIAN "Position and attitude data"
     FORMAT_STRING "%0.6f"
   ITEM BIASZ            512 32 FLOAT "Body Z rate bias"
     FORMAT_STRING "%0.6f"
-  ITEM STAR1ID          544 16 UINT  "Star 1 id"
-  ITEM STAR2ID          560 16 UINT  "Star 2 id"
-  ITEM STAR3ID          576 16 UINT  "Star 3 id"
-  ITEM STAR4ID          592 16 UINT  "Star 4 id"
-  ITEM STAR5ID          608 16 UINT  "Star 5 id"
+  <% (1..5).each do |i| %>
+    APPEND_ITEM STAR<%= i %>ID 16 UINT "Star <%= i %> id"
+  <% end %>
   ITEM POSPROGRESS      624 32 FLOAT "Position file progress"
     FORMAT_STRING "%0.2f"
   ITEM ATTPROGRESS      656 32 FLOAT "Attitude file progress"
@@ -153,30 +115,21 @@ TELEMETRY INST ADCS BIG_ENDIAN "Position and attitude data"
     READ_CONVERSION unix_time_formatted_conversion.rb TIMESEC TIMEUS
 
 TELEMETRY INST PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
-  ITEM CCSDSVER           0  3 UINT     "CCSDS packet version number (See CCSDS 133.0-B-1)"
-  ITEM CCSDSTYPE          3  1 UINT     "CCSDS packet type (command or telemetry)"
-    STATE TLM 0
-    STATE CMD 1
-  ITEM CCSDSSHF           4  1 UINT     "CCSDS secondary header flag"
-    STATE FALSE 0
-    STATE TRUE 1
-  ID_ITEM CCSDSAPID       5 11 UINT   3 "CCSDS application process id"
-  ITEM CCSDSSEQFLAGS     16  2 UINT     "CCSDS sequence flags"
-    STATE FIRST 1
-    STATE CONT 0
-    STATE LAST 2
-    STATE NOGROUP 3
-  ITEM CCSDSSEQCNT       18 14 UINT     "CCSDS packet sequence count"
-    OVERFLOW TRUNCATE
-  ITEM CCSDSLENGTH       32 16 UINT     "CCSDS packet data length"
-  ITEM TIMESEC           48 32 UINT     "Seconds since epoch (January 1st, 1970, midnight)"
-  ITEM TIMEUS            80 32 UINT     "Microseconds of second"
-  ID_ITEM PKTID         112 16 UINT   1 "Packet id (The combination of CCSDS_APID and PACKET_ID identify the packet)"
-  MACRO_APPEND_START 5 1
-    APPEND_ITEM Value 16 UINT "Value setting"
+  <%= render "_ccsds_tlm.txt", locals: {apid: 3} %>
+  # Old deprecated MACRO syntax:
+  #MACRO_APPEND_START 5 1
+  #  APPEND_ITEM Value 16 UINT "Value setting"
+  #    STATE GOOD 0 GREEN
+  #    STATE BAD 1 RED
+  #MACRO_APPEND_END
+
+  # New more flexible ERB syntax:
+  <% (1..5).each do |i| %>
+    APPEND_ITEM VALUE<%= i %> 16 UINT "Value <%= i %> setting"
       STATE GOOD 0 GREEN
       STATE BAD 1 RED
-  MACRO_APPEND_END
+  <% end %>
+
   ITEM TIMESECONDS 0 0 DERIVED "Derived floating-point time since epoch in seconds"
     READ_CONVERSION unix_time_seconds_conversion.rb TIMESEC TIMEUS
     FORMAT_STRING '%0.6f'
@@ -184,25 +137,7 @@ TELEMETRY INST PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
     READ_CONVERSION unix_time_formatted_conversion.rb TIMESEC TIMEUS
 
 TELEMETRY INST IMAGE BIG_ENDIAN "Packet with image data"
-  ITEM CCSDSVER           0  3 UINT     "CCSDS packet version number (See CCSDS 133.0-B-1)"
-  ITEM CCSDSTYPE          3  1 UINT     "CCSDS packet type (command or telemetry)"
-    STATE TLM 0
-    STATE CMD 1
-  ITEM CCSDSSHF           4  1 UINT     "CCSDS secondary header flag"
-    STATE FALSE 0
-    STATE TRUE 1
-  ID_ITEM CCSDSAPID       5 11 UINT   4 "CCSDS application process id"
-  ITEM CCSDSSEQFLAGS     16  2 UINT     "CCSDS sequence flags"
-    STATE FIRST 1
-    STATE CONT 0
-    STATE LAST 2
-    STATE NOGROUP 3
-  ITEM CCSDSSEQCNT       18 14 UINT     "CCSDS packet sequence count"
-    OVERFLOW TRUNCATE
-  ITEM CCSDSLENGTH       32 16 UINT     "CCSDS packet data length"
-  ITEM TIMESEC           48 32 UINT     "Seconds since epoch (January 1st, 1970, midnight)"
-  ITEM TIMEUS            80 32 UINT     "Microseconds of second"
-  ID_ITEM PKTID         112 16 UINT   1 "Packet id (The combination of CCSDS_APID and PACKET_ID identify the packet)"
+  <%= render "_ccsds_tlm.txt", locals: {apid: 4} %>
   ITEM IMAGE            128 800 BLOCK   "10x10 Image Data"
   ITEM TIMESECONDS 0 0 DERIVED "Derived floating-point time since epoch in seconds"
     READ_CONVERSION unix_time_seconds_conversion.rb TIMESEC TIMEUS
@@ -211,25 +146,7 @@ TELEMETRY INST IMAGE BIG_ENDIAN "Packet with image data"
     READ_CONVERSION unix_time_formatted_conversion.rb TIMESEC TIMEUS
 
 TELEMETRY INST MECH BIG_ENDIAN "Mechanism status"
-  ITEM CCSDSVER           0  3 UINT     "CCSDS packet version number (See CCSDS 133.0-B-1)"
-  ITEM CCSDSTYPE          3  1 UINT     "CCSDS packet type (command or telemetry)"
-    STATE TLM 0
-    STATE CMD 1
-  ITEM CCSDSSHF           4  1 UINT     "CCSDS secondary header flag"
-    STATE FALSE 0
-    STATE TRUE 1
-  ID_ITEM CCSDSAPID       5 11 UINT   5 "CCSDS application process id"
-  ITEM CCSDSSEQFLAGS     16  2 UINT     "CCSDS sequence flags"
-    STATE FIRST 1
-    STATE CONT 0
-    STATE LAST 2
-    STATE NOGROUP 3
-  ITEM CCSDSSEQCNT       18 14 UINT     "CCSDS packet sequence count"
-    OVERFLOW TRUNCATE
-  ITEM CCSDSLENGTH       32 16 UINT     "CCSDS packet data length"
-  ITEM TIMESEC           48 32 UINT     "Seconds since epoch (January 1st, 1970, midnight)"
-  ITEM TIMEUS            80 32 UINT     "Microseconds of second"
-  ID_ITEM PKTID         112 16 UINT   1 "Packet id (The combination of CCSDS_APID and PACKET_ID identify the packet)"
+  <%= render "_ccsds_tlm.txt", locals: {apid: 5} %>
   APPEND_ITEM SLRPNL1       32 FLOAT    "Solar panel 1 angle"
     UNITS DEGREES DEG
   APPEND_ITEM SLRPNL2       32 FLOAT    "Solar panel 2 angle"