openc3-cosmos-demo 5.5.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa57472a26d8bb68c57270d8ffc5664aae5e332cd9599fb61d59b5ff1d2e3312
-  data.tar.gz: aede6a97cea27c5471546e7ef2e9dce7f4112f6125a936ad52f3fd88c1759b6f
+  metadata.gz: 375902608394fe2ed9bdf8aa85422c89039e23a702a2c6b97292cc17839f13e5
+  data.tar.gz: cf4d41758c383312d3e0eea75e023cdd003cb01ade1b5f51327f3247c2bdac9e
 SHA512:
-  metadata.gz: 59f94a1c99266e310955517f7436d5adf1cce7cb8a968201e9ecb63d4498eaa2f4e336ab5ae1e103622c00f2fb149a150927e3ea397545b847dd93cb4ccf9a94
-  data.tar.gz: ebfb8148bc912313a799566276ec15100d9faee0f71b926c804c6034d76800e0a69a66108cc4eb63334010253b7ea3da5df35224aef406ff5474d2feeafe966f
+  metadata.gz: 74cb979d5ceff4abe480c18d49c34183117644f7168c17a8ba67bc40c93672f465876419ac3a102d93d097c81067ce78780c5e1a7f9e173ce46e06c59254a7d2
+  data.tar.gz: 279dd234d248d14fa578c8b7a9f0ec7642d71d3b8b7f7dd9b0b77b493a02453472124b1e355b479377bddca16747ce3d7c30602c79e146ce05b123a1ca317a42

data/plugin.txt

@@ -15,9 +15,7 @@ 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
@@ -78,6 +76,8 @@ VARIABLE reduced_log_retain_time 2592000
 <% end %>
 
 <% if include_example and include_example_int %>
+  # This expression builds the correct hostname for Open Source or Enterprise Edition in Kubernetes
+  <% example_host = ENV['KUBERNETES_SERVICE_HOST'] ? "#{scope}-user-#{example_microservice_name.downcase.gsub('__', '-').gsub('_', '-')}-service" : "openc3-operator" %>
   INTERFACE <%= example_int_name %> example_interface.rb <%= example_host %> <%= example_port %>
     PROTOCOL WRITE MyRejectProtocol
     MAP_TARGET <%= example_target_name %>
@@ -86,6 +86,8 @@ VARIABLE reduced_log_retain_time 2592000
 <% end %>
 
 <% if include_templated and include_templated_int %>
+  # This expression builds the correct hostname for Open Source or Enterprise Edition in Kubernetes
+  <% templated_host = ENV['KUBERNETES_SERVICE_HOST'] ? "#{scope}-user-#{templated_microservice_name.downcase.gsub('__', '-').gsub('_', '-')}-service" : "openc3-operator" %>
   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

data/targets/INST/cmd_tlm/inst_tlm.txt

@@ -122,9 +122,10 @@ 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} %>
-  ITEM BYTES 128 32 UINT "First bytes"
+  APPEND_ITEM BYTES 32 UINT "First bytes"
     FORMAT_STRING '0x%08x'
-  ITEM IMAGE 128 131072 BLOCK   "10x10 Image Data"
+  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 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

@@ -24,6 +24,7 @@
 
 require 'openc3'
 require 'stringio'
+require 'base64'
 
 module OpenC3
   # Simulated instrument for the demo. Populates several packets and cycles
@@ -46,6 +47,9 @@ module OpenC3
       @position_file_bytes_read = 0
       @attitude_file_bytes_read = 0
 
+      data = File.read(File.join(@target.dir, 'public', 'spiral.jpg'), mode: "rb")
+      @image = Base64.encode64(data)
+
       @pos_packet = Structure.new(:BIG_ENDIAN)
       @pos_packet.append_item('DAY', 16, :UINT)
       @pos_packet.append_item('MSOD', 32, :UINT)
@@ -347,11 +351,11 @@ module OpenC3
         when 'IMAGE'
           packet.timesec = time.tv_sec - @time_offset
           packet.timeus = time.tv_usec
-          # Create an Array the size of the packet and then initialize
+          packet.image = @image
+          # Create an Array and then initialize
           # using a sample of all possible hex values (0..15)
           # finally pack it into binary using the Character 'C' specifier
-          data = Array.new(packet.image.length) { Array(0..15).sample }.pack("C*")
-          packet.image = data
+          packet.block = Array.new(1000) { Array(0..15).sample }.pack("C*")
           packet.ccsdsseqcnt += 1
 
         when 'MECH'

data/targets/INST/screens/_footer.txt

@@ -1,3 +1 @@
-VERTICALBOX
-  LABELVALUE <%= target_name %> HEALTH_STATUS PACKET_TIMEFORMATTED WITH_UNITS 30
-END
+LABELVALUE <%= target_name %> HEALTH_STATUS PACKET_TIMEFORMATTED WITH_UNITS 30

