openc3-cosmos-demo 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23530204cfaedbd0c8ae5eb0af5a696e83da0bb20c838f0f291c7f0012dea548
-  data.tar.gz: 1fd70065638e1fd360247607715766fc7a300015de033eed33a6a61823349ba6
+  metadata.gz: fca474828cfbb94f5d172b53030194160be013907dc645a089aaaccdc18a07a8
+  data.tar.gz: 18a7eac99f026d6646a15250c2119329084a830d04ad0ba60da02f9c5e879bd2
 SHA512:
-  metadata.gz: 4357fd9b36217037c237d6b09925570e836169c6c188089590886df46fc97faf501db34743620f945fcdee6f541c0c7c32eb3135d898ab8199393ca1543d9db7
-  data.tar.gz: 01e244d8ffd4504e09ee54058dd7b6b8f457bec4bf0824751c3dfb71f2097355cc17bbc254835078a1217f33c1af1ab45a56ac3a6ed9d213b9fbc8c663cc3250
+  metadata.gz: ebe0fb07428eb7bfbc746eea27cdc1764b0b53b65f522b61afe5115826671d55752d4af3c09b09f915aa3a4bfd02424ee5d4a2967bd2ba196ecd403d4147c19a
+  data.tar.gz: 8321d59bbe30cad4a7a4188c43a83d5a371100debe3196b4123d286b0f60c63abc184e2dd022bfc59b379e61465707a3ca2c8559944460a32170eb8ffa8ccf46

data/plugin.txt

@@ -23,18 +23,18 @@ VARIABLE inst_router_port 7779
 VARIABLE log_retain_time 172800
 VARIABLE reduced_log_retain_time 2592000
 
-<% include_inst = (inst_target_name.strip.length > 0) %>
-<% include_inst2 = (inst2_target_name.strip.length > 0) %>
-<% include_example = (example_target_name.strip.length > 0) %>
-<% include_templated = (templated_target_name.strip.length > 0) %>
-<% include_system = (system_target_name.strip.length > 0) %>
-<% include_inst_int = (inst_int_name.strip.length > 0) %>
-<% include_inst_router = (inst_router_name.strip.length > 0) %>
-<% include_inst2_int = (inst2_int_name.strip.length > 0) %>
-<% include_example_int = (example_int_name.strip.length > 0) %>
-<% include_templated_int = (templated_int_name.strip.length > 0) %>
-<% include_example_microservice = (example_microservice_name.strip.length > 0) %>
-<% include_templated_microservice = (templated_microservice_name.strip.length > 0) %>
+<% include_inst = (inst_target_name.to_s.strip.length > 0) %>
+<% include_inst2 = (inst2_target_name.to_s.strip.length > 0) %>
+<% include_example = (example_target_name.to_s.strip.length > 0) %>
+<% include_templated = (templated_target_name.to_s.strip.length > 0) %>
+<% include_system = (system_target_name.to_s.strip.length > 0) %>
+<% include_inst_int = (inst_int_name.to_s.strip.length > 0) %>
+<% include_inst_router = (inst_router_name.to_s.strip.length > 0) %>
+<% include_inst2_int = (inst2_int_name.to_s.strip.length > 0) %>
+<% include_example_int = (example_int_name.to_s.strip.length > 0) %>
+<% include_templated_int = (templated_int_name.to_s.strip.length > 0) %>
+<% include_example_microservice = (example_microservice_name.to_s.strip.length > 0) %>
+<% include_templated_microservice = (templated_microservice_name.to_s.strip.length > 0) %>
 
 <% if include_inst %>
   TARGET INST <%= inst_target_name %>
@@ -69,14 +69,12 @@ VARIABLE reduced_log_retain_time 2592000
 <% if include_inst and include_inst_int %>
   INTERFACE <%= inst_int_name %> simulated_target_interface.rb sim_inst.rb
     MAP_TARGET <%= inst_target_name %>
-    PROTOCOL READ OverrideProtocol
 <% end %>
 
 <% if include_inst2 and include_inst2_int %>
   INTERFACE <%= inst2_int_name %> simulated_target_interface.rb sim_inst.rb
     MAP_TARGET <%= inst2_target_name %>
     DONT_LOG
-    PROTOCOL READ_WRITE OverrideProtocol
 <% end %>
 
 <% if include_example and include_example_int %>

data/targets/INST/procedures/disconnect.rb

@@ -7,23 +7,15 @@ cmd_raw_no_range_check("<%= target_name %> COLLECT with TYPE 0, TEMP 100")
 cmd_raw_no_hazardous_check("<%= target_name %> CLEAR")
 cmd_raw_no_checks("<%= target_name %> COLLECT with TYPE 1, TEMP 100.0")
 check("<%= target_name %> ADCS BIASX == 100")
-check_formatted("<%= target_name %> ADCS BIASX == 100")
-check_with_units("<%= target_name %> ADCS BIASX == 100")
-check_raw("<%= target_name %> ADCS BIASX == 100")
 check_tolerance("<%= target_name %> ADCS BIASX", 5, 0.5)
-check_tolerance_raw("<%= target_name %> ADCS BIASX", 5, 0.5)
 check_expression("true == false")
 wait
 wait 5
 wait("<%= target_name %> ADCS BIASX > 100", 5)
-wait_raw("<%= target_name %> ADCS BIASX > 100", 5)
 wait_tolerance("<%= target_name %> ADCS BIASX", 5, 0.5, 5)
-wait_tolerance_raw("<%= target_name %> ADCS BIASX", 5, 0.5, 5)
 wait_expression("true == false", 5)
 wait_packet("<%= target_name %>","ADCS", 2, 5)
 wait_check("<%= target_name %> ADCS BIASX == 100", 5)
-wait_check_raw("<%= target_name %> ADCS BIASX == 100", 5)
 wait_check_tolerance("<%= target_name %> ADCS BIASX", 5, 0.5, 5)
-wait_check_tolerance_raw("<%= target_name %> ADCS BIASX", 5, 0.5, 5)
 wait_check_expression("true == false", 5)
 wait_check_packet("<%= target_name %>","ADCS", 2, 5)

data/targets/SYSTEM/procedures/openc3_api_test.rb

@@ -176,11 +176,19 @@ tlm("INST HEALTH_STATUS ARY")
 tlm("INST HEALTH_STATUS ASCIICMD")
 tlm("INST HEALTH_STATUS CCSDSAPID")
 tlm("INST HEALTH_STATUS TEMP1")
+tlm("INST HEALTH_STATUS TEMP1", type: :RAW)
+tlm("INST HEALTH_STATUS TEMP1", type: :CONVERTED)
+tlm("INST HEALTH_STATUS TEMP1", type: :FORMATTED)
+tlm("INST HEALTH_STATUS TEMP1", type: :WITH_UNITS)
 
 tlm("INST", "HEALTH_STATUS", "ARY")
 tlm("INST", "HEALTH_STATUS", "ASCIICMD")
 tlm("INST", "HEALTH_STATUS", "CCSDSAPID")
 tlm("INST", "HEALTH_STATUS", "TEMP1")
+tlm("INST", "HEALTH_STATUS", "TEMP1", type: :RAW)
+tlm("INST", "HEALTH_STATUS", "TEMP1", type: :CONVERTED)
+tlm("INST", "HEALTH_STATUS", "TEMP1", type: :FORMATTED)
+tlm("INST", "HEALTH_STATUS", "TEMP1", type: :WITH_UNITS)
 
 # tlm should fail
 tlm()
@@ -195,92 +203,27 @@ tlm("INST", "HEALTH_STATUS")
 tlm("INST", "HEALTH_STATUS", "BOB")
 tlm("INST", "HEALTH_STATUS", "ARY", "BOB")
 
