openc3-demo 5.0.8 → 5.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c126becc6f120379958038e8427d826dd24ac492e17accc24b6c31136dadd357
-  data.tar.gz: e46d4180d9fa5bf46ab90517492ca34c25e7cde41557e2b7b6e1cd51f6194067
+  metadata.gz: c8c41e135d9c87d5a114051dfe52fe5132609edcd9dafd0c700c3987cdad5543
+  data.tar.gz: debce68eef521deea54e12f91c6adcd31855e3015628b2b5e1bddf6ef42aa5b5
 SHA512:
-  metadata.gz: ba3460864cd3cb3c54c3b17457ef61432feaf55177d6f492a946068c8665d5304fd519f4d4469c85f3c3acecdb424c6282b4542503a3d8f6fdb3dff01b5fa55a
-  data.tar.gz: 7eeeee7b32eb785b0967beb040f92ee7cf996cc78b4eb996408c12d04fe7f9972472d2adc329300e29be1f332642122d6d0c5872661d8fa6d6ff78b98a43d935
+  metadata.gz: 998596f7f6c83fe0d8f27cfda7ce402344d77e4511953b2add4c6909c20a76bcbe1ab628a77d966673101e877618fd8f8e69855d3c1ca7c7ac37ad1b0cc9afad
+  data.tar.gz: 78b37fa192573a8c03812440510602b7d450ccd4cf472ce736136c593adc6013731832e71fda73d9e45f14a9af349766202f12600bdcbd696bbe5528d8914a5a

data/plugin.txt

@@ -15,8 +15,11 @@ VARIABLE templated_int_name TEMPLATED_INT
 VARIABLE demo_tool_name Demo
 VARIABLE example_microservice_name openc3-example
 VARIABLE templated_microservice_name openc3-templated
+VARIABLE example_host openc3-operator
 VARIABLE example_port 9999
+VARIABLE templated_host openc3-operator
 VARIABLE templated_port 5025
+VARIABLE inst_router_port 7779
 VARIABLE log_retain_time 172800
 VARIABLE reduced_log_retain_time 2592000
 
@@ -79,32 +82,34 @@ VARIABLE reduced_log_retain_time 2592000
 <% end %>
 
 <% if include_example and include_example_int %>
-  INTERFACE <%= example_int_name %> example_interface.rb openc3-operator <%= example_port %>
+  INTERFACE <%= example_int_name %> example_interface.rb <%= example_host %> <%= example_port %>
     MAP_TARGET <%= example_target_name %>
     DONT_CONNECT
     LOG_RAW
 <% end %>
 
 <% if include_templated and include_templated_int %>
-  INTERFACE <%= templated_int_name %> templated_interface.rb openc3-operator <%= templated_port %> <%= templated_port %> 5.0 nil TEMPLATE 0xA 0xA
+  INTERFACE <%= templated_int_name %> templated_interface.rb <%= templated_host %> <%= templated_port %> <%= templated_port %> 5.0 nil TEMPLATE 0xA 0xA
     MAP_TARGET <%= templated_target_name %>
     DONT_CONNECT
 <% 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 %>
 
 <% if include_example_microservice %>
   MICROSERVICE EXAMPLE <%= example_microservice_name %>
     WORK_DIR .
+    PORT <%= example_port %>
     CMD ruby example_target.rb <%= example_target_name %> <%= example_port %>
 <% end %>
 
 <% if include_templated_microservice %>
   MICROSERVICE TEMPLATED <%= templated_microservice_name %>
     WORK_DIR .
+    PORT <%= templated_port %>
     CMD ruby scpi_target.rb <%= templated_target_name %> <%= templated_port %>
 <% 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/procedures/file_dialog.rb

@@ -1,13 +1,15 @@
 # Specify the title and message and filter to txt files
 file = open_file_dialog("Open a single file", "Choose something interesting", filter: ".txt")
 puts file # Ruby File object
+puts file.path # Path of the tempfile (generally not used)
+puts file.filename # Filename that was selected in the dialog
 puts file.read
 file.delete
 
 files = open_files_dialog("Open multiple files") # message is optional
 puts files # Array of File objects (even if you select only one)
 files.each do |file|
-  puts file
+  puts file.filename
   puts file.read
   file.delete
 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