openc3-cosmos-demo 5.12.0 → 5.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c954060fba09d346a77dc1a8de7b01bb024a3ebd0993b0a483baae84777c8f81
-  data.tar.gz: fc2eeb43813e0451f5c0f53bbfcc95de97e3184741a9e885b81c809382329499
+  metadata.gz: 253bb085bd444fe9db87ba5f189390c4558bd8cb7dd2bcbe349f8cce236b102a
+  data.tar.gz: b3a09a1463c5b79fe63c4681545bea40cc9c6853c3fab5d4eb84f54eadaed617
 SHA512:
-  metadata.gz: e647203522455fcb5663cdb9fef5a77abeaa59e4021ab07b3e942b085313dc74adcbe3e76e6b2f777ec426b51bd3c240c7b12e08a981d14605625361748fbafb
-  data.tar.gz: d554da81d73e739cb8aa311c5202713d22bdcb96fe21484f8a3399cd7bce1a2d7ea432bfdf4f8267e7dd29f3f1d5fdbb3f55386521838ca54f86b7ca6cf67359
+  metadata.gz: 6e9608b065308071fee91fd6e0d8b0f1333f1edc7122ffae434f5afa285afe56adf397dc0f2c746583932987df233aa366fdb142075186e6cac522fa3743d009
+  data.tar.gz: 529a869b47ea5fda4c55399bc107be720e2191a110d44fc3c2b69a512a544fde97fa19c411942a67c260946fc314a8a7d0a7147a38196e65834371eca6e9581d

data/targets/INST/cmd_tlm/inst_cmds.txt

@@ -9,6 +9,9 @@ COMMAND <%= target_name %> COLLECT BIG_ENDIAN "Starts a collect on the <%= targe
     FORMAT_STRING "0x%0X"
   PARAMETER    TEMP          120  32  FLOAT 0.0 25.0 0.0 "Collect temperature"
     UNITS Celsius C
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS COLLECTS
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS DURATION
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS COLLECT_TYPE
 
 COMMAND <%= target_name %> ABORT BIG_ENDIAN "Aborts a collect on the <%= target_name %> instrument"
   <%= render "_ccsds_cmd.txt", locals: {id: 2} %>
@@ -16,13 +19,17 @@ COMMAND <%= target_name %> ABORT BIG_ENDIAN "Aborts a collect on the <%= target_
 COMMAND <%= target_name %> CLEAR BIG_ENDIAN "Clears counters on the <%= target_name %> instrument"
   HAZARDOUS "Clearing counters may lose valuable information."
   <%= render "_ccsds_cmd.txt", locals: {id: 3} %>
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS COLLECTS
 
 COMMAND <%= target_name %> SETPARAMS BIG_ENDIAN "Sets numbered parameters"
   <%= render "_ccsds_cmd.txt", locals: {id: 4} %>
   # ERB syntax:
   <% (1..5).each do |i| %>
-    APPEND_PARAMETER VALUE<%= i %> 16 UINT 0 5 1 "Value <%= i %> setting"
+    # The packet is BIG_ENDIAN (CCSDS) but these fields are LITTLE_ENDIAN
+    APPEND_PARAMETER VALUE<%= i %> 16 UINT 0 5 1 "Value <%= i %> setting" LITTLE_ENDIAN
+    RELATED_ITEM <%= target_name %> PARAMS VALUE<%= i %>
   <% end %>
+  SCREEN <%= target_name %> PARAMS
 
   SELECT_PARAMETER VALUE5
     POLY_WRITE_CONVERSION 0 2
@@ -35,6 +42,7 @@ COMMAND <%= target_name %> ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
     STATE "NOOP" "NOOP" DISABLE_MESSAGES
   APPEND_PARAMETER BINARY 32 STRING 0xDEADBEEF "Binary string"
   APPEND_PARAMETER ASCII 80 STRING "0xDEADBEEF" "ASCII string"
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS ASCIICMD
 
 COMMAND <%= target_name %> FLTCMD BIG_ENDIAN "Command with float parameters"
   <%= render "_ccsds_cmd.txt", locals: {id: 6} %>
@@ -48,14 +56,25 @@ COMMAND <%= target_name %> ARYCMD BIG_ENDIAN "Command with array parameter"
 
 COMMAND <%= target_name %> SLRPNLDEPLOY BIG_ENDIAN "Deploy solar array panels"
   <%= render "_ccsds_cmd.txt", locals: {id: 8} %>