data/targets/INST/screens/adcs.txt

@@ -5,9 +5,7 @@ VERTICAL
   # Note @original_target_name is also available
 
   HORIZONTAL
-    VERTICALBOX
-      SECTIONHEADER "Position and Velocity"
-
+    VERTICALBOX "Position and Velocity"
       LABELVALUE <%= target_name %> ADCS POSX WITH_UNITS 20 CENTER
       LABELVALUE <%= target_name %> ADCS POSY WITH_UNITS 22 CENTER
       LABELVALUE <%= target_name %> ADCS POSZ WITH_UNITS 24 CENTER
@@ -16,9 +14,7 @@ VERTICAL
       LABELVALUE <%= target_name %> ADCS VELZ WITH_UNITS 24
     END
 
-    VERTICALBOX
-      SECTIONHEADER "Attitude"
-
+    VERTICALBOX "Attitude"
       LABELVALUE <%= target_name %> ADCS Q1 WITH_UNITS 12 RIGHT
         SETTING TEXTALIGN LEFT
         SETTING TEXTCOLOR RED
@@ -40,9 +36,7 @@ VERTICAL
         SETTING TEXTALIGN LEFT
     END
 
-    VERTICALBOX
-      SECTIONHEADER "File Progress"
-
+    VERTICALBOX "File Progress"
       LABELPROGRESSBAR <%= target_name %> ADCS POSPROGRESS
       LABELPROGRESSBAR <%= target_name %> ADCS ATTPROGRESS
       LABELPROGRESSBAR <%= target_name %> ADCS ATTPROGRESS 2 60 RAW # scale by 2

data/targets/INST/screens/commanding.txt

@@ -7,8 +7,7 @@ VERTICAL
   LABELVALUE <%= target_name %> HEALTH_STATUS COLLECT_TYPE
   LABELVALUE <%= target_name %> HEALTH_STATUS DURATION
 
-  VERTICALBOX
-    SECTIONHEADER "Send Collect Command:"
+  VERTICALBOX "Send Collect Command:"
     HORIZONTAL
       LABEL "Type: "
       # The ampersand '&' indicates a line continuation
@@ -31,10 +30,8 @@ VERTICAL
       # You can have comments between string concatenations
       "api.cmd('<%= target_name %> COLLECT with TYPE '+type+', DURATION '+dur)"
   END
-  SETTING BACKCOLOR 163 185 163
 
-  VERTICALBOX
-    SECTIONHEADER "Parameter-less Commands:"
+  VERTICALBOX "Parameter-less Commands:"
     NAMED_WIDGET GROUP RADIOGROUP 1 # Select 'Clear' initially, 0-based index
       RADIOBUTTON 'Abort'
       RADIOBUTTON 'Clear'
@@ -44,10 +41,8 @@ VERTICAL
       "api.cmd('<%= target_name %> ABORT') : (screen.getNamedWidget('CHECK').checked() ? " +
       "api.cmd_no_hazardous_check('<%= target_name %> CLEAR') : api.cmd('<%= target_name %> CLEAR'))"
   END
-  SETTING BACKCOLOR 163 185 163
 
-  VERTICALBOX
-    SECTIONHEADER "Run Script:"
+  VERTICALBOX "Run Script:"
     NAMED_WIDGET SCRIPTNAME COMBOBOX collect.rb checks.rb
     NAMED_WIDGET BG CHECKBUTTON 'Background'
     # The backslash '\' character indicates string concatenation without newlines.
@@ -58,5 +53,4 @@ VERTICAL
       "var env = {}; env['TYPE'] = ctype;" \
       "runScript('INST/procedures/'+script, !screen.getNamedWidget('BG').checked(), env)"
   END
-  SETTING BACKCOLOR 163 185 163
 END

data/targets/INST/screens/ground.txt

@@ -1,16 +1,13 @@
 SCREEN AUTO AUTO 1.0
 
 VERTICAL
-# TODO: This causes an error because layout widgets don't have settings
-# SETTING BACKCOLOR white
   TITLE "<%= target_name %> Instrument Ground Station Status"
-  SETTING BACKCOLOR white
 
   CANVAS 650 600
     # Just demonstrate lines and circles
     CANVASLINE 0 3 650 3 blue 3
-    CANVASDOT 10 15 BLUE 5
-    CANVASLABEL 200 20 "Ground Contact Status"
+    # CANVASDOT 10 15 BLUE 5
+    CANVASLABEL 200 30 "Ground Contact Status"
 
     # This is an example of using TLM_AND to && together different logical values
     # Note you must use RAW for the base value and use SETTING IMAGE true / false
