openc3-cosmos-demo 6.0.2 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231e6075158197e5c69a00c65a7104fb68adba7088dd0a9ae8c23f566a6d514f
-  data.tar.gz: b1b38d14dbc759655936764f6a35adfbed12ae3875dedd05b5bc9b78174ec664
+  metadata.gz: c888a30f0d6951c4b7c2c10f8868e8c80569e09eac181b6998777c79d824b4a0
+  data.tar.gz: 9d7ec85c58a58937720cb368059bca004544cd1d8f6227c65c7fba83dc75d96a
 SHA512:
-  metadata.gz: '081623a648d0e9c52127c31d8a57af6efb179d1831d7bb25635d4d88baf2cd8db4409be3395131a6e4fc81a557e23db1ce26a32962e87cec7d78dced7f155831'
-  data.tar.gz: 32691c50f96230d8dddcd2f820ac47a05f7e00516e5f740679c19ad742ee505d69f7c4b0277b3dc7d9efe46a616a8884131a8e3bf2ff91451fa3928307431945
+  metadata.gz: e818d703ee7703d87cd5796da6efb4aa83b1f17a934ebd0aa25a3dc89af83640464a2193d40c45d054d82543e899291bfb3732498362dc5fed8c95f7b2f40fe3
+  data.tar.gz: 466106a6e5effdf51249e8ad0cd7780b66350fd94450498020331b591a8f1fc4209d9d0878b8f4045b4bfe0385238dc488065985e8ab30ea0d5e726af159b58b

data/targets/INST/cmd_tlm/inst_cmds.txt

@@ -97,6 +97,8 @@ COMMAND <%= target_name %> TIME_OFFSET BIG_ENDIAN "Subtract the packet time by t
   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"
+  APPEND_PARAMETER IP_ADDRESS 32 UINT MIN MAX "127.0.0.1" "IP address"
+    WRITE_CONVERSION ip_write_conversion.rb
 
 COMMAND <%= target_name %> HIDDEN BIG_ENDIAN "Hidden command to bump the hidden packet"
   VALIDATOR inst_cmd_validator.rb

data/targets/INST/cmd_tlm/inst_tlm.txt

@@ -73,6 +73,14 @@ TELEMETRY <%= target_name %> HEALTH_STATUS BIG_ENDIAN "Health and status from th
     GENERIC_READ_CONVERSION_START FLOAT 32
       packet.read('TEMP1') * 1_000_000
     GENERIC_READ_CONVERSION_END
+  # Enable to test the ARRAYPLOT widget with array of array data [[x1,x2,...],[y1,y2,...]]
+  # ITEM POINTS 0 0 DERIVED
+  #   GENERIC_READ_CONVERSION_START UINT 800
+  #     return [
+  #       Array.new(800) { |i| i * 0.1 },
+  #       (0...800).map { |i| Math.sin(2 * Math::PI * i / 800) }
+  #     ]
+  #   GENERIC_READ_CONVERSION_END
   PROCESSOR TEMP1STAT statistics_processor.rb TEMP1 100
   PROCESSOR TEMP1WATER watermark_processor.rb TEMP1
 
@@ -127,6 +135,7 @@ TELEMETRY <%= target_name %> PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
       STATE GOOD 0 GREEN
       STATE BAD 1 RED
   <% end %>
+  APPEND_ITEM IP_ADDRESS   32 UINT "Encoded IP Address"
   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"
@@ -160,6 +169,7 @@ 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 unix_time_conversion.rb TIMESEC TIMEUS
 

data/targets/INST/lib/inst_cmd_validator.rb

@@ -22,6 +22,7 @@ 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")
+    @cmd_acpt_cnt ||= 0 # If the telemetry value is nil, set it to 0
     return [true, nil]
   end
 

data/targets/INST/lib/sim_inst.rb

@@ -152,6 +152,7 @@ module OpenC3
       @last_temp2 = 0
       @quiet = false
       @time_offset = 0
+      @ip_address = 0
     end
 
     def set_rates
@@ -238,6 +239,7 @@ module OpenC3
       when 'TIME_OFFSET'
         hs_packet.cmd_acpt_cnt += 1
         @time_offset = packet.read('seconds')
+        @ip_address = packet.read('ip_address')
       when 'HIDDEN'
         # Deliberately do not increment cmd_acpt_cnt
         @tlm_packets['HIDDEN'].count = packet.read('count')
