openc3-cosmos-demo 5.20.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd81132780179ea8ece04e981e278f7fbd40613d15cbb08ca8854d9a995a1033
-  data.tar.gz: 78be70c4ea0c4c07d4be6a7b820319d4e4d0a67d0bc172799d05f85ce6656eb9
+  metadata.gz: 954adcc24aa1b9b2f67520c01f942a658ee77f495711d13cae07f1b8b79dbaf1
+  data.tar.gz: 84f6a082c584a30b7419f5b33da190721811cd393114908e4adcb58319a890e1
 SHA512:
-  metadata.gz: 77961d9be04287a2b42aa3c969a22ff50e5d6842ad18f771bd77553bca9cb62e3463e2f08f15eeca751654b24bd911abbaef6759cecf8dad3ea812788ba97b75
-  data.tar.gz: 3d659f81e25cf57046819e0007732dfec5e7c01b2588e7f4513214d078d1a9553855215c68566b840c517696cac6fc711f5b2c1c38bc96f41934f14edea47fee
+  metadata.gz: ec87bbaab66a8ce1e6fa035dc90dbc5450f47b49a8a91570dc88973d85d220c9f017a937a8eb902f993e7b0d941b0ec6f1bd7a247e9ce7e92f585768aa5f370c
+  data.tar.gz: 8a2c98ed09515aa9f58b7893573f7910b572f55fd5b476f22c7098acb9faf53081ad337efd689602518fc5ff679cef6677d297ea3cf7c18130a51c930c15892a

data/targets/INST/cmd_tlm/inst_tlm.txt

@@ -127,6 +127,11 @@ TELEMETRY <%= target_name %> PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
       STATE GOOD 0 GREEN
       STATE BAD 1 RED
   <% end %>
+  APPEND_ITEM P_2.2,2      32 UINT "Test weird characters"
+  APPEND_ITEM P-3+3=3      32 UINT "Test weird characters"
+  APPEND_ITEM P4!@#$%^&*?  32 UINT "Test weird characters"
+  APPEND_ITEM P</5|\>      32 UINT "Test weird characters"
+  APPEND_ITEM P(:6;)       32 UINT "Test weird characters"
   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

@@ -111,6 +111,11 @@ module OpenC3
       packet.value3 = 2
       packet.value4 = 1
       packet.value5 = 0
+      packet.write('P_2.2,2', 2)
+      packet.write('P-3+3=3', 3)
+      packet.write('P4!@#$%^&*?', 4)
+      packet.write('P</5|\>', 5)
+      packet.write('P(:6;)', 6)
 
       packet = @tlm_packets['IMAGE']
       packet.enable_method_missing

data/targets/INST/procedures/screens.rb

@@ -5,15 +5,15 @@ definition = get_screen_definition("INST", "ADCS")
 puts definition
 wait(1)
 display_screen("INST", "ADCS")
-wait(3)
+wait(2)
 display_screen("INST", "HS", 400, 0)
-wait(3)
+wait(2)
 clear_screen("INST", "ADCS")
-wait(3)
+wait(2)
 display_screen("INST", "IMAGE")
-wait(3)
+wait(2)
 clear_all_screens()
-wait(3)
+wait(2)
 definition = '
 SCREEN AUTO AUTO 1.0
 
@@ -23,11 +23,11 @@ VERTICALBOX "Test Screen"
 END
 '
 local_screen("TEST", definition)
-wait(3)
+wait(2)
 clear_all_screens()
 create_screen("INST", "TEST", definition)
 display_screen("INST", "TEST")
-wait(3)
+wait(2)
 clear_all_screens()
 delete_screen("INST", "TEST")
 display_screen("INST", "TEST") # Expected to fail because new screen was deleted

data/targets/INST/screens/params.txt

@@ -3,7 +3,7 @@ SCREEN AUTO AUTO 1.0
 VERTICAL
   TITLE Params
 
-  HORIZONTAL
+  HORIZONTAL 20
     MATRIXBYCOLUMNS 3
       LABEL VALUE5
         SETTING WIDTH 100 # Only need width on the first row
@@ -60,10 +60,17 @@ VERTICAL
         SETTING LED_COLOR GOOD GREEN
         SETTING LED_COLOR BAD RED
     END
-    SETTING RAW margin-left 20px
+    VERTICAL
+      LABELVALUE <%= target_name %> PARAMS P_2.2,2
+      LABELVALUE <%= target_name %> PARAMS P-3+3=3
+      LABELVALUE <%= target_name %> PARAMS P4!@#$%^&*?
+      LABELVALUE <%= target_name %> PARAMS P</5|\>
+      LABELVALUE <%= target_name %> PARAMS P(:6;)
+    END
   END
 
-  VERTICAL
-    LABELVALUE <%= target_name %> PARAMS PACKET_TIMEFORMATTED WITH_UNITS 20
+  HORIZONTAL
+    LABEL "Packet Time"
+    VALUE <%= target_name %> PARAMS PACKET_TIMEFORMATTED WITH_UNITS 25
   END
 END

data/targets/INST2/cmd_tlm/inst_tlm.txt

@@ -119,6 +119,11 @@ TELEMETRY <%= target_name %> PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
       STATE GOOD 0 GREEN
       STATE BAD 1 RED
   <% end %>
+  APPEND_ITEM P_2.2,2      32 UINT "Test weird characters"
+  APPEND_ITEM P-3+3=3      32 UINT "Test weird characters"
+  APPEND_ITEM P4!@#$%^&*?  32 UINT "Test weird characters"
+  APPEND_ITEM P</5|\>      32 UINT "Test weird characters"
+  APPEND_ITEM P(:6;)       32 UINT "Test weird characters"
   ITEM PACKET_TIME 0 0 DERIVED "Python time based on TIMESEC and TIMEUS"
     READ_CONVERSION openc3/conversions/unix_time_conversion.py TIMESEC TIMEUS
 

data/targets/INST2/lib/helper.py

@@ -1,3 +1,3 @@
 class Helper:
-    def help(self):
+    def print_help(self):
         print("help")

data/targets/INST2/lib/sim_inst.py

@@ -114,6 +114,11 @@ class SimInst(SimulatedTarget):
         packet.write("value3", 2)
         packet.write("value4", 1)
         packet.write("value5", 0)
+        packet.write('P_2.2,2', 2)
+        packet.write('P-3+3=3', 3)
+        packet.write('P4!@#$%^&*?', 4)
+        packet.write('P</5|\>', 5)
+        packet.write('P(:6;)', 6)
 
         packet = self.tlm_packets["IMAGE"]
         packet.write("CcsdsSeqFlags", "NOGROUP")

data/targets/INST2/procedures/calendar.py

@@ -21,7 +21,7 @@ print(
 )  # => {"name":"Mine", "color":"#4287f5", "scope":"DEFAULT", "updated_at":1698763720728596964}
 
 now = datetime.now(timezone.utc)
-start = datetime(now.year, now.month, now.day, now.hour + 1, 30, 00, 00, timezone.utc)
+start = now + timedelta(hours=1)
 stop = start + timedelta(hours=1)  # Stop plus 1hr
 act = create_timeline_activity("Mine", kind="reserve", start=start, stop=stop)
 print(act)  # =>

data/targets/INST2/procedures/collect.py

@@ -5,7 +5,7 @@ load_utility("<%= target_name %>/procedures/utilities/clear.py")
 from INST2.lib.helper import Helper
 
 helper = Helper()
-helper.help()
+helper.print_help()
 
 number = ask("Enter a number.")
 if not isinstance(number, (int, float)):

data/targets/INST2/procedures/my_script_suite.py

@@ -1,6 +1,8 @@
 from openc3.script.suite import Group, Suite
 
 load_utility("INST2/procedures/utilities/clear.py")
+# Load a target file library (not instrumented)
+from INST2.lib.helper import Helper
 
 
 class ExampleGroup(Group):
@@ -30,6 +32,8 @@ class ExampleGroup(Group):
         raise SkipScript
 
     def helper(self):
+        helper = Helper()
+        helper.print_help()
         if RunningScript.manual:
             answer = ask("Are you sure?")
         else:
@@ -43,7 +47,3 @@ class MySuite(Suite):
     def __init__(self):
         super().__init__()
         self.add_group(ExampleGroup)
-
-
-print("Running")
-MySuite().run()

data/targets/INST2/procedures/screens.py

@@ -5,15 +5,15 @@ definition = get_screen_definition("INST2", "ADCS")
 print(definition)
 wait(1)
 display_screen("INST2", "ADCS")
-wait(3)
+wait(2)
 display_screen("INST2", "HS", 400, 0)
-wait(3)
+wait(2)
 clear_screen("INST2", "ADCS")
-wait(3)
+wait(2)
 display_screen("INST2", "IMAGE")
-wait(3)
+wait(2)
 clear_all_screens()
-wait(3)
+wait(2)
 definition = """
 SCREEN AUTO AUTO 1.0
 
@@ -23,11 +23,11 @@ VERTICALBOX "Test Screen"
 END
 """
 local_screen("TEST", definition)
-wait(3)
+wait(2)
 clear_all_screens()
 create_screen("INST2", "TEST", definition)
 display_screen("INST2", "TEST")
-wait(3)
+wait(2)
 clear_all_screens()
 delete_screen("INST2", "TEST")
 display_screen("INST2", "TEST")  # Expected to fail because new screen was deleted

data/targets/INST2/screens/params.txt

@@ -3,7 +3,7 @@ SCREEN AUTO AUTO 1.0
 VERTICAL
   TITLE Params
 
-  HORIZONTAL
+  HORIZONTAL 20
     MATRIXBYCOLUMNS 3
       LABEL VALUE5
         SETTING WIDTH 100 # Only need width on the first row
@@ -60,10 +60,17 @@ VERTICAL
         SETTING LED_COLOR GOOD GREEN
         SETTING LED_COLOR BAD RED
     END
-    SETTING RAW margin-left 20px
+    VERTICAL
+      LABELVALUE <%= target_name %> PARAMS P_2.2,2
+      LABELVALUE <%= target_name %> PARAMS P-3+3=3
+      LABELVALUE <%= target_name %> PARAMS P4!@#$%^&*?
+      LABELVALUE <%= target_name %> PARAMS P</5|\>
+      LABELVALUE <%= target_name %> PARAMS P(:6;)
+    END
   END
 
-  VERTICAL
-    LABELVALUE <%= target_name %> PARAMS PACKET_TIMEFORMATTED WITH_UNITS 20
+  HORIZONTAL
+    LABEL "Packet Time"
+    VALUE <%= target_name %> PARAMS PACKET_TIMEFORMATTED WITH_UNITS 25
   END
 END