openc3-cosmos-demo 5.10.1 → 5.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c79a082a0a7ba7369461e5c77a51e4b8f2f6784efe78230859325820cb9271ff
-  data.tar.gz: 027beabcba3f4305e99f8eb41cda054e38ce8063970d560b343c1713da526219
+  metadata.gz: c1d450e10cbf029128cc8dadf2120924d37dab213c3de3019b4defa0a71a1b5a
+  data.tar.gz: ba971d7ef797552a50cf90e38fdcc5a61c96b9b43eb8e6f83974b61b3536237a
 SHA512:
-  metadata.gz: 9efccbe10a089b5806a60a4f54560db6ee00ab9654736af32891f2e84b20a4e4652c2cc6cc65f6f95628ad8757b5562ccf3ceda188ecb262f39fb2106babc08e
-  data.tar.gz: 4f9cddf20a0760bd34a07fce20a3036074a02461fc1112df46b2c5fbe3b181b4005cf85797726035e19a579caae5947e77e96744ffeb6a120a69686c7c5abea1
+  metadata.gz: 3e662edc8c4471caaf3546efa2d928145b05cfd2904cf11939dc096d1229a1fb31476bbebe402ab59d4f431cb06c5822c30115ebec4853a2ce039db211c6e1db
+  data.tar.gz: 4a9e9318956b95f2b9fe2a65a1eadedb679b45afd6d3982958df6a1132fe351dd8986aee3798407a7f90e18e67ae7198a238cbef1a4a397255ba1d603c8341e4

data/plugin.txt

@@ -39,6 +39,8 @@ VARIABLE reduced_log_retain_time 2592000
     LOG_RETAIN_TIME <%= log_retain_time %>
     REDUCED_LOG_RETAIN_TIME <%= reduced_log_retain_time %>
     TLM_LOG_CYCLE_TIME 300
+    # Allow the reducer microservice to take 50% of the cpu (default 30%)
+    REDUCER_MAX_CPU_UTILIZATION 50
 <% end %>
 
 <% if include_inst2 %>
@@ -51,13 +53,19 @@ VARIABLE reduced_log_retain_time 2592000
 <% if include_example %>
   TARGET EXAMPLE <%= example_target_name %>
     LOG_RETAIN_TIME <%= log_retain_time %>
-    REDUCED_LOG_RETAIN_TIME <%= reduced_log_retain_time %>
+    # Disable data reduction (min, hour, day) on this target data
+    # No 'ruby reducer_microservice.rb DEFAULT__REDUCER__EXAMPLE'
+    # will appear in the the process list
+    REDUCER_DISABLE
 <% end %>
 
 <% if include_templated %>
   TARGET TEMPLATED <%= templated_target_name %>
     LOG_RETAIN_TIME <%= log_retain_time %>
-    REDUCED_LOG_RETAIN_TIME <%= reduced_log_retain_time %>
+    # Disable data reduction (min, hour, day) on this target data
+    # No 'ruby reducer_microservice.rb DEFAULT__REDUCER__TEMPLATED'
+    # will appear in the the process list
+    REDUCER_DISABLE
 <% end %>
 
 <% if include_system %>

data/targets/EXAMPLE/target.txt

@@ -1,9 +1,7 @@
 REQUIRE example_interface.rb
 
-# Ignored Parameters
-# IGNORE_PARAMETER parameter_name
+# Ignored Parameters and Items
 IGNORE_PARAMETER PACKET_ID
-
 IGNORE_ITEM RECEIVED_COUNT
 IGNORE_ITEM RECEIVED_TIMESECONDS
 IGNORE_ITEM RECEIVED_TIMEFORMATTED

data/targets/INST/cmd_tlm/inst_tlm.txt

@@ -130,7 +130,7 @@ TELEMETRY <%= target_name %> IMAGE BIG_ENDIAN "Packet with image data"
   ITEM PACKET_TIME 0 0 DERIVED "Ruby time based on TIMESEC and TIMEUS"
     READ_CONVERSION unix_time_conversion.rb 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"