+  RELATED_ITEM <%= target_name %> MECH SLRPNL1
+  RELATED_ITEM <%= target_name %> MECH SLRPNL2
+  RELATED_ITEM <%= target_name %> MECH SLRPNL3
+  RELATED_ITEM <%= target_name %> MECH SLRPNL4
+  RELATED_ITEM <%= target_name %> MECH SLRPNL5
 
 COMMAND <%= target_name %> SLRPNLRESET BIG_ENDIAN "Reset solar array panels"
   <%= render "_ccsds_cmd.txt", locals: {id: 9} %>
+  RELATED_ITEM <%= target_name %> MECH SLRPNL1
+  RELATED_ITEM <%= target_name %> MECH SLRPNL2
+  RELATED_ITEM <%= target_name %> MECH SLRPNL3
+  RELATED_ITEM <%= target_name %> MECH SLRPNL4
+  RELATED_ITEM <%= target_name %> MECH SLRPNL5
 
 COMMAND <%= target_name %> MEMLOAD BIG_ENDIAN "Load memory"
   DISABLE_MESSAGES # Disable messages on a command that could be sent many many times
   <%= render "_ccsds_cmd.txt", locals: {id: 10} %>
   APPEND_PARAMETER DATA 80 BLOCK "" "Block of data"
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS BLOCKTEST
 
 COMMAND <%= target_name %> QUIET BIG_ENDIAN "Enable/disable no out of limits in the demo"
   <%= render "_ccsds_cmd.txt", locals: {id: 11} %>

data/targets/INST/lib/sim_inst.rb

@@ -178,6 +178,7 @@ module OpenC3
       when 'TIME_OFFSET'
         @time_offset = packet.read('seconds')
       when 'SETPARAMS'
+        # puts "SETPARAMS packet: #{packet.buffer.formatted}"
         params_packet.value1 = packet.read('value1')
         params_packet.value2 = packet.read('value2')
         params_packet.value3 = packet.read('value3')

data/targets/INST/screens/adcs.txt

@@ -7,27 +7,29 @@ VERTICAL
   HORIZONTAL
     VERTICALBOX "Position and Velocity"
       LABELVALUE <%= target_name %> ADCS POSX WITH_UNITS 20 CENTER
+        # We recommend using these built-in colors from 1-8
+        SETTING TEXTCOLOR var(--color-data-visualization-1)
       LABELVALUE <%= target_name %> ADCS POSY WITH_UNITS 22 CENTER
+        SETTING TEXTCOLOR var(--color-data-visualization-1)
       LABELVALUE <%= target_name %> ADCS POSZ WITH_UNITS 24 CENTER
+        SETTING TEXTCOLOR var(--color-data-visualization-1)
       LABELVALUE <%= target_name %> ADCS VELX WITH_UNITS 20
+        SETTING TEXTCOLOR var(--color-data-visualization-2)
       LABELVALUE <%= target_name %> ADCS VELY WITH_UNITS 22
+        SETTING TEXTCOLOR var(--color-data-visualization-2)
       LABELVALUE <%= target_name %> ADCS VELZ WITH_UNITS 24
+        SETTING TEXTCOLOR var(--color-data-visualization-2)
     END
 
     VERTICALBOX "Attitude"
       LABELVALUE <%= target_name %> ADCS Q1 WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
-        SETTING TEXTCOLOR RED
       LABELVALUE <%= target_name %> ADCS Q2 WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
-        SUBSETTING 0 TEXTCOLOR BLUE
-        SUBSETTING 1 TEXTCOLOR GREEN
       LABELVALUE <%= target_name %> ADCS Q3 WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
-        SETTING BACKCOLOR PURPLE
       LABELVALUE <%= target_name %> ADCS Q4 WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
-        SUBSETTING 0 BACKCOLOR ORANGE
       LABELVALUE <%= target_name %> ADCS BIASX WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
       LABELVALUE <%= target_name %> ADCS BIASY WITH_UNITS 12 RIGHT
@@ -37,25 +39,23 @@ VERTICAL
     END
 
     VERTICALBOX "File Progress"
-      LABELPROGRESSBAR <%= target_name %> ADCS POSPROGRESS
+      LABELPROGRESSBAR <%= target_name %> ADCS POSPROGRESS 1 200 # scale 1, width 200
       LABELPROGRESSBAR <%= target_name %> ADCS ATTPROGRESS
-      LABELPROGRESSBAR <%= target_name %> ADCS ATTPROGRESS 2 60 RAW # scale by 2
+      LABELPROGRESSBAR <%= target_name %> ADCS ATTPROGRESS 2 # scale by 2
 
       LABEL ""
       LABEL "LEFT"
         SETTING PADDING 5
         SETTING TEXTALIGN LEFT
