openc3-demo 5.0.8 → 5.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c126becc6f120379958038e8427d826dd24ac492e17accc24b6c31136dadd357
-  data.tar.gz: e46d4180d9fa5bf46ab90517492ca34c25e7cde41557e2b7b6e1cd51f6194067
+  metadata.gz: fd50474a9d34098d31bf02421d64e124857e62629b6ea410c517e846e67087b9
+  data.tar.gz: 80fe1abedef74980efd34b021225468ec5d11a3cf68ea62e4bec01d03290a430
 SHA512:
-  metadata.gz: ba3460864cd3cb3c54c3b17457ef61432feaf55177d6f492a946068c8665d5304fd519f4d4469c85f3c3acecdb424c6282b4542503a3d8f6fdb3dff01b5fa55a
-  data.tar.gz: 7eeeee7b32eb785b0967beb040f92ee7cf996cc78b4eb996408c12d04fe7f9972472d2adc329300e29be1f332642122d6d0c5872661d8fa6d6ff78b98a43d935
+  metadata.gz: d6e3a765a7482134562d89e25bd187fa05b2323928b4f145cc3217b99073b9e353e76c25c863bc85b12e9c961ffeb504425923be4c9f7a6ba64102db0f8d5ef7
+  data.tar.gz: f6b1972484b4954e553606bb51260a28f5382a773069750d1076618d0d6d8d36072229cc8a89c44f689eb8026454c8e15bf5a615eee582dcda40baf1c87c21ce

data/plugin.txt

@@ -17,6 +17,7 @@ VARIABLE example_microservice_name openc3-example
 VARIABLE templated_microservice_name openc3-templated
 VARIABLE example_port 9999
 VARIABLE templated_port 5025
+VARIABLE inst_router_port 7779
 VARIABLE log_retain_time 172800
 VARIABLE reduced_log_retain_time 2592000
 
@@ -92,7 +93,7 @@ VARIABLE reduced_log_retain_time 2592000
 <% end %>
 
 <% if include_inst and include_inst_router %>
-  ROUTER <%= inst_router_name %> tcpip_server_interface.rb 7779 7779 nil 10.0 PREIDENTIFIED
+  ROUTER <%= inst_router_name %> tcpip_server_interface.rb <%= inst_router_port %> <%= inst_router_port %> nil 10.0 PREIDENTIFIED
     MAP_TARGET <%= inst_target_name %>
 <% end %>
 

data/targets/INST/cmd_tlm/inst_cmds.txt

@@ -1,6 +1,6 @@
 COMMAND <%= target_name %> COLLECT BIG_ENDIAN "Starts a collect on the <%= target_name %> target"
   <%= render "_ccsds_cmd.txt", locals: {id: 1} %>
-  PARAMETER    TYPE           64  16  UINT MIN MAX 0 "Collect type"
+  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
     STATE NORMAL  0
     STATE SPECIAL 1 HAZARDOUS

data/targets/INST/lib/example_limits_response.rb

@@ -30,9 +30,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' => 5, scope: 'DEFAULT')
+      cmd('<%= target_name %>', 'COLLECT', 'TYPE' => 'NORMAL', 'DURATION' => 5)
     when :RED_LOW
-      cmd_no_hazardous_check('<%= target_name %>', 'CLEAR', scope: 'DEFAULT')
+      cmd_no_hazardous_check('<%= target_name %>', 'CLEAR')
     end
   end
 

data/targets/INST/screens/commanding.txt

@@ -18,7 +18,10 @@ VERTICAL
       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.
-    # All OpenC3 commands (api.cmd) must be separated by newlines '\n'. All code separated by semicolons is evaluated together.
+    # 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))"
+    # The tlm() function returns a Promise which is resolved with then() at which point we send the command with the parameter
     BUTTON 'Start Collect' "var type=screen.get_named_widget('COLLECT_TYPE').text(); api.cmd('<%= target_name %> COLLECT with TYPE '+type+', DURATION '+screen.get_named_widget('DURATION').text())"
   END
   SETTING BACKCOLOR 163 185 163