openc3-cosmos-demo 5.3.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fca474828cfbb94f5d172b53030194160be013907dc645a089aaaccdc18a07a8
-  data.tar.gz: 18a7eac99f026d6646a15250c2119329084a830d04ad0ba60da02f9c5e879bd2
+  metadata.gz: b0d465be2df9577e161eab29db9550dfb56dada9344298ef8f1c7e91c4e750a8
+  data.tar.gz: 863feefee70c3a92e7d9cc44c893e1502e8fb7a041b4b40944e6bc3c6e5026c9
 SHA512:
-  metadata.gz: ebe0fb07428eb7bfbc746eea27cdc1764b0b53b65f522b61afe5115826671d55752d4af3c09b09f915aa3a4bfd02424ee5d4a2967bd2ba196ecd403d4147c19a
-  data.tar.gz: 8321d59bbe30cad4a7a4188c43a83d5a371100debe3196b4123d286b0f60c63abc184e2dd022bfc59b379e61465707a3ca2c8559944460a32170eb8ffa8ccf46
+  metadata.gz: 87073b255a6fbf21d9533420edabbc392d86caf411161811b7e459dd783f094daaf8183454baa63e3a02b522b378adb20dca96f6b48f383b95dc631239a273a3
+  data.tar.gz: 45b6239e974c3c8ba5ac85a65bce9eb1c964561d8014803d4224ad3f972dcb4daf0fbed3695b4a49a18e91b8f684ec58663678dc20343396df33c9b75a903f0a

data/microservices/EXAMPLE/example_target.rb

@@ -22,10 +22,11 @@
 
 require 'openc3'
 require 'openc3/interfaces'
+require 'openc3/microservices/microservice'
 require 'openc3/tools/cmd_tlm_server/interface_thread'
 
 module OpenC3
-  class ExampleTarget
+  class ExampleTarget < Microservice
     class ExampleServerInterface < TcpipServerInterface
       def initialize(port)
         super(port.to_i, port.to_i, 5.0, nil, 'LENGTH', 0, 32, 4, 1, 'BIG_ENDIAN', 4, nil, nil, true)
@@ -83,9 +84,15 @@ module OpenC3
       end
     end
 
-    def initialize(target_name, port)
+    def initialize(name)
+      super(name)
+      @sleep_period = 1 # 1 second between runs
+      # @target_names is an array of all the names mapped to this microservice
+      @target_name = @target_names[0] # Should only be 1
+      # ports is an array of arrays consisting of the port number and protocol
+      # e.g. [[1234, "UDP"], [5678, "TCP"]]
+      port = @config["ports"][0][0] # Should only be 1
       # Create interface to receive commands and send telemetry
-      @target_name = target_name
       @interface = ExampleServerInterface.new(port)
       @interface_thread = nil
       @telemetry_thread = nil
@@ -104,23 +111,22 @@ module OpenC3
       @interface_thread.stop if @interface_thread
     end
 
-    def self.run(target_name, port)
+    def run
       Logger.level = Logger::INFO
       Thread.abort_on_exception = true
-      temp_dir = Dir.mktmpdir
-      System.setup_targets([target_name], temp_dir, scope: ENV['OPENC3_SCOPE'])
-      target = self.new(target_name, port)
-      begin
-        target.start
-        while true
-          sleep 1
-        end
-      rescue SystemExit, SignalException
-        target.stop
-        FileUtils.remove_entry(temp_dir) if File.exist?(temp_dir)
+
+      @state = 'STARTING'
+      start()
+      @state = 'RUNNING'
+      while true
+        break if @cancel_thread
+        sleep @sleep_period
       end
+      @state = 'STOPPING'
+      stop()
+      @state = 'STOPPED'
     end
   end
 end
 
-OpenC3::ExampleTarget.run(ARGV[0], ARGV[1]) if __FILE__ == $0
+OpenC3::ExampleTarget.run if __FILE__ == $0

data/microservices/TEMPLATED/scpi_target.rb

@@ -22,10 +22,11 @@
 
 require 'openc3'
 require 'openc3/interfaces'
+require 'openc3/microservices/microservice'
 require 'openc3/tools/cmd_tlm_server/interface_thread'
 
 module OpenC3
-  class ScpiTarget
+  class ScpiTarget < Microservice
     class ScpiServerInterface < TcpipServerInterface
       def initialize(port)
         super(port.to_i, port.to_i, 5.0, nil, 'TERMINATED', '0xA', '0xA')