-        SETTING BACKCOLOR RED
+        SETTING BACKCOLOR var(--color-data-visualization-1)
       LABEL "CENTER"
         SETTING PADDING 5
         SETTING TEXTALIGN CENTER
-        SETTING TEXTCOLOR BLACK
-        SETTING BACKCOLOR WHITE
+        SETTING BACKCOLOR var(--color-data-visualization-2)
       LABEL "RIGHT"
         SETTING PADDING 5
         SETTING TEXTALIGN RIGHT
-        SETTING TEXTCOLOR WHITE
-        SETTING BACKCOLOR BLUE
+        SETTING BACKCOLOR var(--color-data-visualization-3)
     END
   END
 

data/targets/INST/screens/array.txt

@@ -1,16 +1,12 @@
 SCREEN AUTO AUTO 1.0
-GLOBAL_SETTING ARRAY COLORBLIND TRUE
-GLOBAL_SETTING TEXTBOX COLORBLIND TRUE
 
 VERTICAL
   TITLE "<%= target_name %> Instrument Array Data"
   ARRAY <%= target_name %> HEALTH_STATUS ARY
-  ARRAY <%= target_name %> HEALTH_STATUS ARY 300 50 nil 8 FORMATTED
-  ARRAY <%= target_name %> HEALTH_STATUS ARY2 300 50 nil 5 WITH_UNITS
-  TEXTBOX <%= target_name %> HEALTH_STATUS ARY 200 50
+  ARRAY <%= target_name %> HEALTH_STATUS ARY 300 65 nil 8 FORMATTED
+  ARRAY <%= target_name %> HEALTH_STATUS ARY2 300 65 nil 5 WITH_UNITS
+  TEXTBOX <%= target_name %> HEALTH_STATUS ARY 200 65
   TEXTBOX <%= target_name %> HEALTH_STATUS ARY2 300 200
-  ARRAY <%= target_name %> HEALTH_STATUS GROUND1STATUS 300 50 nil 8 FORMATTED
-  ARRAY <%= target_name %> HEALTH_STATUS GROUND2STATUS 300 50 nil 5 WITH_UNITS
-  TEXTBOX <%= target_name %> HEALTH_STATUS GROUND1STATUS 300 50
-  TEXTBOX <%= target_name %> HEALTH_STATUS GROUND2STATUS 300 100
+  ARRAY <%= target_name %> HEALTH_STATUS GROUND1STATUS 300 65 nil 8 FORMATTED
+  ARRAY <%= target_name %> HEALTH_STATUS GROUND2STATUS 300 65 nil 5 WITH_UNITS
 END

data/targets/INST/screens/ground.txt

@@ -4,8 +4,8 @@ VERTICAL
   TITLE "<%= target_name %> Instrument Ground Station Status"
 
   CANVAS 650 600
-    # Just demonstrate lines and circles
-    CANVASLINE 0 3 650 3 blue 3
+    # Example of lines and circles
+    # CANVASLINE 0 3 650 3 blue 3
     # CANVASDOT 10 15 BLUE 5
     CANVASLABEL 200 30 "Ground Contact Status"
 
@@ -17,7 +17,6 @@ VERTICAL
     #  SETTING TLM_AND <%= target_name %> HEALTH_STATUS COLLECTS VALUE_EQ 0
     #  SETTING IMAGE true "ground_on.png" 100 200
     #  SETTING IMAGE false "ground_off.png" 100 200
-    CANVASLINE 10 10 640 10 blue 3
     CANVASIMAGE "satellite.png" 90 130 200 200
       # If the image is clicked the "<%= target_name %> ADCS" screen will popup
       SETTING SCREEN <%= target_name %> ADCS

data/targets/INST/screens/hs.txt

@@ -1,14 +1,9 @@
 SCREEN AUTO AUTO 0.5
-GLOBAL_SETTING LABELVALUELIMITSBAR COLORBLIND TRUE
-GLOBAL_SETTING LABELVALUELIMITSBAR TEXTCOLOR BLACK
-GLOBAL_SETTING LABELVALUE TEXTCOLOR BLACK
-GLOBAL_SETTING VERTICALBOX TEXTCOLOR BLACK
+# Apply a setting to all LABELVALUEs
+# GLOBAL_SETTING LABELVALUE TEXTCOLOR BLACK
 
 VERTICAL
-
   TITLE "<%= target_name %> Instrument Health and Status"
