openc3-cosmos-demo 5.18.0 → 5.19.0

data/targets/INST2/lib/sim_inst.py

@@ -1,4 +1,4 @@
-# Copyright 2023 OpenC3, Inc.
+# Copyright 2024 OpenC3, Inc.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it
@@ -165,29 +165,27 @@ class SimInst(SimulatedTarget):
 
         match name:
             case "COLLECT":
+                hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
                 hs_packet.write("collects", hs_packet.read("collects") + 1)
                 hs_packet.write("duration", packet.read("duration"))
                 hs_packet.write("collect_type", packet.read("type"))
+            case "ABORT" | "FLTCMD" | "ARYCMD":
+                hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
             case "CLEAR":
+                hs_packet.write("cmd_acpt_cnt", 0)
                 hs_packet.write("collects", 0)
-            case "MEMLOAD":
-                hs_packet.write("blocktest", packet.read("data"))
-            case "QUIET":
-                if packet.read("state") == "TRUE":
-                    self.quiet = True
-                else:
-                    self.quiet = False
-            case "TIME_OFFSET":
-                self.time_offset = packet.read("seconds")
             case "SETPARAMS":
+                hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
                 params_packet.write("value1", packet.read("value1"))
                 params_packet.write("value2", packet.read("value2"))
                 params_packet.write("value3", packet.read("value3"))
                 params_packet.write("value4", packet.read("value4"))
                 params_packet.write("value5", packet.read("value5"))
             case "ASCIICMD":
+                hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
                 hs_packet.write("asciicmd", packet.read("string"))
             case "SLRPNLDEPLOY":
+                hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
                 if self.solar_panel_thread and self.solar_panel_thread.is_alive():
                     return
                 self.solar_panel_thread = threading.Thread(
@@ -195,8 +193,24 @@ class SimInst(SimulatedTarget):
                 )
                 self.solar_panel_thread.start()
             case "SLRPNLRESET":
+                hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
                 kill_thread(self, self.solar_panel_thread)
                 self.solar_panel_positions = SimInst.SOLAR_PANEL_DFLTS[:]
+            case "MEMLOAD":
+                hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
+                hs_packet.write("blocktest", packet.read("data"))
+            case "QUIET":
+                hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
+                if packet.read("state") == "TRUE":
+                    self.quiet = True
+                else:
+                    self.quiet = False
+            case "TIME_OFFSET":
+                hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
+                self.time_offset = packet.read("seconds")
+            case "HIDDEN":
+                # Deliberately do not increment cmd_acpt_cnt
+                self.tlm_packets["HIDDEN"].count = packet.read("count")
 
     def solar_panel_thread_method(self):
         self.solar_panel_thread_cancel = False

data/targets/INST2/procedures/calendar.py

@@ -43,7 +43,7 @@ stop = start + timedelta(minutes=30)
 act = create_timeline_activity("Mine", kind="reserve", start=start, stop=stop)
 tlas = get_timeline_activities("Mine")
 check_expression(f"{len(tlas)} == 2")
-delete_timeline_activity("Mine", act["start"])
+delete_timeline_activity("Mine", act["start"], act["uuid"])
 tlas = get_timeline_activities("Mine")
 check_expression(f"{len(tlas)} == 1")
 

data/targets/INST2/procedures/checks.py

@@ -3,6 +3,10 @@ import os
 # Display the environment variables
 print(os.environ.items())
 
+# Test some of the various keyword arguments
+cmd("<%= target_name %> ABORT", timeout=30)
+cmd("<%= target_name %> ABORT", log_message=False)
+cmd("<%= target_name %> ABORT", validate=False)
 collect_cnt = tlm("<%= target_name %> HEALTH_STATUS COLLECTS")
 cmd("<%= target_name %> COLLECT with DURATION 11, TYPE NORMAL")
 cmd_no_range_check("<%= target_name %> COLLECT with DURATION 11, TYPE NORMAL")

data/targets/INST2/procedures/metadata.py

@@ -12,12 +12,10 @@ print(metadata_update({"setkey": 4}))  # Ensure updatekey stays
 check_expression(f"{metadata_get()['metadata']['setkey']} == 4")
 check_expression(f"{metadata_get()['metadata']['updatekey']} == 3")
 check_expression(f"{len(metadata_all())} >= 1")
