openc3-cosmos-demo 5.17.1 → 5.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad66f393c2ace97c8bed5481302948327884537dcf6277b9efd889dd704f2954
-  data.tar.gz: 05b907bf5a8fc5ac5139f68d9c1b962112bd13d492964e534823dda6924ce49e
+  metadata.gz: b81293bb997165f1b8c35dbd8cc4ec5a4de4b5810a6c746047662a89149e3950
+  data.tar.gz: 70e36acc62a6be36a5c02dc6261a66da19069cc18cae3c1dfa9ff460587a8f4e
 SHA512:
-  metadata.gz: 7df9e687a63594d3b8052bccf0df8c3b54cfbf599d1f07f46b94e4e89187a2790f94dcc7982176d85da54e89b1d76d1246db7addeb7ac69edb615105de069a74
-  data.tar.gz: 496e93c9eebf0dc2718677d439ed65aeb82a1df903a50f175e2d86388de585e672e948e838f9fe94dca7de7487cc6768f67fc5e9ac2feb7d9de6bf68eda1374f
+  metadata.gz: 611c47f8a6ca07d7b7cb6064681d3a1732b08016136dc37d8ae4dea36bae37c451974b1048d4c1fc29336bfd8e794f7f11c28d134822ff76e4153b59418e8bae
+  data.tar.gz: 9e078e3e96fb62130dcbcd4daf4fc0c53f903ed82fb8161be8279e361812a851e18d603bf60efa66be29bd336a9bc832386bddb053d7279d5e380f3c39cb66c9

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 %>
@@ -86,7 +91,6 @@ VARIABLE reduced_log_retain_time 2592000
   # This expression builds the correct hostname for Open Source or Enterprise Edition in Kubernetes
   <% example_host = ENV['KUBERNETES_SERVICE_HOST'] ? "#{scope}-user-#{example_microservice_name.downcase.gsub('__', '-').gsub('_', '-')}-service" : "openc3-operator" %>
   INTERFACE <%= example_int_name %> example_interface.rb <%= example_host %> <%= example_port %>
-    PROTOCOL WRITE MyRejectProtocol
     MAP_TARGET <%= example_target_name %>
     DONT_CONNECT
     # Override the default log time of 600

data/targets/INST/cmd_tlm/_ccsds_cmd.txt

@@ -1,7 +1,7 @@
   PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"
   PARAMETER    CCSDSTYPE       3   1  UINT  1     1   1 "CCSDS primary header packet type"
   PARAMETER    CCSDSSHF        4   1  UINT  0     0   0 "CCSDS primary header secondary header flag"
-  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 999 "CCSDS primary header application id"
+  ID_PARAMETER CCSDSAPID       5  11  UINT  0  2047 <%= id %> "CCSDS primary header application id"
   PARAMETER    CCSDSSEQFLAGS  16   2  UINT  3     3   3 "CCSDS primary header sequence flags"
   PARAMETER    CCSDSSEQCNT    18  14  UINT  0 16383   0 "CCSDS primary header sequence count"
     OVERFLOW TRUNCATE

data/targets/INST/cmd_tlm/inst_cmds.txt

@@ -1,4 +1,5 @@
 COMMAND <%= target_name %> COLLECT BIG_ENDIAN "Starts a collect on the <%= target_name %> target"
+  VALIDATOR inst_cmd_validator.rb
   <%= render "_ccsds_cmd.txt", locals: {id: 1} %>
   PARAMETER    TYPE           64  16  UINT MIN MAX 0 "Collect type which can be normal or special. Note the special collects are hazarous and require user confirmation."
     REQUIRED
@@ -14,14 +15,17 @@ COMMAND <%= target_name %> COLLECT BIG_ENDIAN "Starts a collect on the <%= targe
   RELATED_ITEM <%= target_name %> HEALTH_STATUS COLLECT_TYPE
 
 COMMAND <%= target_name %> ABORT BIG_ENDIAN "Aborts a collect on the <%= target_name %> instrument"
+  VALIDATOR inst_cmd_validator.rb
   <%= render "_ccsds_cmd.txt", locals: {id: 2} %>
 
 COMMAND <%= target_name %> CLEAR BIG_ENDIAN "Clears counters on the <%= target_name %> instrument"
+  VALIDATOR inst_cmd_validator.rb
   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"
+  VALIDATOR inst_cmd_validator.rb
   <%= render "_ccsds_cmd.txt", locals: {id: 4} %>
   # ERB syntax:
   <% (1..5).each do |i| %>
@@ -35,6 +39,7 @@ COMMAND <%= target_name %> SETPARAMS BIG_ENDIAN "Sets numbered parameters"
     POLY_WRITE_CONVERSION 0 2
 
 COMMAND <%= target_name %> ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
+  VALIDATOR inst_cmd_validator.rb
   <%= render "_ccsds_cmd.txt", locals: {id: 5} %>
   APPEND_PARAMETER STRING 2048 STRING "NOOP" "Enumerated string parameter"
     STATE "ARM LASER" "ARM LASER" HAZARDOUS "Arming the laser poses an eye safety hazard."
@@ -45,16 +50,19 @@ COMMAND <%= target_name %> ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
   RELATED_ITEM <%= target_name %> HEALTH_STATUS ASCIICMD
 
 COMMAND <%= target_name %> FLTCMD BIG_ENDIAN "Command with float parameters"
+  VALIDATOR inst_cmd_validator.rb
   <%= render "_ccsds_cmd.txt", locals: {id: 6} %>
   PARAMETER    FLOAT32        64  32  FLOAT MIN MAX 0.0 "Float32 parameter"
   PARAMETER    FLOAT64        96  64  FLOAT MIN MAX 0.0 "Float64 parameter"
 
 COMMAND <%= target_name %> ARYCMD BIG_ENDIAN "Command with array parameter"
+  VALIDATOR inst_cmd_validator.rb
   <%= render "_ccsds_cmd.txt", locals: {id: 7} %>
   ARRAY_PARAMETER ARRAY       64  32  UINT -8 "Array parameter"
   PARAMETER    CRC            -8   8  UINT MIN MAX 0 "CRC"
 
 COMMAND <%= target_name %> SLRPNLDEPLOY BIG_ENDIAN "Deploy solar array panels"
+  VALIDATOR inst_cmd_validator.rb
   <%= render "_ccsds_cmd.txt", locals: {id: 8} %>
   RELATED_ITEM <%= target_name %> MECH SLRPNL1
   RELATED_ITEM <%= target_name %> MECH SLRPNL2
@@ -63,6 +71,7 @@ COMMAND <%= target_name %> SLRPNLDEPLOY BIG_ENDIAN "Deploy solar array panels"
   RELATED_ITEM <%= target_name %> MECH SLRPNL5
 
 COMMAND <%= target_name %> SLRPNLRESET BIG_ENDIAN "Reset solar array panels"
+  VALIDATOR inst_cmd_validator.rb
   <%= render "_ccsds_cmd.txt", locals: {id: 9} %>
   RELATED_ITEM <%= target_name %> MECH SLRPNL1
   RELATED_ITEM <%= target_name %> MECH SLRPNL2
@@ -71,22 +80,26 @@ COMMAND <%= target_name %> SLRPNLRESET BIG_ENDIAN "Reset solar array panels"
   RELATED_ITEM <%= target_name %> MECH SLRPNL5
 
 COMMAND <%= target_name %> MEMLOAD BIG_ENDIAN "Load memory"
+  VALIDATOR inst_cmd_validator.rb
   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"
+  VALIDATOR inst_cmd_validator.rb
   <%= render "_ccsds_cmd.txt", locals: {id: 11} %>
   APPEND_PARAMETER STATE 8 UINT 0 1 1
     STATE FALSE 0
     STATE TRUE 1
 
 COMMAND <%= target_name %> TIME_OFFSET BIG_ENDIAN "Subtract the packet time by the given seconds"
+  VALIDATOR inst_cmd_validator.rb
   <%= 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"
+  VALIDATOR inst_cmd_validator.rb
   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

@@ -1,5 +1,6 @@
 TELEMETRY <%= target_name %> HEALTH_STATUS BIG_ENDIAN "Health and status from the <%= target_name %> target"
   <%= render "_ccsds_tlm.txt", locals: {apid: 1} %>
+  APPEND_ITEM CMD_ACPT_CNT     32 UINT     "Command accept count"
   APPEND_ITEM COLLECTS         16 UINT     "Number of collects"
   APPEND_ITEM TEMP1            16 UINT     "Temperature #1"
     POLY_READ_CONVERSION  -100.0 0.00305
@@ -49,6 +50,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/example_limits_response.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2023, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -28,9 +28,9 @@ class ExampleLimitsResponse < OpenC3::LimitsResponse
   def call(packet, item, old_limits_state)
     case item.limits.state
     when :RED_HIGH