-  SETTING BACKCOLOR 162 181 205
-  SETTING TEXTCOLOR black
 
   VERTICALBOX "General Telemetry"
     BUTTON 'Start Collect' 'api.cmd("<%= target_name %> COLLECT with TYPE NORMAL, DURATION 5")'
@@ -17,10 +12,9 @@ VERTICAL
     LABELVALUE <%= target_name %> HEALTH_STATUS DURATION
     LABELVALUE <%= target_name %> HEALTH_STATUS ASCIICMD WITH_UNITS 40
   END
-  SETTING BACKCOLOR 163 185 163
 
   VERTICALBOX "Temperatures"
-    LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1 WITH_UNITS 7
+    LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1 WITH_UNITS
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP2 CONVERTED 25
     # LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP2 RAW 20 # RAW is not allowed for LIMITSBAR widgets
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP2 FORMATTED
@@ -28,14 +22,16 @@ VERTICAL
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP3
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP4
   END
-  SETTING BACKCOLOR 203 173 158
 
   VERTICALBOX "Ground Station"
     LABELVALUE <%= target_name %> HEALTH_STATUS GROUND1STATUS CONVERTED 18
     LABELVALUE <%= target_name %> HEALTH_STATUS GROUND2STATUS CONVERTED 18
   END
-  SETTING BACKCOLOR 207 171 175
+  # You can apply settings to an entire box
+  SETTING BACKCOLOR var(--color-data-visualization-2)
+  SETTING TEXTCOLOR BLACK
 
   <%= render "_footer.txt" %>
 END
-SETTING BACKCOLOR 162 181 205
+# You can also apply BACKCOLOR to the entire screen
+# SETTING BACKCOLOR var(--color-data-visualization-1)

data/targets/INST2/cmd_tlm/inst_cmds.txt

@@ -9,6 +9,9 @@ COMMAND <%= target_name %> COLLECT BIG_ENDIAN "Starts a collect on the <%= targe
     FORMAT_STRING "0x%0X"
   PARAMETER    TEMP          120  32  FLOAT 0.0 25.0 0.0 "Collect temperature"
     UNITS Celsius C
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS COLLECTS
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS DURATION
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS COLLECT_TYPE
 
 COMMAND <%= target_name %> ABORT BIG_ENDIAN "Aborts a collect on the <%= target_name %> instrument"
   <%= render "_ccsds_cmd.txt", locals: {id: 2} %>
@@ -16,12 +19,14 @@ COMMAND <%= target_name %> ABORT BIG_ENDIAN "Aborts a collect on the <%= target_
 COMMAND <%= target_name %> CLEAR BIG_ENDIAN "Clears counters on the <%= target_name %> instrument"
   HAZARDOUS "Clearing counters may lose valuable information."
   <%= render "_ccsds_cmd.txt", locals: {id: 3} %>
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS COLLECTS
 
 COMMAND <%= target_name %> SETPARAMS BIG_ENDIAN "Sets numbered parameters"
   <%= render "_ccsds_cmd.txt", locals: {id: 4} %>
   # ERB syntax:
   <% (1..5).each do |i| %>
     APPEND_PARAMETER VALUE<%= i %> 16 UINT 0 5 1 "Value <%= i %> setting"
+    RELATED_ITEM <%= target_name %> PARAMS VALUE<%= i %>
   <% end %>
 
   SELECT_PARAMETER VALUE5
@@ -35,6 +40,7 @@ COMMAND <%= target_name %> ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
     STATE "NOOP" "NOOP" DISABLE_MESSAGES
   APPEND_PARAMETER BINARY 32 STRING 0xDEADBEEF "Binary string"
   APPEND_PARAMETER ASCII 80 STRING "0xDEADBEEF" "ASCII string"
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS ASCIICMD
 
 COMMAND <%= target_name %> FLTCMD BIG_ENDIAN "Command with float parameters"
   <%= render "_ccsds_cmd.txt", locals: {id: 6} %>
@@ -48,14 +54,25 @@ COMMAND <%= target_name %> ARYCMD BIG_ENDIAN "Command with array parameter"
 
 COMMAND <%= target_name %> SLRPNLDEPLOY BIG_ENDIAN "Deploy solar array panels"
   <%= render "_ccsds_cmd.txt", locals: {id: 8} %>
+  RELATED_ITEM <%= target_name %> MECH SLRPNL1
+  RELATED_ITEM <%= target_name %> MECH SLRPNL2
+  RELATED_ITEM <%= target_name %> MECH SLRPNL3
+  RELATED_ITEM <%= target_name %> MECH SLRPNL4
+  RELATED_ITEM <%= target_name %> MECH SLRPNL5
 
 COMMAND <%= target_name %> SLRPNLRESET BIG_ENDIAN "Reset solar array panels"
   <%= render "_ccsds_cmd.txt", locals: {id: 9} %>