@@ -22,13 +19,15 @@ VERTICAL
     #  SETTING IMAGE false "ground_off.png" 100 200
     CANVASLINE 10 10 640 10 blue 3
     CANVASIMAGE "satellite.png" 90 130 200 200
+      # If the image is clicked the "<%= target_name %> ADCS" screen will popup
+      SETTING SCREEN <%= target_name %> ADCS
     # We're using the converted value and specifing a default of "ground_error.png"
     # if none of the IMAGE settings match the value
     CANVASIMAGEVALUE <%= target_name %> HEALTH_STATUS GROUND1STATUS CONVERTED "ground_error.png" 400 100 180 180
       SETTING IMAGE CONNECTED "ground_on.png" 400 100
       SETTING IMAGE UNAVAILABLE "ground_off.png" 400 100
-      # If the image is clicked the "<%= target_name %> HS" screen will popup at 100, 100
-      SETTING SCREEN "<%= target_name %> HS" 100 100
+      # If the image is clicked the "<%= target_name %> HS" screen will popup
+      SETTING SCREEN <%= target_name %> HS
     CANVASLABEL 380 300 "Ground Station #1"
     CANVASLABELVALUE <%= target_name %> HEALTH_STATUS GROUND1STATUS 520 300
     # The default type is RAW and no default means anything over 10 will be blank
@@ -39,7 +38,11 @@ VERTICAL
       SETTING IMAGE 2..10 "ground_error.png" 400 350
     CANVASLABEL 380 550 "Ground Station #2"
     CANVASLABELVALUE <%= target_name %> HEALTH_STATUS GROUND2STATUS 520 550
-    CANVASLINEVALUE <%= target_name %> HEALTH_STATUS GROUND1STATUS 420 135 240 330 green white 3
-    CANVASLINEVALUE <%= target_name %> HEALTH_STATUS GROUND2STATUS 420 385 240 330 green white 3
+    CANVASLINEVALUE <%= target_name %> HEALTH_STATUS GROUND1STATUS 420 135 240 330 3 RAW
+      SETTING VALUE_EQ 0 WHITE
+      SETTING VALUE_EQ 1 GREEN
+    CANVASLINEVALUE <%= target_name %> HEALTH_STATUS GROUND2STATUS 420 385 240 330 3
+      SETTING VALUE_EQ UNAVAILABLE WHITE
+      SETTING VALUE_EQ CONNECTED GREEN
   END
 END

data/targets/INST/screens/hs.txt

@@ -1,5 +1,8 @@
 SCREEN AUTO AUTO 0.5
 GLOBAL_SETTING LABELVALUELIMITSBAR COLORBLIND TRUE
+GLOBAL_SETTING LABELVALUELIMITSBAR TEXTCOLOR BLACK
+GLOBAL_SETTING LABELVALUE TEXTCOLOR BLACK
+GLOBAL_SETTING VERTICALBOX TEXTCOLOR BLACK
 
 VERTICAL
 
@@ -7,8 +10,7 @@ VERTICAL
   SETTING BACKCOLOR 162 181 205
   SETTING TEXTCOLOR black
 
-  VERTICALBOX
-    SECTIONHEADER "General Telemetry"
+  VERTICALBOX "General Telemetry"
     BUTTON 'Start Collect' 'api.cmd("<%= target_name %> COLLECT with TYPE NORMAL, DURATION 5")'
     FORMATVALUE <%= target_name %> HEALTH_STATUS COLLECTS "0x%08X" CONVERTED 14
     LABELVALUE <%= target_name %> HEALTH_STATUS COLLECT_TYPE
@@ -17,8 +19,7 @@ VERTICAL
   END
   SETTING BACKCOLOR 163 185 163
 
-  VERTICALBOX
-    SECTIONHEADER "Temperatures"
+  VERTICALBOX "Temperatures"
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1 WITH_UNITS 7
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP2 CONVERTED 25
     # LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP2 RAW 20 # RAW is not allowed for LIMITSBAR widgets
@@ -26,17 +27,15 @@ VERTICAL
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP3
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP4
-    SETTING GRAY_TOLERANCE 0.1
   END
   SETTING BACKCOLOR 203 173 158
 
-  VERTICALBOX
-    SECTIONHEADER "Ground Station"
+  VERTICALBOX "Ground Station"
     LABELVALUE <%= target_name %> HEALTH_STATUS GROUND1STATUS CONVERTED 18
     LABELVALUE <%= target_name %> HEALTH_STATUS GROUND2STATUS CONVERTED 18
   END
+  SETTING BACKCOLOR 207 171 175
 
   <%= render "_footer.txt" %>
-  SETTING BACKCOLOR 207 171 169
 END
 SETTING BACKCOLOR 162 181 205

data/targets/INST/screens/image.txt

@@ -0,0 +1,3 @@
+SCREEN AUTO AUTO 1.0
+
+IMAGEVIEWER INST IMAGE IMAGE png