-# TODO: metadata_input()  # Creates a new entry
+metadata_input()  # Creates a new entry
 metadata_set({"input": 5})  # Simulate metadat_input for now
 check_expression(f"{len(metadata_all())} >= 2")
 wait(2)  # Allow time to advance or it's an error
 metadata_set({"new": 5})  # Another new entry
 check_expression(f"{len(metadata_all())} >= 3")
-# The first entry is the newest one we created
-print(metadata_all)
-check_expression(f"{metadata_all()[0]['metadata']} == {{'new':5}}")
+print(metadata_all())

data/targets/INST2/screens/commanding.txt

@@ -18,7 +18,7 @@ VERTICAL
       LABEL "  Duration: "
       NAMED_WIDGET DURATION TEXTFIELD 12 "10.0"
     END
-    # This is an example of using a varible named 'type'. You can operate on variables with Javascript code.
+    # This is an example of using a variable named 'type'. You can operate on variables with Javascript code.
     # All OpenC3 commands (api.cmd) must be separated by double semicolons ';;'. All code separated by semicolons is evaluated together.
     # Note: you can also request and use telemetry in screens using Javascript Promises, e.g.
     # api.tlm('INST2 PARAMS VALUE3', 'RAW').then(dur => api.cmd('INST2 COLLECT with TYPE '+type+', DURATION '+dur))"

data/targets/INST2/screens/ground.txt

@@ -20,7 +20,7 @@ VERTICAL
     CANVASIMAGE "satellite.png" 90 130 200 200
       # If the image is clicked the "<%= target_name %> ADCS" screen will popup
       SETTING SCREEN <%= target_name %> ADCS
-    # We're using the converted value and specifing a default of "ground_error.png"
+    # We're using the converted value and specifying a default of "ground_error.png"
     # if none of the IMAGE settings match the value
     CANVASIMAGEVALUE <%= target_name %> HEALTH_STATUS GROUND1STATUS CONVERTED "ground_error.png" 400 100 180 180
       SETTING IMAGE CONNECTED "ground_on.png" 400 100

data/targets/INST2/tables/config/TLMMonitoringTable_def.txt

@@ -1,19 +1,19 @@
 TABLE "TLM_Monitoring" BIG_ENDIAN ROW_COLUMN 100 "Telemetry Monitoring Table"
-  APPEND_PARAMETER "Threshold" 32 UINT MIN MAX 0 "Telemetry item threshold at which point persistance is incremented"
+  APPEND_PARAMETER "Threshold" 32 UINT MIN MAX 0 "Telemetry item threshold at which point persistence is incremented"
   APPEND_PARAMETER "Offset" 32 UINT MIN MAX 0 "Offset into the telemetry packet to monitor"
   APPEND_PARAMETER "Data_Size" 32 UINT 0 3 0 "Amount of data to monitor (bytes)"
     STATE BITS 0
     STATE BYTE 1
     STATE WORD 2
     STATE LONGWORD 3
-  APPEND_PARAMETER "Bit_Mask" 32 UINT MIN MAX 0 "Bit Mask to apply to the Data Size before the value is compared ot the Threshold"
+  APPEND_PARAMETER "Bit_Mask" 32 UINT MIN MAX 0 "Bit Mask to apply to the Data Size before the value is compared to the Threshold"
   APPEND_PARAMETER "Persistence" 32 UINT MIN MAX 0 "Number of times the Threshold must be exceeded before Action is triggered"
   APPEND_PARAMETER "Type" 32 UINT 0 3 0 "How the Threshold is compared against"
     STATE LESS_THAN 0
     STATE GREATER_THAN 1
     STATE EQUAL_TO 2
     STATE NOT_EQUAL_TO 3
-  APPEND_PARAMETER "Action" 32 UINT 0 4 0 "Action to take when Persistance is met"
+  APPEND_PARAMETER "Action" 32 UINT 0 4 0 "Action to take when Persistence is met"
     STATE NO_ACTION_REQUIRED 0
     STATE INITIATE_RESET 1
     STATE CHANGE_MODE_SAFE 2