@@ -378,6 +380,7 @@ module OpenC3
           packet.timesec = time.tv_sec - @time_offset
           packet.timeus = time.tv_usec
           packet.ccsdsseqcnt += 1
+          packet.ip_address = @ip_address
 
         when 'IMAGE'
           packet.timesec = time.tv_sec - @time_offset

data/targets/INST/procedures/calendar.rb

@@ -1,43 +1,68 @@
-tl = create_timeline("Mine")
-puts tl #=> {"name"=>"Mine", "color"=>"#ae2d1b", "scope"=>"DEFAULT", "updated_at"=>1698763720728596964}
+tl = create_timeline("RubyTL")
+puts tl #=> {"name"=>"RubyTL", "color"=>"#cdce42", "execute"=>true, "shard"=>0, "scope"=>"DEFAULT", "updated_at"=>1737128664493258134}
 tls = list_timelines()
-check_expression("#{tls.length} == 1")
-puts tls[0] #=> {"name"=>"Mine", "color"=>"#ae2d1b", "scope"=>"DEFAULT", "updated_at"=>1698763720728596964}
-delete_timeline("Mine")
-check_expression("#{list_timelines().length} == 0")
+names = tls.map { |tl| tl['name'] }
+check_expression("#{names.include?('RubyTL')} == true")
+puts tls[0] #=> {"name"=>"RubyTL", "color"=>"#cdce42", "execute"=>true, "shard"=>0, "scope"=>"DEFAULT", "updated_at"=>1737128664493258134}
 
-create_timeline("Mine")
-set_timeline_color("Mine", "#4287f5")
-puts get_timeline("Mine") #=> {"name"=>"Mine", "color"=>"#4287f5", "scope"=>"DEFAULT", "updated_at"=>1698763720728596964}
+set_timeline_color("RubyTL", "#4287f5")
+puts get_timeline("RubyTL") #=> {"name"=>"RubyTL", "color"=>"#4287f5", "execute"=>true, "shard"=>0, "scope"=>"DEFAULT", "updated_at"=>1737128689586673173}
 
 now = Time.now()
 start = now + 3600
-stop = start + 3600 # Stop plus 1hr
-act = create_timeline_activity("Mine", kind: "reserve", start: start, stop: stop)
+stop = start + 3600
+act1 = create_timeline_activity("RubyTL", kind: "RESERVE", start: start, stop: stop)
+puts act1 #=>
+# { "name"=>"RubyTL", "updated_at"=>1737128705034982375, "start"=>1737132303, "stop"=>1737135903,
+#   "kind"=>"reserve", "data"=>{"username"=>"operator"},
+#   "scope"=>"DEFAULT", "fulfillment"=>false, "uuid"=>"5f373846-eb6c-43cd-97bd-cca19a8ffb04",
+#   "events"=>[{"time"=>1737128705, "event"=>"created"}], "recurring"=>{}}
+act2 = create_timeline_activity("RubyTL", kind: "COMMAND", start: start, stop: stop,
+    data: {command: "INST COLLECT with TYPE NORMAL, DURATION 5, TEMP 10"})
+puts act2 #=>
+# { "name"=>"RubyTL", "updated_at"=>1737128761316084471, "start"=>1737132303, "stop"=>1737135903,
+#   "kind"=>"command", "data"=>{"command"=>"INST COLLECT with TYPE NORMAL, DURATION 5, TEMP 10", "username"=>"operator"},
+#   "scope"=>"DEFAULT", "fulfillment"=>false, "uuid"=>"cdb661b4-a65b-44e7-95e2-5e1dba80c782",
+#   "events"=>[{"time"=>1737128761, "event"=>"created"}], "recurring"=>{}}
+start = now + 7200
+stop = start + 3600
+act3 = create_timeline_activity("RubyTL", kind: "SCRIPT", start: start, stop: stop,
+  data: {environment: [{key: "USER", value: "JASON"}], script: "INST/procedures/checks.rb"})
+puts act3 #=>
+# { "name"=>"RubyTL", "updated_at"=>1737128791047885970, "start"=>1737135903, "stop"=>1737139503,
+#   "kind"=>"script", "data"=>{"environment"=>[{"key"=>"USER", "value"=>"JASON"}], "script"=>"INST/procedures/checks.rb", "username"=>"operator"},
+#   "scope"=>"DEFAULT", "fulfillment"=>false, "uuid"=>"70426e3d-6313-4897-b159-6e5cd94ace1d",
+#   "events"=>[{"time"=>1737128791, "event"=>"created"}], "recurring"=>{}}
+
+act = get_timeline_activity("RubyTL", act2['start'], act2['uuid'])
 puts act #=>
-# { "name"=>"Mine", "updated_at"=>1698763721927799173, "fulfillment"=>false, "duration"=>3600,
-#   "start"=>1698764400, "stop"=>1698768000, "kind"=>"reserve",
-#   "events"=>[{"time"=>1698763721, "event"=>"created"}], "data"=>{"username"=>""} }
+# { "name"=>"RubyTL", "updated_at"=>1737128761316084471, "start"=>1737132303, "stop"=>1737135903,
+#   "kind"=>"command", "data"=>{"command"=>"INST COLLECT with TYPE NORMAL, DURATION 5, TEMP 10", "username"=>"operator"},
+#   "scope"=>"DEFAULT", "fulfillment"=>false, "uuid"=>"cdb661b4-a65b-44e7-95e2-5e1dba80c782",
+#   "events"=>[{"time"=>1737128761, "event"=>"created"}], "recurring"=>{}}
+
 # Get activities in the past ... should be none
-tlas = get_timeline_activities("Mine", start: Time.now() - 3600, stop: Time.now())
+tlas = get_timeline_activities("RubyTL", start: Time.now() - 3600, stop: Time.now())
 check_expression("#{tlas.length} == 0")
-# Get all activities
-tlas = get_timeline_activities("Mine")
-check_expression("#{tlas.length} == 1")
+# Get all activities at plus and minus 1 week
+tlas = get_timeline_activities("RubyTL")
+check_expression("#{tlas.length} == 3")
 
 # Create and delete a new activity
 start = start + 7200
 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'], act['uuid'])
-tlas = get_timeline_activities("Mine")
-check_expression("#{tlas.length} == 1")
+act = create_timeline_activity("RubyTL", kind: "reserve", start: start, stop: stop)
+tlas = get_timeline_activities("RubyTL")
+check_expression("#{tlas.length} == 4")
+delete_timeline_activity("RubyTL", act['start'], act['uuid'])
+tlas = get_timeline_activities("RubyTL")
+check_expression("#{tlas.length} == 3")
 
 # delete fails since the timeline has activities
-delete_timeline("Mine") #=> RuntimeError : Failed to delete timeline due to timeline contains activities, must force remove
+delete_timeline("RubyTL") #=> RuntimeError : Failed to delete timeline due to timeline contains activities, must force remove
 # Force delete since the timeline has activities
-delete_timeline("Mine", force: true)
+delete_timeline("RubyTL", force: true)
+# Verify the timeline no longer exists
 tls = list_timelines()
-check_expression("#{tls.length} == 0")
+names = tls.map { |tl| tl['name'] }
+check_expression("#{names.include?('RubyTL')} == false")

data/targets/INST/procedures/checks.rb

@@ -1,4 +1,4 @@
-# Display all environment variables
+# Display the environment variables
 puts ENV.inspect
 # Print the TYPE env var which is set in the INST COMMANDING screen
 puts "ENV['TYPE']:#{ENV['TYPE']}"

data/targets/INST/procedures/disconnect.rb

@@ -17,5 +17,5 @@ wait_expression("true == false", 5)
 wait_packet("<%= target_name %>","ADCS", 2, 5)
 wait_check("<%= target_name %> ADCS BIASX == 100", 5)
 wait_check_tolerance("<%= target_name %> ADCS BIASX", 5, 0.5, 5)
-wait_check_expression("true == false", 5)
+wait_check_expression("tlm('<%= target_name %> HEALTH_STATUS TEMP1') < 101", 5, 0.25)
 wait_check_packet("<%= target_name %>","ADCS", 2, 5)

data/targets/INST/procedures/scripting.rb