@@ -143,5 +143,7 @@ TELEMETRY <%= target_name %> MECH BIG_ENDIAN "Mechanism status"
     UNITS DEGREES DEG
   APPEND_ITEM SLRPNL5       32 FLOAT    "Solar panel 5 angle"
     UNITS DEGREES DEG
+  APPEND_ITEM CURRENT       32 FLOAT    "Device current"
+    UNITS micro-Ampères µA
   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/sim_inst.rb

@@ -132,7 +132,6 @@ module OpenC3
       @trackStars[8] = 583
       @trackStars[9] = 622
 
-      @get_count = 0
       @bad_temp2 = false
       @last_temp2 = 0
       @quiet = false
@@ -272,11 +271,11 @@ module OpenC3
           packet.biasy = @att_packet.biasy
           packet.biasy = @att_packet.biasz
 
-          packet.star1id = @trackStars[((@get_count / 100) + 0) % 10]
-          packet.star2id = @trackStars[((@get_count / 100) + 1) % 10]
-          packet.star3id = @trackStars[((@get_count / 100) + 2) % 10]
-          packet.star4id = @trackStars[((@get_count / 100) + 3) % 10]
-          packet.star5id = @trackStars[((@get_count / 100) + 4) % 10]
+          packet.star1id = @trackStars[((count_100hz / 100) + 0) % 10]
+          packet.star2id = @trackStars[((count_100hz / 100) + 1) % 10]
+          packet.star3id = @trackStars[((count_100hz / 100) + 2) % 10]
+          packet.star4id = @trackStars[((count_100hz / 100) + 3) % 10]
+          packet.star5id = @trackStars[((count_100hz / 100) + 4) % 10]
 
           packet.posprogress = (@position_file_bytes_read.to_f / @position_file_size.to_f) * 100.0
           packet.attprogress = (@attitude_file_bytes_read.to_f / @attitude_file_size.to_f) * 100.0
@@ -326,7 +325,7 @@ module OpenC3
             packet.ground1status = 'CONNECTED'
             packet.ground2status = 'CONNECTED'
           else
-            if @get_count % 1000 == 0
+            if count_100hz % 1000 == 0
               if packet.ground1status == 'CONNECTED'
                 packet.ground1status = 'UNAVAILABLE'
               else
@@ -334,7 +333,7 @@ module OpenC3
               end
             end
 
-            if @get_count % 500 == 0
+            if count_100hz % 500 == 0
               if packet.ground2status == 'CONNECTED'
                 packet.ground2status = 'UNAVAILABLE'
               else
@@ -367,16 +366,16 @@ module OpenC3
           packet.slrpnl3 = @solar_panel_positions[2]
           packet.slrpnl4 = @solar_panel_positions[3]
           packet.slrpnl5 = @solar_panel_positions[4]
+          packet.current = 0.5
         end
       end
 
       # 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 == 900
+      if count_100hz % 1000 == 900
         pending_packets << Packet.new(nil, nil, :BIG_ENDIAN, nil, data)
       end
 
-      @get_count += tick_increment
       pending_packets
     end
   end

data/targets/INST/procedures/checks.rb

@@ -1,5 +1,7 @@
-# Display the environment variables
+# Display all environment variables
 puts ENV.inspect
+# Print the TYPE env var which is set in the INST COMMANDING screen
+puts "ENV['TYPE']:#{ENV['TYPE']}"
 
 collect_cnt = tlm("<%= target_name %> HEALTH_STATUS COLLECTS")
 cmd("<%= target_name %> COLLECT with DURATION 11, TYPE NORMAL")

data/targets/INST/procedures/stash.rb

@@ -1,7 +1,9 @@
 # Stash API is useful for storing simple key/value pairs
 # to preserve state between script runs
 stash_set('key1', 'val1')