-# tlm_raw
-tlm_raw("INST HEALTH_STATUS ARY")
-tlm_raw("INST HEALTH_STATUS ASCIICMD")
-tlm_raw("INST HEALTH_STATUS CCSDSAPID")
-tlm_raw("INST HEALTH_STATUS TEMP1")
-
-tlm_raw("INST", "HEALTH_STATUS", "ARY")
-tlm_raw("INST", "HEALTH_STATUS", "ASCIICMD")
-tlm_raw("INST", "HEALTH_STATUS", "CCSDSAPID")
-tlm_raw("INST", "HEALTH_STATUS", "TEMP1")
-
-# tlm_raw should fail
-tlm_raw()
-tlm_raw("BOB")
-tlm_raw("INST")
-tlm_raw("INST BOB")
-tlm_raw("INST HEALTH_STATUS")
-tlm_raw("INST HEALTH_STATUS BOB")
-tlm_raw("INST HEALTH_STATUS ARY BOB")
-tlm_raw("INST", "BOB")
-tlm_raw("INST", "HEALTH_STATUS")
-tlm_raw("INST", "HEALTH_STATUS", "BOB")
-tlm_raw("INST", "HEALTH_STATUS", "ARY", "BOB")
-
-# tlm_formatted
-tlm_formatted("INST HEALTH_STATUS ARY")
-tlm_formatted("INST HEALTH_STATUS ASCIICMD")
-tlm_formatted("INST HEALTH_STATUS CCSDSAPID")
-tlm_formatted("INST HEALTH_STATUS TEMP1")
-
-tlm_formatted("INST", "HEALTH_STATUS", "ARY")
-tlm_formatted("INST", "HEALTH_STATUS", "ASCIICMD")
-tlm_formatted("INST", "HEALTH_STATUS", "CCSDSAPID")
-tlm_formatted("INST", "HEALTH_STATUS", "TEMP1")
-
-# tlm_formatted should fail
-tlm_formatted()
-tlm_formatted("BOB")
-tlm_formatted("INST")
-tlm_formatted("INST BOB")
-tlm_formatted("INST HEALTH_STATUS")
-tlm_formatted("INST HEALTH_STATUS BOB")
-tlm_formatted("INST HEALTH_STATUS ARY BOB")
-tlm_formatted("INST", "BOB")
-tlm_formatted("INST", "HEALTH_STATUS")
-tlm_formatted("INST", "HEALTH_STATUS", "BOB")
-tlm_formatted("INST", "HEALTH_STATUS", "ARY", "BOB")
-
-# tlm_with_units
-tlm_with_units("INST HEALTH_STATUS ARY")
-tlm_with_units("INST HEALTH_STATUS ASCIICMD")
-tlm_with_units("INST HEALTH_STATUS CCSDSAPID")
-tlm_with_units("INST HEALTH_STATUS TEMP1")
-
-tlm_with_units("INST", "HEALTH_STATUS", "ARY")
-tlm_with_units("INST", "HEALTH_STATUS", "ASCIICMD")
-tlm_with_units("INST", "HEALTH_STATUS", "CCSDSAPID")
-tlm_with_units("INST", "HEALTH_STATUS", "TEMP1")
-
-# tlm_with_units should fail
-tlm_with_units()
-tlm_with_units("BOB")
-tlm_with_units("INST")
-tlm_with_units("INST BOB")
-tlm_with_units("INST HEALTH_STATUS")
-tlm_with_units("INST HEALTH_STATUS BOB")
-tlm_with_units("INST HEALTH_STATUS ARY BOB")
-tlm_with_units("INST", "BOB")
-tlm_with_units("INST", "HEALTH_STATUS")
-tlm_with_units("INST", "HEALTH_STATUS", "BOB")
-tlm_with_units("INST", "HEALTH_STATUS", "ARY", "BOB")
-
 # override_tlm
 override_tlm("INST HEALTH_STATUS ARY = [0,0,0,0,0,0,0,0,0,0]")
 override_tlm("INST HEALTH_STATUS ASCIICMD = 'HI'")
 override_tlm("INST HEALTH_STATUS CCSDSAPID = 1000")
 override_tlm("INST HEALTH_STATUS TEMP1 = 15")
+data = Array.new(131072 / 8) { rand(0..255) }.pack("C*")
+override_tlm("INST", "IMAGE", "IMAGE", data)
 
-# override_tlm_raw
-override_tlm_raw("INST HEALTH_STATUS ARY = [0,0,0,0,0,0,0,0,0,0]")
-override_tlm_raw("INST HEALTH_STATUS ASCIICMD = 'HI'")
-override_tlm_raw("INST HEALTH_STATUS CCSDSAPID = 1000")
-override_tlm_raw("INST HEALTH_STATUS TEMP1 = 10000")
+wait_check("INST HEALTH_STATUS ARY == [1,2,3]", 5)
+wait_check("INST HEALTH_STATUS ASCIICMD == 'HI'", 5)
+wait_check("INST HEALTH_STATUS CCSDSAPID == 1000", 5)
+wait_check("INST HEALTH_STATUS TEMP1 == 15", 5)
 
 # normalize_tlm
 normalize_tlm("INST HEALTH_STATUS ARY")
 normalize_tlm("INST HEALTH_STATUS ASCIICMD")
 normalize_tlm("INST HEALTH_STATUS CCSDSAPID")
 normalize_tlm("INST HEALTH_STATUS TEMP1")
+normalize_tlm("INST IMAGE IMAGE")
+
+wait_check("INST HEALTH_STATUS ARY != [1,2,3]", 5)
+wait_check("INST HEALTH_STATUS ASCIICMD != 'HI'", 5)
+wait_check("INST HEALTH_STATUS CCSDSAPID != 1000", 5)
+wait_check("INST HEALTH_STATUS TEMP1 != 15", 5)