@@ -0,0 +1,88 @@
+# Helper method to check for a script to change state
+def wait_for_action(id, state)
+  i = 0
+  while i < 100
+    script = running_script_get(id)
+    if script['state'] == state
+      check_expression("'#{script['state']}' == '#{state}'")
+      break
+    end
+    wait 0.1
+  end
+  check_expression("'#{script['state']}' == '#{state}'")
+end
+
+SCRIPT_NAME = "INST/procedures/new_script.rb"
+
+# Ensure it's not already there
+step_mode()
+script_delete(SCRIPT_NAME)
+scripts = script_list()
+check_expression("#{scripts.length} > 100")
+run_mode()
+
+contents = "puts('bad"
+script_create(SCRIPT_NAME, contents)
+body = script_body(SCRIPT_NAME)
+result = script_syntax_check(body)
+check_expression("#{result['success']} == false")
+
+# Create a valid script that doesn't complete
+contents = "set_line_delay(1)\nputs 'Hello from Ruby'\nputs('.')\nputs('.')\nwhile true\nputs Time.now\nwait 0.5\nwait 0.5\nend"
+script_create(SCRIPT_NAME, contents)
+scripts = script_list()
+check_expression("#{scripts.include?(SCRIPT_NAME)} == true")
+
+script = script_instrumented(contents)
+check_expression("#{script.include?('RunningScript')} == true")
+
+id = script_run(SCRIPT_NAME)
+check_expression("#{id.to_i} > 0")
+wait_for_action(id, 'running')
+
+list = running_script_list()
+started = list.select {|script| script["id"] == id}[0]
+check_expression("'#{started['name']}' == SCRIPT_NAME")
+script = running_script_get(id)
+check_expression("'#{script['name']}' == SCRIPT_NAME")
+
+running_script_pause(id)
+wait_for_action(id, 'paused')
+running_script_step(id)
+wait_for_action(id, 'paused')
+running_script_retry(id)
+wait_for_action(id, 'paused')
+running_script_go(id)
+wait_for_action(id, 'running')
+running_script_stop(id)
+wait 1
+
+list = running_script_list()
+script = list.select {|script| script["id"] == id}[0]
+# Script is stopped so it should NOT be in the running list
+check_expression("#{script.nil?} == true")
+
+list = completed_script_list()
+script = list.select {|script| script["id"] == id}[0]
+# Script is completed so it should be in the completed list
+check_expression("#{script.nil?} == false")
+
+id = script_run(SCRIPT_NAME)
+wait_for_action(id, 'running')
+running_script_delete(id) # Stop and completely remove the script
+wait 1
+
+list = running_script_list()
+script = list.select {|script| script["id"] == id}[0]
+# Script is deleted, so it should NOT be in the running list
+check_expression("#{script.nil?} == true")
+list = completed_script_list()
+# Script is deleted so it should be in the completed list
+script = list.select {|script| script["id"] == id}[0]
+check_expression("#{script.nil?} == false")
+
+script_lock(SCRIPT_NAME)
+script_unlock(SCRIPT_NAME)
+script_delete(SCRIPT_NAME)
+scripts = script_list()
+check_expression("#{scripts.include?(SCRIPT_NAME)} == false")

data/targets/INST/screens/graphs.txt

@@ -1,27 +1,32 @@
 SCREEN AUTO AUTO 1.0
 
-VERTICAL
-  TITLE "<%= target_name %> Instrument Graphs"
+TITLE "<%= target_name %> Instrument Graphs"
 