+  RELATED_ITEM <%= target_name %> MECH SLRPNL1
+  RELATED_ITEM <%= target_name %> MECH SLRPNL2
+  RELATED_ITEM <%= target_name %> MECH SLRPNL3
+  RELATED_ITEM <%= target_name %> MECH SLRPNL4
+  RELATED_ITEM <%= target_name %> MECH SLRPNL5
 
 COMMAND <%= target_name %> MEMLOAD BIG_ENDIAN "Load memory"
   DISABLE_MESSAGES # Disable messages on a command that could be sent many many times
   <%= render "_ccsds_cmd.txt", locals: {id: 10} %>
   APPEND_PARAMETER DATA 80 BLOCK "" "Block of data"
+  RELATED_ITEM <%= target_name %> HEALTH_STATUS BLOCKTEST
 
 COMMAND <%= target_name %> QUIET BIG_ENDIAN "Enable/disable no out of limits in the demo"
   <%= render "_ccsds_cmd.txt", locals: {id: 11} %>

data/targets/INST2/cmd_tlm/inst_tlm.txt

@@ -145,5 +145,6 @@ TELEMETRY <%= target_name %> MECH BIG_ENDIAN "Mechanism status"
     UNITS DEGREES DEG
   APPEND_ITEM CURRENT       32 FLOAT    "Device current"
     UNITS micro-Ampères µA
+  APPEND_ITEM STRING       0 STRING     "String"
   ITEM PACKET_TIME 0 0 DERIVED "Ruby time based on TIMESEC and TIMEUS"
     READ_CONVERSION openc3/conversions/unix_time_conversion.py TIMESEC TIMEUS

data/targets/INST2/lib/sim_inst.py

@@ -373,6 +373,7 @@ class SimInst(SimulatedTarget):
                     packet.write("slrpnl4", self.solar_panel_positions[3])
                     packet.write("slrpnl5", self.solar_panel_positions[4])
                     packet.write("current", 0.5)
+                    packet.write("string", f"Time is {time}")
 
         # Every 10s throw an unknown packet at the server just to demo that
         if count_100hz % 1000 == 900:

data/targets/INST2/procedures/my_script_suite.py

@@ -1,7 +1,6 @@
-from openc3.script.exceptions import *
 from openc3.script.suite import Group, Suite
 
-load_utility("INST/procedures/utilities/clear.py")
+load_utility("INST2/procedures/utilities/clear.py")
 
 
 class ExampleGroup(Group):
@@ -12,7 +11,7 @@ class ExampleGroup(Group):
         print(
             f"Running {Group.current_suite()}:{Group.current_group()}:{Group.current_script()}"
         )
-        Group.puts("This test verifies requirement 1")
+        Group.print("This test verifies requirement 1")
         raise RuntimeError("error")
         print("continue past raise")  # NOSONAR
 
@@ -20,7 +19,7 @@ class ExampleGroup(Group):
         print(
             f"Running {Group.current_suite()}:{Group.current_group()}:{Group.current_script()}"
         )
-        Group.puts("This test verifies requirement 2")
+        Group.print("This test verifies requirement 2")
         self.helper()
         wait(2)
 

data/targets/INST2/procedures/my_test_suite.py

@@ -9,7 +9,7 @@ class ExampleTest(Test):
         print(
             f"Running {Test.current_test_suite()}:{Test.current_test()}:{Test.current_test_case()}"
         )
-        Test.puts("This test verifies requirement 1")
+        Test.print("This test verifies requirement 1")
         raise RuntimeError("error")
         print("continue past raise")  # NOSONAR
 
@@ -17,7 +17,7 @@ class ExampleTest(Test):
         print(
             f"Running {Test.current_test_suite()}:{Test.current_test()}:{Test.current_test_case()}"
         )
-        Test.puts("This test verifies requirement 2")
+        Test.print("This test verifies requirement 2")
         self.helper()
         wait(2)
 

data/targets/INST2/procedures/streaming.py