data/targets/INST/screens/latest.txt

@@ -4,8 +4,7 @@ VERTICAL
 
   TITLE "<%= @target_name %> Instrument Latest Header"
 
-  VERTICALBOX
-    SECTIONHEADER "Header"
+  VERTICALBOX "Header"
     LABELVALUE INST LATEST CCSDSVER
     LABELVALUE INST LATEST CCSDSTYPE
     LABELVALUE INST LATEST CCSDSSHF

data/targets/INST/screens/limits.txt

@@ -3,8 +3,7 @@ SCREEN AUTO AUTO 1.0
 TITLE "<%= target_name %> Instrument Limits"
 
 HORIZONTAL
-  VERTICALBOX
-    SECTIONHEADER "Limits Bars"
+  VERTICALBOX "Limits Bars"
     LIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
     VALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
     LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
@@ -31,14 +30,12 @@ HORIZONTAL
       SUBSETTING 1 MAX_VALUE 10
   END
   VERTICAL
-    VERTICALBOX
-      SECTIONHEADER "Range Bars 0-100"
+    VERTICALBOX "Range Bars 0-100"
       RANGEBAR <%= target_name %> HEALTH_STATUS TEMP2 0 100
       VALUERANGEBAR <%= target_name %> HEALTH_STATUS TEMP2 0 100
       LABELVALUERANGEBAR <%= target_name %> HEALTH_STATUS TEMP2 0 100
     END
-    VERTICALBOX
-      SECTIONHEADER "Limits Colors"
+    VERTICALBOX "Limits Colors"
       LIMITSCOLOR <%= target_name %> HEALTH_STATUS TEMP1 CONVERTED 5 NIL # No label
       LIMITSCOLOR <%= target_name %> HEALTH_STATUS TEMP2 # Default is label with just item name
       LIMITSCOLOR <%= target_name %> HEALTH_STATUS GROUND1STATUS CONVERTED 5 TRUE # Full TGT/PKT/ITEM label
@@ -47,8 +44,7 @@ HORIZONTAL
 END
 
 HORIZONTAL
-  VERTICALBOX
-    SECTIONHEADER "Limits Columns"
+  VERTICALBOX "Limits Columns"
     HORIZONTAL
       LIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2
       VALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2
@@ -69,8 +65,7 @@ HORIZONTAL
   END
 
   # TODO: Not yet implemented
-  #VERTICALBOX
-  #  SECTIONHEADER "Range Columns 0-100"
+  #VERTICALBOX "Range Columns 0-100"
   #  HORIZONTAL
   #    RANGECOLUMN <%= target_name %> HEALTH_STATUS TEMP2 0 100
   #    VALUERANGECOLUMN <%= target_name %> HEALTH_STATUS TEMP2 0 100

data/targets/INST/screens/tabs.txt

@@ -5,9 +5,7 @@ TABBOOK
     TITLE "<%= target_name %> Instrument ADCS Information"
 
     HORIZONTAL
-      VERTICALBOX
-        SECTIONHEADER "Position and Velocity"
-
+      VERTICALBOX "Position and Velocity"
         LABELVALUE <%= target_name %> ADCS POSX WITH_UNITS 20
         LABELVALUE <%= target_name %> ADCS POSY WITH_UNITS 20
         LABELVALUE <%= target_name %> ADCS POSZ WITH_UNITS 20
@@ -16,9 +14,7 @@ TABBOOK
         LABELVALUE <%= target_name %> ADCS VELZ WITH_UNITS 20
       END
 
-      VERTICALBOX
-        SECTIONHEADER "Attitude"
-
+      VERTICALBOX "Attitude"
         LABELVALUE <%= target_name %> ADCS Q1
         LABELVALUE <%= target_name %> ADCS Q2
         LABELVALUE <%= target_name %> ADCS Q3
@@ -28,9 +24,7 @@ TABBOOK
         LABELVALUE <%= target_name %> ADCS BIASZ
       END
 
-      VERTICALBOX
-        SECTIONHEADER "File Progress"
-
+      VERTICALBOX "File Progress"
         LABELPROGRESSBAR <%= target_name %> ADCS POSPROGRESS
         LABELPROGRESSBAR <%= target_name %> ADCS ATTPROGRESS
       END
@@ -44,15 +38,11 @@ TABBOOK
   TABITEM HS
     TITLE "Instrument Health and Status"
 
-    VERTICALBOX
-      SECTIONHEADER "General Telemetry"
-
+    VERTICALBOX "General Telemetry"
       LABELVALUE <%= target_name %> HEALTH_STATUS COLLECTS
     END
 
-    VERTICALBOX
-      SECTIONHEADER "Temperatures"
-
+    VERTICALBOX "Temperatures"
       LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
       LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP2
       LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP3