openc3-cosmos-demo 5.17.0 → 5.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed4042f3f09a163a40bf3ddaf942534b4aa0c75d315204ae32f28d65ab6a50fb
-  data.tar.gz: 96a13c0677b8541a78da04a6e87b378201df776f0fbaeab2c7fbfa4afd6856b8
+  metadata.gz: 87c9ee255c1daaa1baebe544379a8367a5063a4ee20204662999222e385e573c
+  data.tar.gz: 2bd9074233c6cd5ccdb67da4f498d066f01d809575030518c1a693cb91e6a6b8
 SHA512:
-  metadata.gz: 1750e61e594a00b9303e81fbc0f0aa95a80ac50039231f56e4e50ec17acb715244a45b27635b63608e0f69491510c16db74b01cf57e3c463b1e8c6a431078988
-  data.tar.gz: 8d2504f216baa1660331a2b1de9292417916c283fa4b02c91898c525d134e57c716171b110777eef552cac62d841044fefb672faf6b3bbf86ba952b32ec110cb
+  metadata.gz: 898776dbf48af38d2cab0bcc69950461f6be998148438b3332e50e87a18dd0438189d5ad60c64dc96f0d0b00ecf7bc6cf87ae592a5544b47d8e919a46c1457a6
+  data.tar.gz: 0c7be454f5cc752c79b0eece33fa56511c25f3ce60bbe3603916ca79071dab02b6d8ea62b568febd298e334c5ae7b8a82a25afea7011ad408512485b858a93b6

data/plugin.txt

@@ -36,9 +36,14 @@ VARIABLE reduced_log_retain_time 2592000
 
 <% if include_inst %>
   TARGET INST <%= inst_target_name %>
+    # If we're in the CI pipeline shorten the log file creation time
+    <% if ENV["CI"] %>
+      TLM_LOG_CYCLE_TIME 60
+    <% else %>
+      TLM_LOG_CYCLE_TIME 300
+    <% end %>
     LOG_RETAIN_TIME <%= log_retain_time %>
     REDUCED_LOG_RETAIN_TIME <%= reduced_log_retain_time %>
-    TLM_LOG_CYCLE_TIME 300
     # Allow the reducer microservice to take 50% of the cpu (default 30%)
     REDUCER_MAX_CPU_UTILIZATION 50
 <% end %>

data/targets/INST/cmd_tlm/inst_tlm.txt

@@ -49,6 +49,7 @@ TELEMETRY <%= target_name %> HEALTH_STATUS BIG_ENDIAN "Health and status from th
     STATE CONNECTED 1 GREEN
     STATE UNAVAILABLE 0 YELLOW
   APPEND_ITEM BLOCKTEST 80 BLOCK "Block data"
+  APPEND_ITEM BRACKET[0] 8 UINT "Regular item with brackets in the name"
   ITEM PACKET_TIME 0 0 DERIVED "Ruby time based on TIMESEC and TIMEUS"
     READ_CONVERSION unix_time_conversion.rb TIMESEC TIMEUS
   ITEM TEMP1HIGH 0 0 DERIVED "High-water mark for TEMP1"

data/targets/INST/lib/sim_inst.rb

@@ -47,8 +47,14 @@ module OpenC3
       @position_file_bytes_read = 0
       @attitude_file_bytes_read = 0
 
+      @images = []
       data = File.read(File.join(@target.dir, 'public', 'spiral.jpg'), mode: "rb")
-      @image = Base64.encode64(data)
+      @images << Base64.encode64(data)
+      data = File.read(File.join(@target.dir, 'public', 'sun.jpg'), mode: "rb")
+      @images << Base64.encode64(data)
+      data = File.read(File.join(@target.dir, 'public', 'ganymede.jpg'), mode: "rb")
+      @images << Base64.encode64(data)
+      @cur_image = 0
 
       @pos_packet = Structure.new(:BIG_ENDIAN)
       @pos_packet.append_item('DAY', 16, :UINT)
@@ -319,6 +325,7 @@ module OpenC3
             cycle_tlm_item(packet, 'temp3', -30.0, 80.0, 2.0)
           end
           cycle_tlm_item(packet, 'temp4', 0.0, 20.0, -0.1)
+          cycle_tlm_item(packet, 'bracket[0]', 0, 255, 10)
 
           packet.timesec = time.tv_sec - @time_offset
           packet.timeus  = time.tv_usec