@@ -0,0 +1,29 @@
+from datetime import datetime, timezone, timedelta
+from openc3.script.web_socket_api import StreamingWebSocketApi
+
+
+with StreamingWebSocketApi() as api:
+    api.add(
+        # Get a list of individual telemetry items
+        items=[
+            "DECOM__TLM__INST__HEALTH_STATUS__TEMP1__CONVERTED",
+            "DECOM__TLM__INST__HEALTH_STATUS__TEMP2__CONVERTED",
+        ]
+    )
+    for _ in range(5):
+        print(api.read())
+    api.remove(items=["DECOM__TLM__INST__HEALTH_STATUS__TEMP1__CONVERTED"])
+    for _ in range(5):
+        print(api.read())
+
+# Warning this saves all data to RAM. Do not use for large queries
+now = datetime.now(timezone.utc)
+data = StreamingWebSocketApi.read_all(
+    items=[
+        "DECOM__TLM__INST__HEALTH_STATUS__TEMP1__CONVERTED",
+        "DECOM__TLM__INST__HEALTH_STATUS__TEMP2__CONVERTED",
+    ],
+    start_time=now - timedelta(seconds=30),
+    end_time=now + timedelta(seconds=5),
+)
+print(data)

data/targets/INST2/screens/adcs.txt

@@ -7,27 +7,29 @@ VERTICAL
   HORIZONTAL
     VERTICALBOX "Position and Velocity"
       LABELVALUE <%= target_name %> ADCS POSX WITH_UNITS 20 CENTER
+        # We recommend using these built-in colors from 1-8
+        SETTING TEXTCOLOR var(--color-data-visualization-1)
       LABELVALUE <%= target_name %> ADCS POSY WITH_UNITS 22 CENTER
+        SETTING TEXTCOLOR var(--color-data-visualization-1)
       LABELVALUE <%= target_name %> ADCS POSZ WITH_UNITS 24 CENTER
+        SETTING TEXTCOLOR var(--color-data-visualization-1)
       LABELVALUE <%= target_name %> ADCS VELX WITH_UNITS 20
+        SETTING TEXTCOLOR var(--color-data-visualization-2)
       LABELVALUE <%= target_name %> ADCS VELY WITH_UNITS 22
+        SETTING TEXTCOLOR var(--color-data-visualization-2)
       LABELVALUE <%= target_name %> ADCS VELZ WITH_UNITS 24
+        SETTING TEXTCOLOR var(--color-data-visualization-2)
     END
 
     VERTICALBOX "Attitude"
       LABELVALUE <%= target_name %> ADCS Q1 WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
-        SETTING TEXTCOLOR RED
       LABELVALUE <%= target_name %> ADCS Q2 WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
-        SUBSETTING 0 TEXTCOLOR BLUE
-        SUBSETTING 1 TEXTCOLOR GREEN
       LABELVALUE <%= target_name %> ADCS Q3 WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
-        SETTING BACKCOLOR PURPLE
       LABELVALUE <%= target_name %> ADCS Q4 WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
-        SUBSETTING 0 BACKCOLOR ORANGE
       LABELVALUE <%= target_name %> ADCS BIASX WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
       LABELVALUE <%= target_name %> ADCS BIASY WITH_UNITS 12 RIGHT
@@ -37,25 +39,23 @@ VERTICAL
     END
 
     VERTICALBOX "File Progress"
-      LABELPROGRESSBAR <%= target_name %> ADCS POSPROGRESS
+      LABELPROGRESSBAR <%= target_name %> ADCS POSPROGRESS 1 200 # scale 1, width 200
       LABELPROGRESSBAR <%= target_name %> ADCS ATTPROGRESS
-      LABELPROGRESSBAR <%= target_name %> ADCS ATTPROGRESS 2 60 RAW # scale by 2
+      LABELPROGRESSBAR <%= target_name %> ADCS ATTPROGRESS 2 # scale by 2
 
       LABEL ""
       LABEL "LEFT"
         SETTING PADDING 5
         SETTING TEXTALIGN LEFT
-        SETTING BACKCOLOR RED
+        SETTING BACKCOLOR var(--color-data-visualization-1)
       LABEL "CENTER"
         SETTING PADDING 5
         SETTING TEXTALIGN CENTER
-        SETTING TEXTCOLOR BLACK
-        SETTING BACKCOLOR WHITE
+        SETTING BACKCOLOR var(--color-data-visualization-2)
       LABEL "RIGHT"
         SETTING PADDING 5
         SETTING TEXTALIGN RIGHT
-        SETTING TEXTCOLOR WHITE
-        SETTING BACKCOLOR BLUE
+        SETTING BACKCOLOR var(--color-data-visualization-3)
     END
   END
 

data/targets/INST2/screens/array.txt

@@ -1,16 +1,12 @@
 SCREEN AUTO AUTO 1.0
-GLOBAL_SETTING ARRAY COLORBLIND TRUE
-GLOBAL_SETTING TEXTBOX COLORBLIND TRUE
 
 VERTICAL
   TITLE "<%= target_name %> Instrument Array Data"
   ARRAY <%= target_name %> HEALTH_STATUS ARY
