openc3-cosmos-demo 5.14.1 → 5.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c957b46e562a6c1ba50f0157275b5158cdc57227dd911109ed1dc6a59aaaed
-  data.tar.gz: 99386b625c5724b0b07b71a94539192b1853f3915c99231558b7730471ebb6cd
+  metadata.gz: 6070b50c74e459bc08770e1ad72726643c6e72178459c6862200515f24cc2efc
+  data.tar.gz: f573bdcc61cf3591bb00475b2b8f4caab280f04777a200eaf791a1f9187b5834
 SHA512:
-  metadata.gz: '08d1a36e3d6be2d70486883ec9d7b6021883b0181b800a98f1ad8db92bba92e82b2c4513a88ebdb950f97f5a4e86af95583c8fcb2e310802608fbd6e335c3082'
-  data.tar.gz: 31ca3b98445a6ea09a83ec8139f7a8d8c07b5fbc282e62f830387968a35ddf9f87f1509608a04655fcd7e11f1465a89d26ced292a11dc3006fb9c571dbbb9951
+  metadata.gz: 15c70d7c0ea9e4fe9dbef55f2dbda41f9980b313fd7890e86dd6ca5b58590c10a4ce3b32098fa5170d53989d831d2981446da00efb8f874a43be7f61d6a9f2ba
+  data.tar.gz: b7553baf8e501b2f68db34bc54bcf370a28c2ab44924d43e1c2dbe2e6d69526756d4974dc7fb6d08393580a00864567bcc2967bf5f627424cf3017d08e8e8639

data/targets/INST/cmd_tlm/inst_cmds.txt

@@ -40,7 +40,7 @@ COMMAND <%= target_name %> ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
     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!"
     STATE "NOOP" "NOOP" DISABLE_MESSAGES
-  APPEND_PARAMETER BINARY 32 STRING 0xDEADBEEF "Binary string"
+  APPEND_PARAMETER BINARY 32 BLOCK 0xDEADBEEF "Binary string"
   APPEND_PARAMETER ASCII 80 STRING "0xDEADBEEF" "ASCII string"
   RELATED_ITEM <%= target_name %> HEALTH_STATUS ASCIICMD
 
@@ -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/target.txt

@@ -1,9 +1,5 @@
 LANGUAGE ruby
 
-# Requires for limits responses and custom conversion classes
-REQUIRE example_limits_response.rb
-REQUIRE sim_inst.rb
-
 # Ignored Parameters
 IGNORE_PARAMETER CCSDSVER
 IGNORE_PARAMETER CCSDSTYPE

data/targets/INST2/cmd_tlm/inst_cmds.txt

@@ -38,7 +38,7 @@ COMMAND <%= target_name %> ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
     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!"
     STATE "NOOP" "NOOP" DISABLE_MESSAGES
-  APPEND_PARAMETER BINARY 32 STRING 0xDEADBEEF "Binary string"
+  APPEND_PARAMETER BINARY 32 BLOCK 0xDEADBEEF "Binary string"
   APPEND_PARAMETER ASCII 80 STRING "0xDEADBEEF" "ASCII string"
   RELATED_ITEM <%= target_name %> HEALTH_STATUS ASCIICMD
 

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:
@@ -15,4 +15,4 @@ buffer = ""
 #   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