openc3-cosmos-demo 5.5.2 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc2738b6f1bad4eae1536aace0e87f2fa09185618a431a0a41e87035adca40fa
-  data.tar.gz: 246ff45f251f462ef9a00890c111c40d034c116efd23a5514391a459e59b3e2f
+  metadata.gz: 13d6b362276b2f4ea60dc5dd69861fbb3b337ec57d3ba0bce62b5e3a81364dee
+  data.tar.gz: acf3770a7e361b0d2e02313582c5a03d3bc7692236a5b4848fdeb072fea5da7f
 SHA512:
-  metadata.gz: 512bb79994c26f20ff54885f789fdab1664f0131116df00e7626b71425af4559e01f912930e1aeb1bde691a8754561ecb5dbda8c50f0945646aefe87d2e9b3f6
-  data.tar.gz: 89e027be21b73c953a3698257bd737efc5711e16329fd71035f84431eb01ef2f691e78f81162e29deb32dd5cb08caea5267a5b095f9becd3b524534ed5f53e55
+  metadata.gz: 4c6c844ffc2555b580f514e7d77fcf873fd32b1112407db85197b7e89747bfc9bb74398ff217dbc05c503daaad15c7738d6e2020803ed4b232167dc07145b0f0
+  data.tar.gz: 9f6455f2820a84b9083b738ababc302da8c4a534926ea8d5285404dda0cfc3f3a262e082ce83561a241c8e156f9dd5bc8cdcc5661a3b35256dfb26f99ef62087

data/Rakefile

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 PLUGIN_NAME = Dir['*.gemspec'][0].split('.')[0..-2].join('.')
@@ -39,7 +39,13 @@ task :build => [:require_version] do
   if platform == 'mswin32' or platform == 'mingw32'
     puts "Warning: Building gem on Windows will lose file permissions"
   end
-  # Build the widgets in the src directory
-  system("yarn run build")
-  system("gem build #{PLUGIN_NAME}")
+  # Build the widgets in the src directory using sh built into Rake:
+  # https://rubydoc.info/gems/rake/FileUtils#sh-instance_method
+  sh('yarn', 'run', 'build')
+  sh('gem', 'build', PLUGIN_NAME)
+  sh('openc3cli validate *.gem') do |ok, status|
+    if !ok && status.exitstatus == 127 # command not found
+      puts "Install the openc3 gem to validate! (gem install openc3)"
+    end
+  end
 end

data/plugin.txt

@@ -72,7 +72,6 @@ VARIABLE reduced_log_retain_time 2592000
 <% 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
 <% end %>
 
 <% if include_example and include_example_int %>
@@ -82,7 +81,8 @@ VARIABLE reduced_log_retain_time 2592000
     PROTOCOL WRITE MyRejectProtocol
     MAP_TARGET <%= example_target_name %>
     DONT_CONNECT
-    LOG_RAW
+    # Override the default log time of 600
+    LOG_STREAM 60
 <% end %>
 
 <% if include_templated and include_templated_int %>
@@ -94,7 +94,7 @@ VARIABLE reduced_log_retain_time 2592000
 <% end %>
 
 <% if include_inst and include_inst_router %>
-  ROUTER <%= inst_router_name %> tcpip_server_interface.rb <%= inst_router_port %> <%= inst_router_port %> nil 10.0 PREIDENTIFIED
+  ROUTER <%= inst_router_name %> tcpip_server_interface.rb <%= inst_router_port %> <%= inst_router_port %> 10.0 nil PREIDENTIFIED
     MAP_TARGET <%= inst_target_name %>
 <% end %>
 

data/targets/INST/cmd_tlm/inst_tlm.txt

@@ -122,11 +122,11 @@ TELEMETRY <%= target_name %> PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
 
 TELEMETRY <%= target_name %> IMAGE BIG_ENDIAN "Packet with image data"
   <%= render "_ccsds_tlm.txt", locals: {apid: 4} %>
-  APPEND_ITEM BYTES 32 UINT "First bytes"
-    FORMAT_STRING '0x%08x'
   APPEND_ITEM BLOCK 8000 BLOCK "Raw Data"
   APPEND_ITEM IMAGE 0 BLOCK "Image Data"
-    OVERLAP # Notify OpenC3 that this is intentionally overlapping the BYTES field
+  ITEM BYTES 128 32 UINT "First bytes"
+    FORMAT_STRING '0x%08x'
+    OVERLAP # Notify OpenC3 that this is intentionally overlapping the BLOCK field
   ITEM PACKET_TIME 0 0 DERIVED "Ruby time based on TIMESEC and TIMEUS"
     READ_CONVERSION unix_time_conversion.rb TIMESEC TIMEUS
 

data/targets/INST/procedures/screens.rb

@@ -0,0 +1,33 @@
+all_screens = get_screen_list()
+puts all_screens["INST"]
+wait(1)
+definition = get_screen_definition("INST", "ADCS")
+puts definition
+wait(1)
+display_screen("INST", "ADCS")
+wait(3)
+display_screen("INST", "HS", 400, 0)
+wait(3)
+clear_screen("INST", "ADCS")
+wait(3)
+display_screen("INST", "IMAGE")
+wait(3)
+clear_all_screens()
+wait(3)
+definition = '
+SCREEN AUTO AUTO 1.0
+
+VERTICALBOX "Test Screen"
+  LABELVALUE INST HEALTH_STATUS TEMP1
+  LABELVALUE INST HEALTH_STATUS RECEIVED_TIMEFORMATTED WITH_UNITS 30
+END
+'
+local_screen("TEST", definition)
+wait(3)
+clear_all_screens()
+create_screen("INST", "TEST", definition)
+display_screen("INST", "TEST")
+wait(3)
+clear_all_screens()
+delete_screen("INST", "TEST")
+display_screen("INST", "TEST") # Expected to fail because new screen was deleted

data/targets/INST/screens/block.txt

@@ -2,6 +2,6 @@ SCREEN AUTO AUTO 1.0
 
 VERTICAL
   TITLE "<%= target_name %> Instrument Block Data"
-  BLOCK <%= target_name %> IMAGE IMAGE
-  BLOCK <%= target_name %> IMAGE IMAGE 600 200 "%02X" 4 6 "0x%08X:"
+  BLOCK <%= target_name %> IMAGE BLOCK
+  BLOCK <%= target_name %> IMAGE BLOCK 680 200 "%02X" 4 6 "0x%08X: "
 END

data/targets/INST/screens/latest.txt

@@ -2,7 +2,7 @@ SCREEN AUTO AUTO 1.0
 
 VERTICAL
 
-  TITLE "<%= @target_name %> Instrument Latest Header"
+  TITLE "<%= target_name %> Instrument Latest Header"
 
   VERTICALBOX "Header"
     LABELVALUE INST LATEST CCSDSVER