@@ -359,12 +366,16 @@ module OpenC3
         when 'IMAGE'
           packet.timesec = time.tv_sec - @time_offset
           packet.timeus = time.tv_usec
-          packet.image = @image
+          packet.ccsdsseqcnt += 1
+          if packet.ccsdsseqcnt % 20 == 0
+            @cur_image += 1
+            @cur_image = 0 if @cur_image == @images.length
+          end
+          packet.image = @images[@cur_image]
           # Create an Array and then initialize
           # using a sample of all possible hex values (0..15)
           # finally pack it into binary using the Character 'C' specifier
           packet.block = Array.new(1000) { Array(0..15).sample }.pack("C*")
-          packet.ccsdsseqcnt += 1
 
         when 'MECH'
           packet.timesec = time.tv_sec - @time_offset

data/targets/INST/screens/array.txt

@@ -5,6 +5,14 @@ VERTICAL
   ARRAY <%= target_name %> HEALTH_STATUS ARY
   LABELVALUE <%= target_name %> HEALTH_STATUS ARY[0] RAW
   LABELVALUE <%= target_name %> HEALTH_STATUS ARY[1] WITH_UNITS
+  # This item is actually called BRACKET[0] as the name
+  # thus we have to escape the value here to avoid it
+  # being treated like an array item
+  LABELVALUE <%= target_name %> HEALTH_STATUS BRACKET[[0]]
+  LABELSPARKLINE <%= target_name %> HEALTH_STATUS ARY[1]
+    SETTING HISTORY 60s
+  LABELSPARKLINE <%= target_name %> HEALTH_STATUS BRACKET[[0]]
+    SETTING HISTORY 60s
   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

data/targets/INST/screens/commanding.txt

@@ -52,6 +52,6 @@ VERTICAL
       # Set some environment variables to be used by the script as ENV['TYPE']
       # See INST/procedures/checks.rb for an example of usage
       "var env = {}; env['TYPE'] = ctype;" \
-      "runScript('INST/procedures/'+script, !screen.getNamedWidget('BG').checked(), env)"
+      "runScript('<%= target_name %>/procedures/'+script, !screen.getNamedWidget('BG').checked(), env)"
   END
 END

data/targets/INST/screens/image.txt

@@ -1,3 +1,5 @@
 SCREEN AUTO AUTO 1.0
 
-IMAGEVIEWER INST IMAGE IMAGE png
+IMAGEVIEWER <%= target_name %> IMAGE IMAGE png
+  SETTING WIDTH 300
+  SETTING HEIGHT 300

data/targets/INST/screens/latest.txt

@@ -1,20 +1,18 @@
 SCREEN AUTO AUTO 1.0
 
 VERTICAL
-
   TITLE "<%= target_name %> Instrument Latest Header"
 
   VERTICALBOX "Header"
-    LABELVALUE INST LATEST CCSDSVER
-    LABELVALUE INST LATEST CCSDSTYPE
-    LABELVALUE INST LATEST CCSDSSHF
-    LABELVALUE INST LATEST CCSDSAPID
-    LABELVALUE INST LATEST CCSDSSEQFLAGS
-    LABELVALUE INST LATEST CCSDSSEQCNT
-    LABELVALUE INST LATEST CCSDSLENGTH
-    LABELVALUE INST LATEST TIMESEC
-    LABELVALUE INST LATEST TIMEUS
-    LABELVALUE INST LATEST PKTID
+    LABELVALUE <%= target_name %> LATEST CCSDSVER
+    LABELVALUE <%= target_name %> LATEST CCSDSTYPE
+    LABELVALUE <%= target_name %> LATEST CCSDSSHF
+    LABELVALUE <%= target_name %> LATEST CCSDSAPID
+    LABELVALUE <%= target_name %> LATEST CCSDSSEQFLAGS
+    LABELVALUE <%= target_name %> LATEST CCSDSSEQCNT
+    LABELVALUE <%= target_name %> LATEST CCSDSLENGTH
+    LABELVALUE <%= target_name %> LATEST TIMESEC
+    LABELVALUE <%= target_name %> LATEST TIMEUS
+    LABELVALUE <%= target_name %> LATEST PKTID
   END
-
 END

data/targets/INST/screens/launcher.txt

@@ -2,9 +2,9 @@ SCREEN AUTO AUTO 1
 
 TITLE 'Screen Launcher'
 HORIZONTAL
-  BUTTON 'HS' "screen.open('INST', 'HS')"
-  BUTTON 'CMD' "screen.open('INST', 'COMMANDING')"
-  BUTTON 'GROUND' "screen.open('INST', 'GROUND')"
+  BUTTON 'HS' "screen.open('<%= target_name %>', 'HS')"
+  BUTTON 'CMD' "screen.open('<%= target_name %>', 'COMMANDING')"
+  BUTTON 'GROUND' "screen.open('<%= target_name %>', 'GROUND')"
 END
-BUTTON 'Close HS & CMD' "screen.close('INST', 'HS');; screen.close('INST', 'COMMANDING')"
+BUTTON 'Close HS & CMD' "screen.close('<%= target_name %>', 'HS');; screen.close('<%= target_name %>', 'COMMANDING')"
 BUTTON 'Close All' "screen.closeAll()" # including this screen!

data/targets/INST/screens/limits.txt

@@ -6,28 +6,33 @@ HORIZONTAL
   VERTICALBOX "Limits Bars"
     LIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
     VALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
+      SUBSETTING 0 WIDTH 130
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
     # The TEMP1 limits are defined as follow:
     # LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0 -20.0 20.0
     # Thus the following are examples of limiting the limitsbar
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
-      SUBSETTING 1 MIN_VALUE -80
-      SUBSETTING 1 MAX_VALUE 80
+      SUBSETTING 1 WIDTH 130
+      SUBSETTING 2 MIN_VALUE -80
+      SUBSETTING 2 MAX_VALUE 80
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
-      SUBSETTING 1 MIN_VALUE -75
-      SUBSETTING 1 MAX_VALUE 70
+      SUBSETTING 1 WIDTH 130
+      SUBSETTING 2 MIN_VALUE -75
+      SUBSETTING 2 MAX_VALUE 70
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
-      SUBSETTING 1 MIN_VALUE -70
-      SUBSETTING 1 MAX_VALUE 60
+      SUBSETTING 1 WIDTH 130
+      SUBSETTING 2 MIN_VALUE -70
+      SUBSETTING 2 MAX_VALUE 60
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
-      SUBSETTING 1 MIN_VALUE -50
-      SUBSETTING 1 MAX_VALUE 50
+      SUBSETTING 1 WIDTH 130
+      SUBSETTING 2 MIN_VALUE -50
+      SUBSETTING 2 MAX_VALUE 50
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
-      SUBSETTING 1 MIN_VALUE -20
-      SUBSETTING 1 MAX_VALUE 20
-    LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
-      SUBSETTING 1 MIN_VALUE -10
-      SUBSETTING 1 MAX_VALUE 10
+      SUBSETTING 0 TEXTCOLOR grey
+      SUBSETTING 1 WIDTH 130
+      SUBSETTING 1 BORDERCOLOR grey
+      SUBSETTING 2 MIN_VALUE -20
+      SUBSETTING 2 MAX_VALUE 20
   END
   VERTICAL
     VERTICALBOX "Range Bars 0-100"
@@ -46,21 +51,22 @@ END
 HORIZONTAL
   VERTICALBOX "Limits Columns"
     HORIZONTAL
-      LIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2
-      VALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2
-      LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
-      # The TEMP2 limits are defined as follow:
-      # LIMITS DEFAULT 1 ENABLED -60.0 -55.0 30.0 35.0
+      LIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
+        SETTING HEIGHT 200
+      VALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
+        SUBSETTING 0 WIDTH 130
+      LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
+        SUBSETTING 1 WIDTH 130
+      # The TEMP3 limits are defined as follow: RL/-25 YL/-10 YH/50 RH/55
       # Thus the following are examples of limiting the limitscolumn
-      LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
-        SUBSETTING 1 MIN_VALUE -60
-        SUBSETTING 1 MAX_VALUE 35
-      LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
-        SUBSETTING 1 MIN_VALUE -55
-        SUBSETTING 1 MAX_VALUE 30
-      LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
-        SUBSETTING 1 MIN_VALUE -20
-        SUBSETTING 1 MAX_VALUE 10
+      LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
+        SUBSETTING 1 WIDTH 130
+        SUBSETTING 2 MIN_VALUE -25
+        SUBSETTING 2 MAX_VALUE 55
+      LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
+        SUBSETTING 1 WIDTH 130
+        SUBSETTING 2 MIN_VALUE -10
+        SUBSETTING 2 MAX_VALUE 50
     END
   END
 

data/targets/INST/screens/other.txt

@@ -16,7 +16,7 @@ SCROLLWINDOW 200
     LABEL "TestText" Courier 14 # 14pt courier
   END
 
-  LABELVALUEDESC INST HEALTH_STATUS TEMP1
-  LABELVALUEDESC INST HEALTH_STATUS TEMP1 "Description"
-  TEXTBOX INST ADCS PACKET_TIMEFORMATTED 400 100
+  LABELVALUEDESC <%= target_name %> HEALTH_STATUS TEMP1
+  LABELVALUEDESC <%= target_name %> HEALTH_STATUS TEMP1 "Description"
+  TEXTBOX <%= target_name %> ADCS PACKET_TIMEFORMATTED 400 100
 END

data/targets/INST/screens/rollup.txt

@@ -2,21 +2,28 @@ SCREEN AUTO AUTO 1.0
 
 HORIZONTAL
   ROLLUP antenna "GND 1" "transmitter"
-    SETTING SCREEN INST GROUND
-    SETTING TLM INST HEALTH_STATUS GROUND1STATUS
+    SETTING SCREEN <%= target_name %> GROUND
+    SETTING TLM <%= target_name %> HEALTH_STATUS GROUND1STATUS
   ROLLUP netcom "Network"
-    SETTING SCREEN INST GROUND
-    SETTING TLM INST HEALTH_STATUS GROUND2STATUS
+    SETTING SCREEN <%= target_name %> GROUND
+    SETTING TLM <%= target_name %> HEALTH_STATUS GROUND2STATUS
   ROLLUP thermal "TEMP1"
-    SETTING SCREEN INST LIMITS
-    SETTING TLM INST HEALTH_STATUS TEMP1
+    SETTING SCREEN <%= target_name %> LIMITS
+    SETTING TLM <%= target_name %> HEALTH_STATUS TEMP1
   ROLLUP equipment "Processor" "CPU"
-    SETTING SCREEN INST ADCS
-    SETTING TLM INST HEALTH_STATUS TEMP4
+    SETTING SCREEN <%= target_name %> ADCS
+    SETTING TLM <%= target_name %> HEALTH_STATUS TEMP4
   ROLLUP satellite-transmit "Satellite" "all temps"
-    SETTING SCREEN INST HS
-    SETTING TLM INST HEALTH_STATUS TEMP1
-    SETTING TLM INST HEALTH_STATUS TEMP2
-    SETTING TLM INST HEALTH_STATUS TEMP3
-    SETTING TLM INST HEALTH_STATUS TEMP4
+    SETTING SCREEN <%= target_name %> HS
+    SETTING TLM <%= target_name %> HEALTH_STATUS TEMP1
+    SETTING TLM <%= target_name %> HEALTH_STATUS TEMP2
+    SETTING TLM <%= target_name %> HEALTH_STATUS TEMP3
+    SETTING TLM <%= target_name %> HEALTH_STATUS TEMP4
+END
+
+HORIZONTAL
+  LABELVALUE <%= target_name %> HEALTH_STATUS TEMP1
+  SIGNAL <%= target_name %> HEALTH_STATUS TEMP1
+    SETTING VALUES -50 0 50
+    SETTING SCREEN <%= target_name %> HS
 END

data/targets/INST/screens/simple.txt

@@ -3,4 +3,4 @@ SCREEN AUTO AUTO 0.5
 LABELVALUE <%= target_name %> HEALTH_STATUS CCSDSSEQCNT
 
 HELLOWORLD
-BIG <%= target_name %> HEALTH_STATUS TEMP1
+BIG <%= target_name %> HEALTH_STATUS TEMP1

data/targets/INST2/cmd_tlm/inst_tlm.txt

@@ -49,6 +49,7 @@ TELEMETRY <%= target_name %> HEALTH_STATUS BIG_ENDIAN "Health and status from th
     STATE CONNECTED 1 GREEN
     STATE UNAVAILABLE 0 YELLOW
   APPEND_ITEM BLOCKTEST 80 BLOCK "Block data"
+  APPEND_ITEM BRACKET[0] 8 UINT "Regular item with brackets in the name"
   ITEM PACKET_TIME 0 0 DERIVED "Ruby time based on TIMESEC and TIMEUS"
     READ_CONVERSION openc3/conversions/unix_time_conversion.py TIMESEC TIMEUS
   ITEM TEMP1HIGH 0 0 DERIVED "High-water mark for TEMP1"

data/targets/INST2/lib/sim_inst.py

@@ -51,9 +51,17 @@ class SimInst(SimulatedTarget):
         self.position_file_bytes_read = 0
         self.attitude_file_bytes_read = 0
 
+        self.images = []
         with open(os.path.join(self.target.dir, "public", "spiral.jpg"), "rb") as f:
             data = f.read()
-            self.image = base64.b64encode(data)
+            self.images.append(base64.b64encode(data))
+        with open(os.path.join(self.target.dir, "public", "sun.jpg"), "rb") as f:
+            data = f.read()
+            self.images.append(base64.b64encode(data))
+        with open(os.path.join(self.target.dir, "public", "ganymede.jpg"), "rb") as f:
+            data = f.read()
+            self.images.append(base64.b64encode(data))
+        self.cur_image = 0
 
         self.pos_packet = Structure("BIG_ENDIAN")
         self.pos_packet.append_item("DAY", 16, "UINT")
@@ -324,6 +332,7 @@ class SimInst(SimulatedTarget):
                             self.bad_temp2 = True
                         self.cycle_tlm_item(packet, "temp3", -30.0, 80.0, 2.0)
                     self.cycle_tlm_item(packet, "temp4", 0.0, 20.0, -0.1)
+                    self.cycle_tlm_item(packet, "bracket[0]", 0, 255, 10)
 
                     packet.write("timesec", int(time - self.time_offset))
                     packet.write("timeus", int((time % 1) * 1000000))
@@ -358,10 +367,14 @@ class SimInst(SimulatedTarget):
                 case "IMAGE":
                     packet.write("timesec", int(time - self.time_offset))
                     packet.write("timeus", int((time % 1) * 1000000))
-                    packet.write("image", self.image)
+                    packet.write("ccsdsseqcnt", packet.read("ccsdsseqcnt") + 1)
+                    if packet.read("ccsdsseqcnt") % 20 == 0:
+                        self.cur_image += 1
+                        if self.cur_image == len(self.images):
+                            self.cur_image = 0
+                        packet.write("image", self.images[self.cur_image])
                     # Create an Array of random bytes
                     packet.write("block", random.randbytes(1000))
-                    packet.write("ccsdsseqcnt", packet.read("ccsdsseqcnt") + 1)
 
                 case "MECH":
                     packet.write("timesec", int(time - self.time_offset))

data/targets/INST2/procedures/collect.py

@@ -11,7 +11,7 @@ number = ask("Enter a number.")
 if not isinstance(number, (int, float)):
     raise RuntimeError("Bad return")
 number = ask_string("Enter a number.")
-if not type(number) == str:
+if not isinstance(number, str):
     raise RuntimeError("Bad return")
 
 result = message_box("Click something.", "CHOICE1", "CHOICE2")

data/targets/INST2/procedures/file_dialog.py

@@ -2,15 +2,16 @@
 file = open_file_dialog(
     "Open a single file", "Choose something interesting", filter=".txt"
 )
-print(file)  # Python File object
-print(file.path)  # Path of the tempfile (generally not used)
-print(file.filename)  # Filename that was selected in the dialog
-print(file.read)
-file.delete
+print(file)  # Python tempfile.NamedTemporaryFile object
+print(file.filename())  # Filename that was selected in the dialog
+print(file.read())
+file.close()
 
 files = open_files_dialog("Open multiple files")  # message is optional
-print(files)  # Array of File objects (even if you select only one)
+print(
+    files
+)  # Array of tempfile.NamedTemporaryFile objects (even if you select only one)
 for file in files:
-    print(file.filename)
-    print(file.read)
-    file.delete
+    print(file.filename())
+    print(file.read())
+    file.close()

data/targets/INST2/procedures/screens.py

@@ -1,16 +1,16 @@
 all_screens = get_screen_list()
-print(all_screens["INST"])
+print(all_screens["INST2"])
 wait(1)
-definition = get_screen_definition("INST", "ADCS")
+definition = get_screen_definition("INST2", "ADCS")
 print(definition)
 wait(1)
-display_screen("INST", "ADCS")
+display_screen("INST2", "ADCS")
 wait(3)
-display_screen("INST", "HS", 400, 0)
+display_screen("INST2", "HS", 400, 0)
 wait(3)
-clear_screen("INST", "ADCS")
+clear_screen("INST2", "ADCS")
 wait(3)
-display_screen("INST", "IMAGE")
+display_screen("INST2", "IMAGE")
 wait(3)
 clear_all_screens()
 wait(3)
@@ -18,16 +18,16 @@ definition = """
 SCREEN AUTO AUTO 1.0
 
 VERTICALBOX "Test Screen"
-  LABELVALUE INST HEALTH_STATUS TEMP1
-  LABELVALUE INST HEALTH_STATUS RECEIVED_TIMEFORMATTED WITH_UNITS 30
+  LABELVALUE INST2 HEALTH_STATUS TEMP1
+  LABELVALUE INST2 HEALTH_STATUS RECEIVED_TIMEFORMATTED WITH_UNITS 30
 END
 """
 local_screen("TEST", definition)
 wait(3)
 clear_all_screens()
-create_screen("INST", "TEST", definition)
-display_screen("INST", "TEST")
+create_screen("INST2", "TEST", definition)
+display_screen("INST2", "TEST")
 wait(3)
 clear_all_screens()
-delete_screen("INST", "TEST")
-display_screen("INST", "TEST")  # Expected to fail because new screen was deleted
+delete_screen("INST2", "TEST")
+display_screen("INST2", "TEST")  # Expected to fail because new screen was deleted

data/targets/INST2/procedures/target_file.py

@@ -1,26 +1,26 @@
 from openc3.utilities.string import formatted
 import tempfile
 
-put_target_file("INST/test.txt", "this is a string test")
-download_file("INST/test.txt")
-file = get_target_file("INST/test.txt")
+put_target_file("INST2/test.txt", "this is a string test")
+download_file("INST2/test.txt")
+file = get_target_file("INST2/test.txt")
 print(file.read())
 file.close()  # closing deletes tempfile
-delete_target_file("INST/test.txt")
+delete_target_file("INST2/test.txt")
 
 save_file = tempfile.NamedTemporaryFile(mode="w+t")
 save_file.write("this is a Io test")
 save_file.seek(0)
-put_target_file("INST/test.txt", save_file)
+put_target_file("INST2/test.txt", save_file)
 save_file.close()  # Delete the tempfile
-file = get_target_file("INST/test.txt")
+file = get_target_file("INST2/test.txt")
 print(file.read())
 file.close()
-delete_target_file("INST/test.txt")
+delete_target_file("INST2/test.txt")
 
-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")
+put_target_file("INST2/test.bin", b"\x00\x01\x02\x03\xFF\xEE\xDD\xCC")
+download_file("INST2/test.bin")
+file = get_target_file("INST2/test.bin")
 print(formatted(file.read()))
 file.close()
-delete_target_file("INST/test.bin")
+delete_target_file("INST2/test.bin")

data/targets/INST2/screens/array.txt

@@ -5,6 +5,14 @@ VERTICAL
   ARRAY <%= target_name %> HEALTH_STATUS ARY
   LABELVALUE <%= target_name %> HEALTH_STATUS ARY[0] RAW
   LABELVALUE <%= target_name %> HEALTH_STATUS ARY[1] WITH_UNITS
+  # This item is actually called BRACKET[0] as the name
+  # thus we have to escape the value here to avoid it
+  # being treated like an array item
+  LABELVALUE <%= target_name %> HEALTH_STATUS BRACKET[[0]]
+  LABELSPARKLINE <%= target_name %> HEALTH_STATUS ARY[1]
+    SETTING HISTORY 60s
+  LABELSPARKLINE <%= target_name %> HEALTH_STATUS BRACKET[[0]]
+    SETTING HISTORY 60s
   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

data/targets/INST2/screens/commanding.txt

@@ -21,7 +21,7 @@ VERTICAL
     # This is an example of using a varible 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('INST PARAMS VALUE3', 'RAW').then(dur => api.cmd('INST COLLECT with TYPE '+type+', DURATION '+dur))"
+    # api.tlm('INST2 PARAMS VALUE3', 'RAW').then(dur => api.cmd('INST2 COLLECT with TYPE '+type+', DURATION '+dur))"
     # The tlm() function returns a Promise which is resolved with then() at which point we send the command with the parameter
     # The plus '+' symbol indicates string concatenation with newlines.
     # NOTE: Both lines must use the same quote character: ' or "