+puts "key1: #{stash_get('key1')}"
 stash_set('key2', 'val2')
+puts "key2: #{stash_get('key2')}"
 check_expression("'#{stash_get('key1')}' == 'val1'")
 check_expression("'#{stash_get('key2')}' == 'val2'")
 check_expression("'#{stash_keys().to_s}' == '[\"key1\", \"key2\"]'")

data/targets/INST/procedures_py/target_file.py

@@ -1,26 +1,29 @@
 from openc3.script import *
+from openc3.utilities.string import formatted
+import tempfile
 
 put_target_file("INST/test.txt", "this is a string test")
 download_file("INST/test.txt")  # download via path
 file = get_target_file("INST/test.txt")
-print(file.read)
-file.rewind  # rewind so download_file can read
+print(file.read())
+file.seek(0)  # rewind so download_file can read
 download_file(file)  # download using file
-file.delete
+file.close()  # closing deletes tempfile
 delete_target_file("INST/test.txt")
 
-save_file = Tempfile.new("test")
+save_file = tempfile.NamedTemporaryFile(mode="w+t")
 save_file.write("this is a Io test")
-save_file.rewind
+save_file.seek(0)
 put_target_file("INST/test.txt", save_file)
-save_file.delete
+save_file.close()  # Delete the tempfile
 file = get_target_file("INST/test.txt")
-print(file.read)
-file.delete
+print(file.read())
+file.close()
 delete_target_file("INST/test.txt")
 
-put_target_file("INST/test.bin", "\x00\x01\x02\x03\xFF\xEE\xDD\xCC")
-file = get_target_file("INST/test.bin")
-print(file.read.formatted)
-file.delete
-delete_target_file("INST/test.bin")
+# TODO: Binary not yet supported
+# put_target_file("INST/test.bin", b"\x00\x01\x02\x03\xFF\xEE\xDD\xCC")
+# file = get_target_file("INST/test.bin")
+# print(formatted(file.read()))
+# file.close()
+# delete_target_file("INST/test.bin")

data/targets/INST/screens/commanding.txt

@@ -50,6 +50,7 @@ VERTICAL
     BUTTON 'Run Script' "var script=screen.getNamedWidget('SCRIPTNAME').text();" \
       "var ctype=screen.getNamedWidget('COLLECT_TYPE').text();" \
       # Set some environment variables to be used by the script as ENV['TYPE']
+      # See INST/procedures/checks.rb for an example of usage
       "var env = {}; env['TYPE'] = ctype;" \
       "runScript('INST/procedures/'+script, !screen.getNamedWidget('BG').checked(), env)"
   END

data/targets/INST/screens/other.txt

@@ -6,7 +6,7 @@ SCROLLWINDOW 200
   TITLE "<%= target_name %> Other Widget Examples" courier 10 normal true
 
   HORIZONTAL
-    LABEL "TestText"
+    LABEL "TestText œ © ®" # Throw in some UTF-8 chars
     LABEL "TestText" nil 20 # Only change the font size
     LABEL "TestText" nil nil BOLD # Only change make it bold
     LABEL "TestText" nil nil nil true # Only make it italic

data/targets/INST/target.txt

@@ -3,7 +3,6 @@ REQUIRE example_limits_response.rb
 REQUIRE sim_inst.rb
 
 # Ignored Parameters
-# IGNORE_PARAMETER parameter_name
 IGNORE_PARAMETER CCSDSVER
 IGNORE_PARAMETER CCSDSTYPE
 IGNORE_PARAMETER CCSDSSHF
@@ -14,7 +13,6 @@ IGNORE_PARAMETER CCSDSLENGTH
 IGNORE_PARAMETER PKTID
 
 # Ignored Items
-# IGNORE_ITEM item_name
 IGNORE_ITEM CCSDSVER
 IGNORE_ITEM CCSDSTYPE
 IGNORE_ITEM CCSDSSHF