-  MATRIXBYCOLUMNS 2
-    SPARKLINE <%= target_name %> HEALTH_STATUS TEMP1
-      SETTING SIZE 400 50
-      SETTING HISTORY 30s
-    SPARKLINE <%= target_name %> HEALTH_STATUS TEMP2
-      SETTING SIZE 400 50
-      SETTING HISTORY 30s
-    LABELSPARKLINE <%= target_name %> HEALTH_STATUS TEMP3
-    LABELSPARKLINE <%= target_name %> HEALTH_STATUS TEMP4
-    LINEGRAPH <%= target_name %> HEALTH_STATUS TEMP1
-      SETTING ITEM <%= target_name %> ADCS Q1
-    LINEGRAPH <%= target_name %> HEALTH_STATUS TEMP2 RAW
-      SETTING SECONDSGRAPHED 60
-      SETTING POINTSSAVED 600
-      SETTING POINTSGRAPHED 60
-    LINEGRAPH <%= target_name %> HEALTH_STATUS TEMP3 CONVERTED REDUCED_MINUTE MIN
-      SETTING SIZE 600 500 # width height
-      SETTING HISTORY 1h
-    LINEGRAPH <%= target_name %> HEALTH_STATUS TEMP4
-      SETTING HISTORY 30m
-  END
+MATRIXBYCOLUMNS 2
+  SPARKLINE <%= target_name %> HEALTH_STATUS TEMP1
+    SETTING SIZE 400 50
+    SETTING HISTORY 30s
+  SPARKLINE <%= target_name %> HEALTH_STATUS TEMP2
+    SETTING SIZE 400 50
+    SETTING HISTORY 30s
+  LABELSPARKLINE <%= target_name %> HEALTH_STATUS TEMP3
+  LABELSPARKLINE <%= target_name %> HEALTH_STATUS TEMP4
+  LINEGRAPH <%= target_name %> HEALTH_STATUS TEMP1
+    SETTING ITEM <%= target_name %> ADCS Q1
+  LINEGRAPH <%= target_name %> HEALTH_STATUS TEMP2 RAW
+    SETTING SECONDSGRAPHED 60
+    SETTING POINTSSAVED 600
+    SETTING POINTSGRAPHED 60
+  LINEGRAPH <%= target_name %> HEALTH_STATUS TEMP3 CONVERTED REDUCED_MINUTE MIN
+    SETTING SIZE 600 500 # width height
+    SETTING HISTORY 1h
+  LINEGRAPH <%= target_name %> HEALTH_STATUS TEMP4
+    SETTING HISTORY 30m
 END
+
+ARRAYPLOT
+  SETTING TITLE "Array Data"
+  SETTING ITEM INST HEALTH_STATUS ARY
+  SETTING ITEM INST HEALTH_STATUS ARY2
+  SETTING SIZE 600 400
+  SETTING X_AXIS 10 10

data/targets/INST2/cmd_tlm/inst_cmds.txt

@@ -29,9 +29,11 @@ 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
@@ -95,6 +97,8 @@ COMMAND <%= target_name %> TIME_OFFSET BIG_ENDIAN "Subtract the packet time by t
   VALIDATOR inst2_cmd_validator.py
   <%= render "_ccsds_cmd.txt", locals: {id: 12} %>
   APPEND_PARAMETER SECONDS 32 UINT MIN MAX 0 "Seconds to subtract from packet time"
+  APPEND_PARAMETER IP_ADDRESS 32 UINT MIN MAX "127.0.0.1" "IP address"
+    WRITE_CONVERSION openc3/conversions/ip_write_conversion.py
 
 COMMAND <%= target_name %> HIDDEN BIG_ENDIAN "Hidden command to bump the hidden packet"
   VALIDATOR inst2_cmd_validator.py

data/targets/INST2/cmd_tlm/inst_tlm.txt

@@ -65,6 +65,14 @@ TELEMETRY <%= target_name %> HEALTH_STATUS BIG_ENDIAN "Health and status from th
     READ_CONVERSION openc3/conversions/processor_conversion.py TEMP1STAT MEAN
   ITEM TEMP1STDDEV 0 0 DERIVED "Stddev of most recent 100 samples for TEMP1"
     READ_CONVERSION openc3/conversions/processor_conversion.py TEMP1STAT STDDEV
+  ITEM TEMP1_MICRO 0 0 DERIVED
+    GENERIC_READ_CONVERSION_START FLOAT 32
+      packet.read('TEMP1') / 1_000_000
+    GENERIC_READ_CONVERSION_END
+  ITEM TEMP1_MEGA 0 0 DERIVED
+    GENERIC_READ_CONVERSION_START FLOAT 32
+      packet.read('TEMP1') * 1_000_000
+    GENERIC_READ_CONVERSION_END
   PROCESSOR TEMP1STAT openc3/processors/statistics_processor.py TEMP1 100
   PROCESSOR TEMP1WATER openc3/processors/watermark_processor.py TEMP1
 
@@ -119,6 +127,7 @@ TELEMETRY <%= target_name %> PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
       STATE GOOD 0 GREEN
       STATE BAD 1 RED
   <% end %>
+  APPEND_ITEM IP_ADDRESS   32 UINT "Encoded IP Address"
   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"
@@ -137,7 +146,7 @@ TELEMETRY <%= target_name %> IMAGE BIG_ENDIAN "Packet with image data"
   ITEM PACKET_TIME 0 0 DERIVED "Python time based on TIMESEC and TIMEUS"
     READ_CONVERSION openc3/conversions/unix_time_conversion.py TIMESEC TIMEUS
 
-TELEMETRY <%= target_name %> MECH BIG_ENDIAN "Mechanism status"
+TELEMETRY <%= target_name %> MECH BIG_ENDIAN "Mechanism status ©®"
   <%= render "_ccsds_tlm.txt", locals: {apid: 5} %>
   APPEND_ITEM EXTRA         32 FLOAT    "Extra item to be deleted"
   APPEND_ITEM SLRPNL1       32 FLOAT    "Solar panel 1 angle"

data/targets/INST2/lib/sim_inst.py

@@ -148,6 +148,7 @@ class SimInst(SimulatedTarget):
         self.last_temp2 = 0
         self.quiet = False
         self.time_offset = 0
+        self.ip_address = 0
 
     def set_rates(self):
         self.set_rate("ADCS", 10)
@@ -213,6 +214,7 @@ class SimInst(SimulatedTarget):
             case "TIME_OFFSET":
                 hs_packet.write("cmd_acpt_cnt", hs_packet.read("cmd_acpt_cnt") + 1)
                 self.time_offset = packet.read("seconds")
+                self.ip_address = packet.read("ip_address")
             case "HIDDEN":
                 # Deliberately do not increment cmd_acpt_cnt
                 self.tlm_packets["HIDDEN"].count = packet.read("count")
@@ -382,6 +384,7 @@ class SimInst(SimulatedTarget):
                     packet.write("timesec", int(time - self.time_offset))
                     packet.write("timeus", int((time % 1) * 1000000))
                     packet.write("ccsdsseqcnt", packet.read("ccsdsseqcnt") + 1)
+                    packet.write("ip_address", self.ip_address)
 
                 case "IMAGE":
                     packet.write("timesec", int(time - self.time_offset))

data/targets/INST2/procedures/calendar.py

@@ -1,57 +1,72 @@
 from datetime import datetime, timezone, timedelta
 
-tl = create_timeline("Mine")
-print(
-    tl
-)  # => {"name":"Mine", "color":"#ae2d1b", "scope":"DEFAULT", "updated_at":1698763720728596964}
+tl = create_timeline("PythonTL", color="#FF0000")
+print(tl) #=> {'name': 'PythonTL', 'color': '#FF0000', 'execute': True, 'shard': 0, 'scope': 'DEFAULT', 'updated_at': 1737129062249843763}
 tls = list_timelines()
-print(tls)
-print(type(tls))
-check_expression(f"{len(tls)} == 1")
-print(
-    tls[0]
-)  # => {"name":"Mine", "color":"#ae2d1b", "scope":"DEFAULT", "updated_at":1698763720728596964}
-delete_timeline("Mine")
-check_expression(f"{len(list_timelines())} == 0")
+print(tls) #=> [{'name': 'PythonTL', 'color': '#FF0000', 'execute': True, 'shard': 0, 'scope': 'DEFAULT', 'updated_at': 1737129062249843763}]
+names = [tl["name"] for tl in tls]
+check_expression(f"{'PythonTL' in names} == True")
+print(tls[0])  #=> {'name': 'PythonTL', 'color': '#FF0000', 'execute': True, 'shard': 0, 'scope': 'DEFAULT', 'updated_at': 1737129436186473255}
 
-create_timeline("Mine")
-set_timeline_color("Mine", "#4287f5")
-print(
-    get_timeline("Mine")
-)  # => {"name":"Mine", "color":"#4287f5", "scope":"DEFAULT", "updated_at":1698763720728596964}
+set_timeline_color("PythonTL", "#4287f5")
+print(get_timeline("PythonTL")) #=> {'name': 'PythonTL', 'color': '#4287f5', 'execute': True, 'shard': 0, 'scope': 'DEFAULT', 'updated_at': 1737129508391137136}
 
 now = datetime.now(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)  # =>