-      cmd('<%= target_name %>', 'COLLECT', 'TYPE' => 'NORMAL', 'DURATION' => 7)
+      cmd('<%= target_name %> COLLECT with TYPE NORMAL, DURATION 7', validate: false)
     when :RED_LOW
-      cmd_no_hazardous_check('<%= target_name %>', 'CLEAR')
+      cmd('<%= target_name %> ABORT', validate: false)
     end
   end
 end

data/targets/INST/lib/inst_cmd_validator.rb

@@ -0,0 +1,47 @@
+# encoding: ascii-8bit
+
+# Copyright 2024 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'openc3/packets/command_validator'
+
+class InstCmdValidator < OpenC3::CommandValidator
+  def pre_check(command)
+    # Record the current value of CMD_ACPT_CNT for comparison in post_check
+    @cmd_acpt_cnt = tlm("<%= target_name %> HEALTH_STATUS CMD_ACPT_CNT")
+    return [true, nil]
+  end
+
+  def post_check(command)
+    if command.packet_name == 'TIME_OFFSET'
+      # Return Failure with a message
+      return [false, 'TIME_OFFSET failure description']
+    end
+    if command.packet_name == 'MEMLOAD'
+      # Return Unknown with a message
+      return [nil, 'MEMLOAD validation unknown']
+    end
+    if command.packet_name == 'CLEAR'
+      wait_check("<%= target_name %> HEALTH_STATUS CMD_ACPT_CNT == 0", 10)
+      # Return Success with a message
+      return [true, "CMD_ACPT_CNT cleared"]
+    else
+      wait_check("<%= target_name %> HEALTH_STATUS CMD_ACPT_CNT > #{@cmd_acpt_cnt}", 10)
+      # Return Success without a message
+      return [true, nil]
+    end
+  end
+end

data/targets/INST/lib/sim_inst.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -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)
@@ -125,17 +131,17 @@ module OpenC3
       @solar_panel_thread = nil
       @solar_panel_thread_cancel = false
 
-      @trackStars = Array.new
-      @trackStars[0] = 1237
-      @trackStars[1] = 1329
-      @trackStars[2] = 1333
-      @trackStars[3] = 1139
-      @trackStars[4] = 1161
-      @trackStars[5] = 682
-      @trackStars[6] = 717
-      @trackStars[7] = 814
-      @trackStars[8] = 583
-      @trackStars[9] = 622
+      @track_stars = Array.new
+      @track_stars[0] = 1237
+      @track_stars[1] = 1329
+      @track_stars[2] = 1333
+      @track_stars[3] = 1139
+      @track_stars[4] = 1161
+      @track_stars[5] = 682
+      @track_stars[6] = 717
+      @track_stars[7] = 814
+      @track_stars[8] = 583
+      @track_stars[9] = 622
 
       @bad_temp2 = false
       @last_temp2 = 0
@@ -168,31 +174,27 @@ module OpenC3
 
       case name
       when 'COLLECT'
+        hs_packet.cmd_acpt_cnt += 1
         hs_packet.collects += 1
         hs_packet.duration = packet.read('duration')
         hs_packet.collect_type = packet.read("type")
+      when 'ABORT', 'FLTCMD', 'ARYCMD'
+        hs_packet.cmd_acpt_cnt += 1
       when 'CLEAR'
+        hs_packet.cmd_acpt_cnt = 0
         hs_packet.collects = 0
-      when 'MEMLOAD'
-        hs_packet.blocktest = packet.read('data')
-      when 'QUIET'
-        if packet.read('state') == 'TRUE'
-          @quiet = true
-        else
-          @quiet = false
-        end
-      when 'TIME_OFFSET'
-        @time_offset = packet.read('seconds')
       when 'SETPARAMS'
-        # puts "SETPARAMS packet: #{packet.buffer.formatted}"
+        hs_packet.cmd_acpt_cnt += 1
         params_packet.value1 = packet.read('value1')
         params_packet.value2 = packet.read('value2')
         params_packet.value3 = packet.read('value3')
         params_packet.value4 = packet.read('value4')
         params_packet.value5 = packet.read('value5')
       when 'ASCIICMD'
+        hs_packet.cmd_acpt_cnt += 1
         hs_packet.asciicmd = packet.read('string')
       when 'SLRPNLDEPLOY'