@@ -48,7 +49,12 @@ module OpenC3
       end
     end
 
-    def initialize(port)
+    def initialize(name)
+      super(name)
+      @sleep_period = 1 # 1 second between runs
+      # ports is an array of arrays consisting of the port number and protocol
+      # e.g. [[1234, "UDP"], [5678, "TCP"]]
+      port = @config["ports"][0][0] # Should only be 1
       # Create interface to receive commands and send telemetry
       @target_interface = ScpiServerInterface.new(port)
       @interface_thread = nil
@@ -63,20 +69,22 @@ module OpenC3
       @interface_thread.stop if @interface_thread
     end
 
-    def self.run(target_name, port)
+    def run
       Logger.level = Logger::INFO
-      temp_dir = Dir.mktmpdir
-      System.setup_targets([target_name], temp_dir, scope: ENV['OPENC3_SCOPE'])
-      target = self.new(port)
-      begin
-        target.start
-        loop { sleep 1 }
-      rescue SystemExit, SignalException
-        target.stop
-        FileUtils.remove_entry(temp_dir) if File.exist?(temp_dir)
+      Thread.abort_on_exception = true
+
+      @state = 'STARTING'
+      start()
+      @state = 'RUNNING'
+      while true
+        break if @cancel_thread
+        sleep @sleep_period
       end
+      @state = 'STOPPING'
+      stop()
+      @state = 'STOPPED'
     end
   end
 end
 
-OpenC3::ScpiTarget.run(ARGV[0], ARGV[1]) if __FILE__ == $0
+OpenC3::ScpiTarget.run if __FILE__ == $0

data/plugin.txt

@@ -97,16 +97,16 @@ VARIABLE reduced_log_retain_time 2592000
 
 <% if include_example_microservice %>
   MICROSERVICE EXAMPLE <%= example_microservice_name %>
-    WORK_DIR .
+    CMD ruby example_target.rb
+    TARGET_NAME <%= example_target_name %>
     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 .
+    CMD ruby scpi_target.rb
+    TARGET_NAME <%= templated_target_name %>
     PORT <%= templated_port %>
-    CMD ruby scpi_target.rb <%= templated_target_name %> <%= templated_port %>
 <% end %>
 
 WIDGET BIG

data/targets/INST/cmd_tlm/inst_cmds.txt

@@ -30,9 +30,9 @@ COMMAND <%= target_name %> SETPARAMS BIG_ENDIAN "Sets numbered parameters"
 COMMAND <%= target_name %> ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
   <%= render "_ccsds_cmd.txt", locals: {id: 5} %>
   APPEND_PARAMETER STRING 2048 STRING "NOOP" "Enumerated string parameter"
-    STATE "NOOP" "NOOP" DISABLE_MESSAGES
     STATE "ARM LASER" "ARM LASER" HAZARDOUS "Arming the laser poses an eye safety hazard."
     STATE "FIRE LASER" "FIRE LASER" HAZARDOUS "WARNING Laser will be fired!"
+    STATE "NOOP" "NOOP" DISABLE_MESSAGES
   APPEND_PARAMETER BINARY 32 STRING 0xDEADBEEF "Binary string"
   APPEND_PARAMETER ASCII 80 STRING "0xDEADBEEF" "ASCII string"
 
@@ -59,7 +59,7 @@ COMMAND <%= target_name %> MEMLOAD BIG_ENDIAN "Load memory"
 
 COMMAND <%= target_name %> QUIET BIG_ENDIAN "Enable/disable no out of limits in the demo"
   <%= render "_ccsds_cmd.txt", locals: {id: 11} %>
-  APPEND_PARAMETER STATE 8 UINT 0 1 0
+  APPEND_PARAMETER STATE 8 UINT 0 1 1
     STATE FALSE 0
     STATE TRUE 1
 

data/targets/INST/lib/sim_inst.rb

@@ -368,7 +368,7 @@ module OpenC3
 
       # Every 10s throw an unknown packet at the server just to demo that
       data = Array.new(10) { rand(0..255) }.pack("C*")
-      if @get_count % 1000 == 999
+      if @get_count % 1000 == 900
         pending_packets << Packet.new(nil, nil, :BIG_ENDIAN, nil, data)
       end