-# { "name"=>"Mine", "updated_at"=>1698763721927799173, "fulfillment"=>false, "duration"=>3600,
-#   "start"=>1698764400, "stop"=>1698768000, "kind"=>"reserve",
-#   "events"=>[{"time"=>1698763721, "event"=>"created"}], "data"=>{"username"=>""} }
+stop = start + timedelta(hours=1)
+act1 = create_timeline_activity("PythonTL", kind="reserve", start=start, stop=stop)
+print(act1)  # =>
+# {'name': 'PythonTL', 'updated_at': 1737129305507111708, 'start': 1737132902, 'stop': 1737136502,
+#  'kind': 'reserve', 'data': {'username': 'operator'},
+#  'scope': 'DEFAULT', 'fulfillment': False, 'uuid': '46328378-ed78-4719-ad70-e84951a196fd',
+#  'events': [{'time': 1737129305, 'event': 'created'}], 'recurring': {}}
+act2 = create_timeline_activity("PythonTL", kind="COMMAND", start=start, stop=stop,
+    data={'command': "INST COLLECT with TYPE NORMAL, DURATION 5, TEMP 10"})
+print(act2) #=>
+# {'name': 'PythonTL', 'updated_at': 1737129508886643928, 'start': 1737133108, 'stop': 1737136708,
+#  'kind': 'command', 'data': {'command': 'INST COLLECT with TYPE NORMAL, DURATION 5, TEMP 10', 'username': 'operator'},
+#  'scope': 'DEFAULT', 'fulfillment': False, 'uuid': 'cddbf034-ccdd-4c36-91c2-2653a39b06a5',
+#  'events': [{'time': 1737129508, 'event': 'created'}], 'recurring': {}}
+start = now + timedelta(hours=2)
+stop = start + timedelta(hours=1)
+act3 = create_timeline_activity("PythonTL", kind="SCRIPT", start=start, stop=stop,
+  data={'environment': [{'key': "USER", 'value': "JASON"}], 'script': "INST2/procedures/checks.py"})
+print(act3) #=>
+# {'name': 'PythonTL', 'updated_at': 1737129509288571345, 'start': 1737136708, 'stop': 1737140308,
+#  'kind': 'script', 'data': {'environment': [{'key': 'USER', 'value': 'JASON'}], 'script': 'INST2/procedures/checks.py', 'username': 'operator'},
+#  'scope': 'DEFAULT', 'fulfillment': False, 'uuid': '4f8d791b-b138-4383-b5ec-85c28b2bea20',
+#  'events': [{'time': 1737129509, 'event': 'created'}], 'recurring': {}}
+
+act = get_timeline_activity("PythonTL", act2['start'], act2['uuid'])
+print(act) #=>
+# { "name"=>"RubyTL", "updated_at"=>1737128761316084471, "start"=>1737132303, "stop"=>1737135903,
+#   "kind"=>"command", "data"=>{"command"=>"INST COLLECT with TYPE NORMAL, DURATION 5, TEMP 10", "username"=>"operator"},
+#   "scope"=>"DEFAULT", "fulfillment"=>false, "uuid"=>"cdb661b4-a65b-44e7-95e2-5e1dba80c782",
+#   "events"=>[{"time"=>1737128761, "event"=>"created"}], "recurring"=>{}}
+
 # Get activities in the past ... should be none
-tlas = get_timeline_activities("Mine", start=start - timedelta(hours=2), stop=now)
+tlas = get_timeline_activities("PythonTL", start=now - timedelta(hours=2), stop=now)
 print(tlas)
 print(type(tlas))
 check_expression(f"{len(tlas)} == 0")
-# Get all activities
-tlas = get_timeline_activities("Mine")
-check_expression(f"{len(tlas)} == 1")
+# Get all activities at plus and minus 1 week
+tlas = get_timeline_activities("PythonTL")
+check_expression(f"{len(tlas)} == 3")
 
 # Create and delete a new activity
 start = start + timedelta(hours=2)
 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"], act["uuid"])
-tlas = get_timeline_activities("Mine")
-check_expression(f"{len(tlas)} == 1")
+act = create_timeline_activity("PythonTL", kind="reserve", start=start, stop=stop)
+tlas = get_timeline_activities("PythonTL")
+check_expression(f"{len(tlas)} == 4")
+delete_timeline_activity("PythonTL", act["start"], act["uuid"])
+tlas = get_timeline_activities("PythonTL")
+check_expression(f"{len(tlas)} == 3")
 
 # delete fails since the timeline has activities