-  ARRAY <%= target_name %> HEALTH_STATUS ARY 300 50 nil 8 FORMATTED
-  ARRAY <%= target_name %> HEALTH_STATUS ARY2 300 50 nil 5 WITH_UNITS
-  TEXTBOX <%= target_name %> HEALTH_STATUS ARY 200 50
+  ARRAY <%= target_name %> HEALTH_STATUS ARY 300 65 nil 8 FORMATTED
+  ARRAY <%= target_name %> HEALTH_STATUS ARY2 300 65 nil 5 WITH_UNITS
+  TEXTBOX <%= target_name %> HEALTH_STATUS ARY 200 65
   TEXTBOX <%= target_name %> HEALTH_STATUS ARY2 300 200
-  ARRAY <%= target_name %> HEALTH_STATUS GROUND1STATUS 300 50 nil 8 FORMATTED
-  ARRAY <%= target_name %> HEALTH_STATUS GROUND2STATUS 300 50 nil 5 WITH_UNITS
-  TEXTBOX <%= target_name %> HEALTH_STATUS GROUND1STATUS 300 50
-  TEXTBOX <%= target_name %> HEALTH_STATUS GROUND2STATUS 300 100
+  ARRAY <%= target_name %> HEALTH_STATUS GROUND1STATUS 300 65 nil 8 FORMATTED
+  ARRAY <%= target_name %> HEALTH_STATUS GROUND2STATUS 300 65 nil 5 WITH_UNITS
 END

data/targets/INST2/screens/ground.txt

@@ -4,8 +4,8 @@ VERTICAL
   TITLE "<%= target_name %> Instrument Ground Station Status"
 
   CANVAS 650 600
-    # Just demonstrate lines and circles
-    CANVASLINE 0 3 650 3 blue 3
+    # Example of lines and circles
+    # CANVASLINE 0 3 650 3 blue 3
     # CANVASDOT 10 15 BLUE 5
     CANVASLABEL 200 30 "Ground Contact Status"
 
@@ -17,7 +17,6 @@ VERTICAL
     #  SETTING TLM_AND <%= target_name %> HEALTH_STATUS COLLECTS VALUE_EQ 0
     #  SETTING IMAGE true "ground_on.png" 100 200
     #  SETTING IMAGE false "ground_off.png" 100 200
-    CANVASLINE 10 10 640 10 blue 3
     CANVASIMAGE "satellite.png" 90 130 200 200
       # If the image is clicked the "<%= target_name %> ADCS" screen will popup
       SETTING SCREEN <%= target_name %> ADCS

data/targets/INST2/screens/hs.txt

@@ -1,14 +1,9 @@
 SCREEN AUTO AUTO 0.5
-GLOBAL_SETTING LABELVALUELIMITSBAR COLORBLIND TRUE
-GLOBAL_SETTING LABELVALUELIMITSBAR TEXTCOLOR BLACK
-GLOBAL_SETTING LABELVALUE TEXTCOLOR BLACK
-GLOBAL_SETTING VERTICALBOX TEXTCOLOR BLACK
+# Apply a setting to all LABELVALUEs
+# GLOBAL_SETTING LABELVALUE TEXTCOLOR BLACK
 
 VERTICAL
-
   TITLE "<%= target_name %> Instrument Health and Status"
-  SETTING BACKCOLOR 162 181 205
-  SETTING TEXTCOLOR black
 
   VERTICALBOX "General Telemetry"
     BUTTON 'Start Collect' 'api.cmd("<%= target_name %> COLLECT with TYPE NORMAL, DURATION 5")'
@@ -17,10 +12,9 @@ VERTICAL
     LABELVALUE <%= target_name %> HEALTH_STATUS DURATION
     LABELVALUE <%= target_name %> HEALTH_STATUS ASCIICMD WITH_UNITS 40
   END
-  SETTING BACKCOLOR 163 185 163
 
   VERTICALBOX "Temperatures"
-    LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1 WITH_UNITS 7
+    LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1 WITH_UNITS
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP2 CONVERTED 25
     # LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP2 RAW 20 # RAW is not allowed for LIMITSBAR widgets
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP2 FORMATTED
@@ -28,14 +22,16 @@ VERTICAL
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP3
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP4
   END
-  SETTING BACKCOLOR 203 173 158
 
   VERTICALBOX "Ground Station"
     LABELVALUE <%= target_name %> HEALTH_STATUS GROUND1STATUS CONVERTED 18
     LABELVALUE <%= target_name %> HEALTH_STATUS GROUND2STATUS CONVERTED 18
   END