@@ -43,15 +43,15 @@ VERTICAL
   END
 
   VERTICALBOX "Run Script:"
-    NAMED_WIDGET SCRIPTNAME COMBOBOX collect.rb checks.rb
+    NAMED_WIDGET SCRIPTNAME COMBOBOX collect.py checks.py
     NAMED_WIDGET BG CHECKBUTTON 'Background'
     # The backslash '\' character indicates string concatenation without newlines.
     # NOTE: Both lines must use the same quote character: ' or "
     BUTTON 'Run Script' "var script=screen.getNamedWidget('SCRIPTNAME').text();" \
       "var ctype=screen.getNamedWidget('COLLECT_TYPE').text();" \
       # Set some environment variables to be used by the script as ENV['TYPE']
-      # See INST/procedures/checks.rb for an example of usage
+      # See INST2/procedures/checks.rb for an example of usage
       "var env = {}; env['TYPE'] = ctype;" \
-      "runScript('INST/procedures/'+script, !screen.getNamedWidget('BG').checked(), env)"
+      "runScript('<%= target_name %>/procedures/'+script, !screen.getNamedWidget('BG').checked(), env)"
   END
 END

data/targets/INST2/screens/image.txt

@@ -1,3 +1,5 @@
 SCREEN AUTO AUTO 1.0
 
-IMAGEVIEWER INST IMAGE IMAGE png
+IMAGEVIEWER <%= target_name %> IMAGE IMAGE png
+  SETTING WIDTH 300
+  SETTING HEIGHT 300

data/targets/INST2/screens/latest.txt

@@ -1,20 +1,18 @@
 SCREEN AUTO AUTO 1.0
 
 VERTICAL
-
   TITLE "<%= target_name %> Instrument Latest Header"
 
   VERTICALBOX "Header"
-    LABELVALUE INST LATEST CCSDSVER
-    LABELVALUE INST LATEST CCSDSTYPE
-    LABELVALUE INST LATEST CCSDSSHF
-    LABELVALUE INST LATEST CCSDSAPID
-    LABELVALUE INST LATEST CCSDSSEQFLAGS
-    LABELVALUE INST LATEST CCSDSSEQCNT
-    LABELVALUE INST LATEST CCSDSLENGTH
-    LABELVALUE INST LATEST TIMESEC
-    LABELVALUE INST LATEST TIMEUS
-    LABELVALUE INST LATEST PKTID
+    LABELVALUE <%= target_name %> LATEST CCSDSVER
+    LABELVALUE <%= target_name %> LATEST CCSDSTYPE
+    LABELVALUE <%= target_name %> LATEST CCSDSSHF
+    LABELVALUE <%= target_name %> LATEST CCSDSAPID
+    LABELVALUE <%= target_name %> LATEST CCSDSSEQFLAGS
+    LABELVALUE <%= target_name %> LATEST CCSDSSEQCNT
+    LABELVALUE <%= target_name %> LATEST CCSDSLENGTH
+    LABELVALUE <%= target_name %> LATEST TIMESEC
+    LABELVALUE <%= target_name %> LATEST TIMEUS
+    LABELVALUE <%= target_name %> LATEST PKTID
   END
-
 END

data/targets/INST2/screens/launcher.txt

@@ -2,9 +2,9 @@ SCREEN AUTO AUTO 1
 
 TITLE 'Screen Launcher'
 HORIZONTAL
-  BUTTON 'HS' "screen.open('INST', 'HS')"
-  BUTTON 'CMD' "screen.open('INST', 'COMMANDING')"
-  BUTTON 'GROUND' "screen.open('INST', 'GROUND')"
+  BUTTON 'HS' "screen.open('<%= target_name %>', 'HS')"
+  BUTTON 'CMD' "screen.open('<%= target_name %>', 'COMMANDING')"
+  BUTTON 'GROUND' "screen.open('<%= target_name %>', 'GROUND')"
 END
-BUTTON 'Close HS & CMD' "screen.close('INST', 'HS');; screen.close('INST', 'COMMANDING')"
+BUTTON 'Close HS & CMD' "screen.close('<%= target_name %>', 'HS');; screen.close('<%= target_name %>', 'COMMANDING')"
 BUTTON 'Close All' "screen.closeAll()" # including this screen!