-delete_timeline(
-    "Mine"
-)  #: RuntimeError : Failed to delete timeline due to timeline contains activities, must force remove
+delete_timeline("PythonTL")
 # Force delete since the timeline has activities
-delete_timeline("Mine", force=True)
+delete_timeline("PythonTL", force=True)
 tls = list_timelines()
-check_expression(f"{len(tls)} == 0")
+names = [tl["name"] for tl in tls]
+check_expression(f"{'PythonTL' in names} == False")

data/targets/INST2/procedures/disconnect.py

@@ -17,5 +17,5 @@ wait_expression("True == False", 5)
 wait_packet("<%= target_name %>", "ADCS", 2, 5)
 wait_check("<%= target_name %> ADCS BIASX == 100", 5)
 wait_check_tolerance("<%= target_name %> ADCS BIASX", 5, 0.5, 5)
-wait_check_expression("True == False", 5)
+wait_check_expression(f"tlm('<%= target_name %> HEALTH_STATUS TEMP1') < 101", 5, 0.25, globals())
 wait_check_packet("<%= target_name %>", "ADCS", 2, 5)

data/targets/INST2/procedures/scripting.py

@@ -0,0 +1,84 @@
+# Helper method to check for a script to change state
+def wait_for_action(id, state):
+    i = 0
+    while i < 100:
+        script = running_script_get(id)
+        if script['state'] == state:
+            check_expression(f"'{script['state']}' == '{state}'")
+            break
+        wait(0.1)
+    check_expression(f"'{script['state']}' == '{state}'")
+
+SCRIPT_NAME = "INST2/procedures/new_script.py"
+
+# Ensure it's not already there
+step_mode()
+script_delete(SCRIPT_NAME)
+scripts = script_list()
+check_expression(f"{len(scripts)} > 100")
+run_mode()
+
+contents = "print('bad"
+script_create(SCRIPT_NAME, contents)
+body = script_body(SCRIPT_NAME)
+result = script_syntax_check(body)
+check_expression(f"{result['success']} == False")
+
+contents = 'set_line_delay(1)\nprint("Hello from Python")\nprint(".")\nprint(".")\nwhile True:\n  print(".")\n  wait(0.5)\n  wait(0.5)\n'
+result = script_create(SCRIPT_NAME, contents)
+scripts = script_list()
+check_expression(f"{SCRIPT_NAME in scripts} == True")
+
+script = script_instrumented(contents)
+check_expression(f"{'RunningScript.instance' in script} == True")
+
+id = script_run(SCRIPT_NAME)
+check_expression(f"{int(id)} > 0")
+wait_for_action(id, 'running')
+
+list = running_script_list()
+started = [script for script in list if script["id"] == id][0]
+check_expression(f"'{started['name']}' == '{SCRIPT_NAME}'")
+script = running_script_get(id)
+check_expression(f"'{script['name']}' == '{SCRIPT_NAME}'")
+
+running_script_pause(id)
+wait_for_action(id, 'paused')
+running_script_step(id)
+wait_for_action(id, 'paused')
+running_script_retry(id)
+wait_for_action(id, 'paused')
+running_script_go(id)
+wait_for_action(id, 'running')
+running_script_stop(id)
+wait(1)
+
+list = running_script_list()
+script = [script for script in list if script["id"] == id]
+# Script is stopped so it should NOT be in the running list
+check_expression(f"{len(script)} == 0")
+
+list = completed_script_list()
+script = [script for script in list if script["id"] == id]
+# Script is completed so it should be in the completed list
+check_expression(f"{len(script)} == 1")
+
+id = script_run(SCRIPT_NAME)
+wait_for_action(id, 'running')
+running_script_delete(id) # Stop and completely remove the script
+wait(1)
+
+list = running_script_list()
+script = [script for script in list if script["id"] == id]
+# Script is deleted, so it should NOT be in the running list
+check_expression(f"{len(script)} == 0")
+list = completed_script_list()
+# Script is deleted so it should be in the completed list
+script = [script for script in list if script["id"] == id]
+check_expression(f"{len(script)} == 1")
+
+script_lock(SCRIPT_NAME)
+script_unlock(SCRIPT_NAME)
+script_delete(SCRIPT_NAME)
+scripts = script_list()
+check_expression(f"{SCRIPT_NAME not in scripts} == True")