+        hs_packet.cmd_acpt_cnt += 1
         return if @solar_panel_thread and @solar_panel_thread.alive?
         @solar_panel_thread = Thread.new do
           @solar_panel_thread_cancel = false
@@ -215,9 +217,24 @@ module OpenC3
           end
         end
       when 'SLRPNLRESET'
+        hs_packet.cmd_acpt_cnt += 1
         OpenC3.kill_thread(self, @solar_panel_thread)
         @solar_panel_positions = SOLAR_PANEL_DFLTS.dup
+      when 'MEMLOAD'
+        hs_packet.cmd_acpt_cnt += 1
+        hs_packet.blocktest = packet.read('data')
+      when 'QUIET'
+        hs_packet.cmd_acpt_cnt += 1
+        if packet.read('state') == 'TRUE'
+          @quiet = true
+        else
+          @quiet = false
+        end
+      when 'TIME_OFFSET'
+        hs_packet.cmd_acpt_cnt += 1
+        @time_offset = packet.read('seconds')
       when 'HIDDEN'
+        # Deliberately do not increment cmd_acpt_cnt
         @tlm_packets['HIDDEN'].count = packet.read('count')
       end
     end
@@ -280,11 +297,11 @@ module OpenC3
           packet.biasy = @att_packet.biasy
           packet.biasy = @att_packet.biasz
 
-          packet.star1id = @trackStars[((count_100hz / 100) + 0) % 10]
-          packet.star2id = @trackStars[((count_100hz / 100) + 1) % 10]
-          packet.star3id = @trackStars[((count_100hz / 100) + 2) % 10]
-          packet.star4id = @trackStars[((count_100hz / 100) + 3) % 10]
-          packet.star5id = @trackStars[((count_100hz / 100) + 4) % 10]
+          packet.star1id = @track_stars[((count_100hz / 100) + 0) % 10]
+          packet.star2id = @track_stars[((count_100hz / 100) + 1) % 10]
+          packet.star3id = @track_stars[((count_100hz / 100) + 2) % 10]
+          packet.star4id = @track_stars[((count_100hz / 100) + 3) % 10]
+          packet.star5id = @track_stars[((count_100hz / 100) + 4) % 10]
 
           packet.posprogress = (@position_file_bytes_read.to_f / @position_file_size.to_f) * 100.0
           packet.attprogress = (@attitude_file_bytes_read.to_f / @attitude_file_size.to_f) * 100.0
@@ -319,6 +336,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 +377,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/procedures/calendar.rb

@@ -11,7 +11,7 @@ set_timeline_color("Mine", "#4287f5")
 puts get_timeline("Mine") #=> {"name"=>"Mine", "color"=>"#4287f5", "scope"=>"DEFAULT", "updated_at"=>1698763720728596964}
 
 now = Time.now()
-start = Time.new(now.year, now.month, now.day, now.hour + 1, 30, 00)
+start = now + 3600
 stop = start + 3600 # Stop plus 1hr
 act = create_timeline_activity("Mine", kind: "reserve", start: start, stop: stop)
 puts act #=>
@@ -31,7 +31,7 @@ stop = start + 300
 act = create_timeline_activity("Mine", kind: "reserve", start: start, stop: stop)
 tlas = get_timeline_activities("Mine")
 check_expression("#{tlas.length} == 2")
-delete_timeline_activity("Mine", act['start'])
+delete_timeline_activity("Mine", act['start'], act['uuid'])
 tlas = get_timeline_activities("Mine")
 check_expression("#{tlas.length} == 1")
 

data/targets/INST/procedures/checks.rb

@@ -3,6 +3,10 @@ puts ENV.inspect
 # Print the TYPE env var which is set in the INST COMMANDING screen
 puts "ENV['TYPE']:#{ENV['TYPE']}"
 
+# 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/INST/procedures/metadata.rb

@@ -17,6 +17,4 @@ check_expression("#{metadata_all().length} >= 2")
 wait 2 # Allow time to advance or it's an error
 metadata_set({ 'new' => 5 }) # Another new entry
 check_expression("#{metadata_all().length} >= 3")
-# The first entry is the newest one we created
-puts metadata_all
-check_expression("#{metadata_all()[0]['metadata']} == {\"new\"=>5}")
+puts metadata_all()

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

@@ -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('INST PARAMS VALUE3', 'RAW').then(dur => api.cmd('INST COLLECT with TYPE '+type+', DURATION '+dur))"
@@ -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/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/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