openc3-cosmos-demo 5.14.2 → 5.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a42456ecd87859607b18afc606f9551b5a7834d4fa09ecee462871adaf80036
-  data.tar.gz: 30e5746feeef6358ae451bf8c7eb4730347821c618ca72c42ff315033a81e5e5
+  metadata.gz: da07845c2a468fd4a90837e5098c60e0daf48d4e4504de27d1a272fbd764b931
+  data.tar.gz: 80e1b0cda201edb402797a0f72a852db20103b795c96e776062b2b4ace8c9b54
 SHA512:
-  metadata.gz: 2176ed000f9c3ace286aee6669d94db393b0e989ec14d09b80ae05f7ebcdb6b8c16d9d7188a532291242c2960e7d03c2af3c621b24daa56330fa92d7c810ce34
-  data.tar.gz: f907a9603871dfe4867378b760759232169a0f38388e0e95fa3d39384996cc50a6af5c70c8235da01bc28d3da89110b69b9f9c7d42d958a776c7ec73d56cffa2
+  metadata.gz: 8093f1aa51a6c88a03d7aa54e42dedeffdd1f50e23d00022b15e1b4e04313e858b1240cb26bf897121a71f93867726e614df42886cd4f25a913602d93e683c5a
+  data.tar.gz: 052c322247edb795e5311f67db037ab2b688ec34b33c0d791adf1e43681d3b64c67b96a0ecaebe13dce561362d338fb4e8bb0007d823af69e56402598451bd19

data/targets/INST/cmd_tlm/inst_cmds.txt

@@ -85,3 +85,8 @@ COMMAND <%= target_name %> QUIET BIG_ENDIAN "Enable/disable no out of limits in
 COMMAND <%= target_name %> TIME_OFFSET BIG_ENDIAN "Subtract the packet time by the given seconds"
   <%= render "_ccsds_cmd.txt", locals: {id: 12} %>
   APPEND_PARAMETER SECONDS 32 UINT MIN MAX 0 "Seconds to subtract from packet time"
+
+COMMAND <%= target_name %> HIDDEN BIG_ENDIAN "Hidden command to bump the hidden packet"
+  HIDDEN
+  <%= render "_ccsds_cmd.txt", locals: {id: 13} %>
+  APPEND_PARAMETER COUNT 32 UINT MIN MAX 0 "Count to set"

data/targets/INST/cmd_tlm/inst_tlm.txt

@@ -63,6 +63,14 @@ TELEMETRY <%= target_name %> HEALTH_STATUS BIG_ENDIAN "Health and status from th
     READ_CONVERSION processor_conversion.rb TEMP1STAT MEAN
   ITEM TEMP1STDDEV 0 0 DERIVED "Stddev of most recent 100 samples for TEMP1"
     READ_CONVERSION processor_conversion.rb TEMP1STAT STDDEV
+  ITEM TEMP1_MICRO 0 0 DERIVED
+    GENERIC_READ_CONVERSION_START FLOAT 32
+      packet.read('TEMP1') / 1_000_000
+    GENERIC_READ_CONVERSION_END
+  ITEM TEMP1_MEGA 0 0 DERIVED
+    GENERIC_READ_CONVERSION_START FLOAT 32
+      packet.read('TEMP1') * 1_000_000
+    GENERIC_READ_CONVERSION_END
   PROCESSOR TEMP1STAT statistics_processor.rb TEMP1 100
   PROCESSOR TEMP1WATER watermark_processor.rb TEMP1
 
@@ -147,3 +155,10 @@ TELEMETRY <%= target_name %> MECH BIG_ENDIAN "Mechanism status ©®"
     UNITS micro-Ampères µA
   ITEM PACKET_TIME 0 0 DERIVED "Ruby time based on TIMESEC and TIMEUS"
     READ_CONVERSION unix_time_conversion.rb TIMESEC TIMEUS
+
+TELEMETRY <%= target_name %> HIDDEN BIG_ENDIAN "Hidden packet"
+  HIDDEN
+  <%= render "_ccsds_tlm.txt", locals: {apid: 6} %>
+  APPEND_ITEM COUNT 32 UINT "Count for hidden command"
+  ITEM PACKET_TIME 0 0 DERIVED "Ruby time based on TIMESEC and TIMEUS"
+    READ_CONVERSION unix_time_conversion.rb TIMESEC TIMEUS

data/targets/INST/lib/sim_inst.rb

@@ -116,6 +116,11 @@ module OpenC3
       packet.CcsdsSeqFlags = 'NOGROUP'
       packet.CcsdsLength = packet.buffer.length - 7
 
+      packet = @tlm_packets['HIDDEN']
+      packet.enable_method_missing
+      packet.CcsdsSeqFlags = 'NOGROUP'
+      packet.CcsdsLength = packet.buffer.length - 7
+
       @solar_panel_positions = SOLAR_PANEL_DFLTS.dup
       @solar_panel_thread = nil
       @solar_panel_thread_cancel = false
@@ -144,6 +149,7 @@ module OpenC3
       set_rate('PARAMS', 100)
       set_rate('IMAGE', 100)
       set_rate('MECH', 10)
+      set_rate('HIDDEN', 500)
     end
 
     def tick_period_seconds
@@ -211,6 +217,8 @@ module OpenC3
       when 'SLRPNLRESET'
         OpenC3.kill_thread(self, @solar_panel_thread)
         @solar_panel_positions = SOLAR_PANEL_DFLTS.dup
+      when 'HIDDEN'
+        @tlm_packets['HIDDEN'].count = packet.read('count')
       end
     end
 
@@ -368,6 +376,11 @@ module OpenC3
           packet.slrpnl4 = @solar_panel_positions[3]
           packet.slrpnl5 = @solar_panel_positions[4]
           packet.current = 0.5
+
+        when 'HIDDEN'
+          packet.timesec = time.tv_sec - @time_offset
+          packet.timeus = time.tv_usec
+          packet.ccsdsseqcnt += 1
         end
       end
 

data/targets/INST/procedures/target_file.rb

@@ -1,9 +1,7 @@
 put_target_file("INST/test.txt", "this is a string test")
-download_file("INST/test.txt") # download via path
+download_file("INST/test.txt")
 file = get_target_file("INST/test.txt")
 puts file.read
-file.rewind # rewind so download_file can read
-download_file(file) # download using file
 file.delete
 delete_target_file("INST/test.txt")
 
@@ -18,6 +16,7 @@ file.delete
 delete_target_file("INST/test.txt")
 
 put_target_file("INST/test.bin", "\x00\x01\x02\x03\xFF\xEE\xDD\xCC")
+download_file("INST/test.bin")
 file = get_target_file("INST/test.bin")
 puts file.read.formatted
 file.delete

data/targets/INST2/procedures/target_file.py

@@ -2,11 +2,9 @@ from openc3.utilities.string import formatted
 import tempfile
 
 put_target_file("INST/test.txt", "this is a string test")
-download_file("INST/test.txt")  # download via path
+download_file("INST/test.txt")
 file = get_target_file("INST/test.txt")
 print(file.read())
-file.seek(0)  # rewind so download_file can read
-download_file(file)  # download using file
 file.close()  # closing deletes tempfile
 delete_target_file("INST/test.txt")
 
@@ -20,9 +18,9 @@ print(file.read())
 file.close()
 delete_target_file("INST/test.txt")
 
-# TODO: Binary not yet supported
-# put_target_file("INST/test.bin", b"\x00\x01\x02\x03\xFF\xEE\xDD\xCC")
-# file = get_target_file("INST/test.bin")
-# print(formatted(file.read()))
-# file.close()
-# delete_target_file("INST/test.bin")
+put_target_file("INST/test.bin", b"\x00\x01\x02\x03\xFF\xEE\xDD\xCC")
+download_file("INST/test.bin")
+file = get_target_file("INST/test.bin")
+print(formatted(file.read()))
+file.close()
+delete_target_file("INST/test.bin")

data/targets/INST2/tables/procedures/download.py

@@ -1,7 +1,7 @@
 import os
 
 # TBL_FILENAME is set to the name of the table file to overwrite
-print(f"file:{os.environ['TBL_FILENAME']}")
+print(f"file:{os.getenv('TBL_FILENAME')}")
 # Download the file
 # Implement custom commanding logic to download the table
 # You probably want to do something like:
@@ -9,10 +9,9 @@ buffer = ""
 # i = 1
 # num_segments = 5 # calculate based on TBL_FILENAME
 # table_id = 1  # calculate based on TBL_FILENAME
-# while i < num_segments
+# while i < num_segments:
 #   # Request a part of the table buffer
-#   cmd("TGT DUMP with TABLE_ID #{table_id}, SEGMENT #{i}")
+#   cmd(f"TGT DUMP with TABLE_ID {table_id}, SEGMENT {i}")
 #   buffer += tlm("TGT DUMP_PKT DATA")
 #   i += 1
-# end
-put_target_file(os.environ["TBL_FILENAME"], buffer)
+put_target_file(os.getenv("TBL_FILENAME"), buffer)

data/targets/INST2/tables/procedures/upload.py

@@ -2,9 +2,9 @@ import os
 from openc3.utilities.string import formatted
 
 # TBL_FILENAME is set to the name of the table file
-print(f"file:{os.environ['TBL_FILENAME']}")
+print(f"file:{os.getenv('TBL_FILENAME')}")
 # Open the file
-file = get_target_file(os.environ["TBL_FILENAME"])
+file = get_target_file(os.getenv("TBL_FILENAME"))
 buffer = file.read()
 # Implement custom commanding logic to upload the table
 # Note that buffer is a Ruby string of bytes