-  SETTING BACKCOLOR 207 171 175
+  # You can apply settings to an entire box
+  SETTING BACKCOLOR var(--color-data-visualization-2)
+  SETTING TEXTCOLOR BLACK
 
   <%= render "_footer.txt" %>
 END
-SETTING BACKCOLOR 162 181 205
+# You can also apply BACKCOLOR to the entire screen
+# SETTING BACKCOLOR var(--color-data-visualization-1)

data/targets/INST2/tables/procedures/{download.rb → download.py}

@@ -1,9 +1,11 @@
+import os
+
 # TBL_FILENAME is set to the name of the table file to overwrite
-puts "file:#{ENV['TBL_FILENAME']}"
+print(f"file:{os.environ['TBL_FILENAME']}")
 # Download the file
 # Implement custom commanding logic to download the table
 # You probably want to do something like:
-buffer = ''
+buffer = ""
 # i = 1
 # num_segments = 5 # calculate based on TBL_FILENAME
 # table_id = 1  # calculate based on TBL_FILENAME
@@ -13,4 +15,4 @@ buffer = ''
 #   buffer += tlm("TGT DUMP_PKT DATA")
 #   i += 1
 # end
-put_target_file(ENV['TBL_FILENAME'], buffer)
+put_target_file(os.environ["TBL_FILENAME"], buffer)

data/targets/INST2/tables/procedures/{upload.rb → upload.py}

@@ -1,9 +1,11 @@
+import os
+from openc3.utilities.string import formatted
+
 # TBL_FILENAME is set to the name of the table file
-puts "file:#{ENV['TBL_FILENAME']}"
+print(f"file:{os.environ['TBL_FILENAME']}")
 # Open the file
-file = get_target_file(ENV['TBL_FILENAME'])
-buffer = file.read
-# puts buffer.formatted
+file = get_target_file(os.environ["TBL_FILENAME"])
+buffer = file.read()
 # Implement custom commanding logic to upload the table
 # Note that buffer is a Ruby string of bytes
 # You probably want to do something like:
@@ -16,4 +18,4 @@ buffer = file.read
 #   cmd("TGT", "UPLOAD", "DATA" => buffer[i...(i + buf_size)])
 #   i += buf_size
 # end
-file.delete
+file.close()

data/targets/SYSTEM/procedures/interactive.rb

@@ -12,9 +12,9 @@ answer = combo_box("This is a combo box", 'one', 'two', 'three', text_color: 'bl
 puts "answer:#{answer}"
 answer = combo_box("This is a multi-select combo box", 'one', 'two', 'three', multiple: true)
 puts "answer:#{answer} len:#{answer.length} [0]:#{answer[0]}"
-answer = prompt("This is a test", text_color: 'blue', background_color: 'grey', font_size: 20, font_family: 'courier', informative: "Informative text", details: "Some more stuff")
+answer = prompt("This is a test", text_color: 'blue', background_color: 'grey', font_size: 20, font_family: 'courier', details: "Some more stuff")
 puts "answer:#{answer}"
-answer = prompt("This is a test", font_size: 30, details: "Some more stuff", informative: nil)
+answer = prompt("This is a test", font_size: 30, details: "Some more stuff")
 puts "answer:#{answer}"
 answer = message_box('This is a message box', 'one', 'two', 'three', text_color: 'blue', background_color: 'grey', font_size: 20, font_family: 'courier', informative: "Informative stuff", details: "Some more stuff")
 puts "answer:#{answer}"

data/targets/SYSTEM/procedures/openc3_api_test.rb

@@ -145,15 +145,15 @@ send_raw("INT1")
 send_raw("INT1", "\x00\x00")
 send_raw("INT1", "\x00\x00", "\x00\x00")
 
-# get_all_commands
+# get_all_cmds
 expected_cmds = %w(ABORT ARYCMD ASCIICMD CLEAR COLLECT FLTCMD SETPARAMS SLRPNLDEPLOY SLRPNLRESET)
-commands = get_all_commands("INST")
+commands = get_all_cmds("INST")
 puts commands.inspect
 
-# get_all_commands should fail
-get_all_commands()
-get_all_commands("BOB")
-get_all_commands("BOB", "TED")
+# get_all_cmds should fail
+get_all_cmds()
+get_all_cmds("BOB")
+get_all_cmds("BOB", "TED")
 
 # get_cmd_hazardous
 hazardous = get_cmd_hazardous("INST", "COLLECT", "TYPE" => "SPECIAL")