openc3 5.19.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65a5c8a4ee0645f9d129c7c6140b9e8863e61e035f5e0269a977e8cd7d722c15
-  data.tar.gz: a023d452a32050ab5d81a3edcdc8fccaf10eed1a81b481ef11d89c633d3f6cba
+  metadata.gz: 9a54edc01e060c3a3d1163a1535491aca88770aa2cc0caba9d1300a2b450483d
+  data.tar.gz: a5bb46d276b36a51a742cfa383118cf6eb8cd866a3bb408f3daccfc69276a19e
 SHA512:
-  metadata.gz: 3ecd41dc83eb1d9af0e847fcb61d8784bfce374c33681008030423f2d1b04c09b62200ec5ca7f878273e6aed704982aeb55fddad1b1ae5490367e5fe48ea844f
-  data.tar.gz: f121f92ac5c6101eb9e3d9ebe52b525235090dc964a7bf409ebf7a47b1bc1c52c7f5a97a7194f5238ade4cee31078cb5822b486954d87983c8fdf9294f557257
+  metadata.gz: 3a7be413270a65c56781df9c8ffd4fe9a488c55d1e6e481ba6b043b94a6e762258fd7d7d6c02d7976bf05e6e84909fb032d9e4a569382888df1acb87e062bec9
+  data.tar.gz: e14b519af7d3f25a7668e37bfe7264d2ca766a4b2d0d654fe968a85be5809c5553a7dd0d8eeb60f674118c10a6f4be7851ec68df9ee07d7c3cd639cdc7b03d6a

data/Gemfile

@@ -11,10 +11,3 @@ gem 'bootsnap', '>= 1.9.3', require: false
 gem 'rack-cors', '~> 2.0'
 gem 'rails', '~> 7.1.0'
 gem 'tzinfo-data'
-
-group :test, :development do
-  gem 'mock_redis', '0.45'
-  gem 'rspec-rails', '~> 7.0'
-  gem 'simplecov', '~> 0.20'
-  gem 'simplecov-cobertura', '~> 2.1'
-end

data/bin/openc3cli

@@ -47,15 +47,6 @@ require 'irb/completion'
 
 $redis_url = "redis://#{ENV['OPENC3_REDIS_HOSTNAME']}:#{ENV['OPENC3_REDIS_PORT']}"
 
-# Build the OpenStruct and OptionParser here as constants so we can use in methods
-MIGRATE_OPTIONS = OpenStruct.new
-MIGRATE_OPTIONS.all = false
-MIGRATE_PARSER = OptionParser.new do |opts|
-  opts.banner = "cli migrate PLUGIN [TGT1...]      # Create a OpenC3 plugin from existing COSMOS 4 targets"
-  opts.on("-a", "--all", " Move all COSMOS 4 targets into a single OpenC3 plugin") do
-    MIGRATE_OPTIONS.all = true
-  end
-end
 ERROR_CODE = 1
 
 CLI_SCRIPT_ACTIONS = %w(help list run spawn)
@@ -82,7 +73,6 @@ def print_usage
   puts "  cli list <SCOPE>                  # Lists installed plugins, SCOPE is DEFAULT if not given"
   puts "  cli generate TYPE OPTIONS         # Generate various COSMOS entities"
   puts "    OPTIONS: --ruby or --python is required to specify the language in the generated code unless OPENC3_LANGUAGE is set"
-  puts "  #{MIGRATE_PARSER}"
   puts "  cli bridge CONFIG_FILENAME        # Run COSMOS host bridge"
   puts "  cli bridgegem gem_name variable1=value1 variable2=value2 # Runs bridge using gem bridge.txt"
   puts "  cli bridgesetup CONFIG_FILENAME   # Create a default config file"
@@ -116,110 +106,6 @@ def check_environment
   end
 end
 
-def migrate(args)
-  MIGRATE_PARSER.parse!(args)
-  abort(MIGRATE_PARSER.to_s) if args.length == 0
-  if MIGRATE_OPTIONS.all and args.length > 1
-    puts "Only specify the plugin name when using --all"
-    abort(MIGRATE_PARSER.to_s)
-  end
-  if !MIGRATE_OPTIONS.all and args.length < 2
-    puts "Specify the individual target names when not using --all"
-    abort(MIGRATE_PARSER.to_s)
-  end
-  if Dir.glob("config/targets/**/*").empty?
-    puts "No targets found in config/targets/*"
-    puts "Migrate must be run within an existing COSMOS configuration"
-    abort(MIGRATE_PARSER.to_s)
-  end
-
-  ###############################################################
-  # Create the framework for the plugin
-  # NOTE: generate does a chdir to be inside the plugin directory
-  ###############################################################
-  plugin = args.shift
-  OpenC3::CliGenerator.generate(['plugin', plugin])
-
-  if MIGRATE_OPTIONS.all
-    # Grab all target directories to match the command line input
-    args = Dir.glob("../config/targets/*").map { |path| File.basename(path) }
-  else
-    # Ensure targets passed in on command line actually exist
-    args.each do |target|
-      path = File.join('..', 'config', 'targets', target)
-      unless File.exist?(path)
-        puts "Target #{path} does not exist!"
-        abort(MIGRATE_PARSER.to_s)
-      end
-    end
-  end
-
-  # Overwrite plugin.txt with specified targets
-  plugin = File.open('plugin.txt', 'w')
-  FileUtils.mkdir 'targets'
-  args.each do |target|
-    puts "Migrating target #{target}"
-    FileUtils.cp_r "../config/targets/#{target}", 'targets'
-    plugin.puts "TARGET #{target} #{target}"
-  end
-  plugin.puts ""
-
-  files = Dir.glob('../lib/*')
-  files.concat(Dir.glob('../procedures/*'))
-  unless files.empty?
-    puts "Migrating /lib & /procedures to PROCEDURES target"
-    FileUtils.cp_r '../lib', "targets/PROCEDURES"
-    FileUtils.cp_r '../procedures', "targets/PROCEDURES"
-  end
-
-  # Migrate cmd_tlm_server.txt info to plugin.txt
-  Dir.glob('targets/**/cmd_tlm_server*.txt') do |cmd_tlm_server_file|
-    File.open(cmd_tlm_server_file) do |file|
-      file.each do |line|
-        next if line =~ /^\s*#/ # Ignore comments
-        next if line.strip.empty? # Ignore empty lines
-
-        # Convert TARGET to MAP_TARGET
-        line.gsub!(/TARGET (\S+)/, 'MAP_TARGET \1')
-        plugin.puts line
-      end
-    end
-    plugin.puts ''
-  end
-
-  # Migrate target.txt
-  Dir.glob('targets/**/target.txt') do |filename|
-    file = File.read(filename)
-    file.gsub!('LOG_RAW', 'LOG_STREAM')
-    file.gsub!('AUTO_SCREEN_SUBSTITUTE', '')
-    File.write(filename, file)
-  end
-
-  # Migrate some of the screens api
-  Dir.glob('targets/**/screens/*') do |file|
-    screen = File.read(file)
-    screen.gsub!('cmd(', 'api.cmd(')
-    screen.gsub!('cmd_no_checks(', 'api.cmd_no_checks(')
-    screen.gsub!('cmd_no_range_check(', 'api.cmd_no_range_check(')
-    screen.gsub!('cmd_no_hazardous_check(', 'api.cmd_no_hazardous_check(')
-    screen.gsub!('get_named_widget(', 'screen.getNamedWidget(')
-    lines = screen.split("\n")
-    lines.map! do |line|
-      if line.include?('Qt.')
-        "# FIXME (no Qt): #{line.sub("<%", "< %").sub("%>", "% >")}"
-      elsif line.include?('Cosmos::')
-        "# FIXME (no Cosmos::): #{line.sub("<%", "< %").sub("%>", "% >")}"
-      else
-        line
-      end
-    end
-    File.write(file, lines.join("\n"))
-  end
-
-  plugin.close
-  puts "Plugin complete: #{File.expand_path('.')}" # Remember we're inside the plugin dir
-end
-
 def xtce_converter(args)
   options = {}
   option_parser = OptionParser.new do |opts|
@@ -619,16 +505,25 @@ def run_migrations(folder)
   end
 
   # Run each newly discovered migration unless brand_new
-  folder = "/openc3/lib/openc3/migrations" unless folder
+  if !folder
+    folder = "/openc3/lib/openc3/migrations"
+    entries = Dir.entries(folder).map { |entry| File.join(folder, entry) }
+    folder = "/openc3-enterprise/lib/openc3-enterprise/migrations"
+    if File.exist?(folder)
+      entries.concat(Dir.entries(folder).map { |entry| File.join(folder, entry) })
+    end
+    entries = entries.sort() # run in alphabetical order
+  else
+    entries = Dir.entries(folder).sort
+  end
   migrations = OpenC3::MigrationModel.all
-  entries = Dir.entries(folder).sort # run in alphabetical order
   entries.each do |entry|
     name = File.basename(entry)
     extension = File.extname(name)
     if extension == '.rb' and not migrations[name]
       unless brand_new
         puts "Running Migration: #{name}"
-        require File.join(folder, entry)
+        require entry
       end
       OpenC3::MigrationModel.new(name: name).create
     end
@@ -869,9 +764,6 @@ if not ARGV[0].nil? # argument(s) given
   when 'generate'
     OpenC3::CliGenerator.generate(ARGV[1..-1])
 
-  when 'migrate'
-    migrate(ARGV[1..-1])
-
   when 'rubysloc'
     puts `ruby /openc3/bin/rubysloc #{ARGV[1..-1].join(' ')}`
 

data/bin/pipinstall

@@ -1,11 +1,13 @@
 #!/bin/sh
-
-pip install "$@"
+python3 -m venv $PYTHONUSERBASE
+source $PYTHONUSERBASE/bin/activate
+echo "pip3 install $@"
+pip3 install "$@"
 if [ $? -eq 0 ]; then
     echo "Command succeeded"
 else
     echo "Command failed - retrying with --no-index"
-    pip install --no-index "$@"
+    pip3 install --no-index "$@"
     if [ $? -eq 0 ]; then
         echo "ERROR: pip install failed"
     fi

data/data/config/command_modifiers.yaml

@@ -165,7 +165,7 @@ HAZARDOUS:
 ACCESSOR:
   summary: Defines the class used to read and write raw values from the packet
   description: Defines the class that is used too read raw values from the packet. Defaults to BinaryAccessor.
-    Provided accessors also include JsonAccessor, CborAccessor, HtmlAccessor, and XmlAccessor.
+    For more information see [Accessors](accessors).
   parameters:
     - name: Accessor Class Name
       required: true
@@ -252,6 +252,10 @@ VIRTUAL:
   summary: Marks this packet as virtual and not participating in identification
   description: Used for packet definitions that can be used as structures for items with a given packet.
   since: 5.18.0
+RESTRICTED:
+  summary: Marks this packet as restricted and will require approval if critical commanding is enabled
+  description: Used as one of the two types of critical commands (HAZARDOUS and RESTRICTED)
+  since: 5.20.0
 VALIDATOR:
   summary: Defines a validator class for a command
   description: Validator class is used to validate the command success or failure with both a pre_check and post_check method.
@@ -274,6 +278,12 @@ VALIDATOR:
 
     require 'openc3/packets/command_validator'
     class CustomValidator < OpenC3::CommandValidator
+      # Both the pre_check and post_check are passed the command packet that was sent
+      # You can inspect the command in your checks as follows:
+      #   packet.target_name => target name
+      #   packet.packet_name => packet name (command name)
+      #   packet.read("ITEM") => converted value
+      #   packet.read("ITEM", :RAW) => raw value
       def pre_check(packet)
         if tlm("TGT PKT ITEM") == 0
           return [false, "TGT PKT ITEM is 0"]
@@ -293,6 +303,12 @@ VALIDATOR:
     Defined in custom_validator.py:
 
     class CustomValidator(CommandValidator):
+        # Both the pre_check and post_check are passed the command packet that was sent
+        # You can inspect the command in your checks as follows:
+        #   packet.target_name => target name
+        #   packet.packet_name => packet name (command name)
+        #   packet.read("ITEM") => converted value
+        #   packet.read("ITEM", :RAW) => raw value
         def pre_check(self, command):
             if tlm("TGT PKT ITEM") == 0:
                 return [False, "TGT PKT ITEM is 0"]

data/data/config/interface_modifiers.yaml

@@ -153,7 +153,9 @@ OPTION:
       OPTION LISTEN_ADDRESS 127.0.0.1
 SECRET:
   summary: Define a secret needed by this interface
-  description: Defines a secret for this interface and optionally assigns its value to an option
+  description:
+    Defines a secret for this interface and optionally assigns its value to an option.
+    For more information see [Admin Secrets](/docs/tools/admin#secrets).
   since: 5.3.0
   parameters:
     - name: Type
@@ -164,15 +166,19 @@ SECRET:
       values: .*
     - name: Secret Name
       required: true
-      description: The name of the secret to retrieve
+      description:
+        The name of the secret to retrieve from the Admin / Secrets tab.
+        For more information see [Admin Secrets](/docs/tools/admin#secrets).
       values: .*
     - name: Environment Variable or File Path
       required: true
-      description: Environment variable name or file path to store secret
+      description: Environment variable name or file path to store secret.
+        Note that if you use the Option Name to set an option to the secret value,
+        this value doesn't really matter as long as it is unique.
       values: .*
     - name: Option Name
       required: false
-      description: Interface option to pass the secret value
+      description: Interface option to pass the secret value. This is the primary way to pass secrets to interfaces.
       values: .*
     - name: Secret Store Name
       required: false
@@ -252,3 +258,14 @@ ROUTE_PREFIX:
       values: .*
   example: |
     ROUTE_PREFIX /interface
+SHARD:
+  summary: Operator shard to run target microservices on
+  description: Operator Shard. Only used if running multiple operator containers typically in Kubernetes
+  since: 6.0.0
+  parameters:
+    - name: Shard
+      required: false
+      description: Shard number starting from 0
+      values: \d+
+  example: |
+    SHARD 0

data/data/config/item_modifiers.yaml

@@ -66,7 +66,7 @@ READ_CONVERSION:
             super().__init__()
             self.multiplier = float(multiplier)
         def call(self, value, packet, buffer):
-            return value * multiplier
+            return value * self.multiplier
   parameters:
     - name: Class Filename
       required: true

data/data/config/microservice.yaml

@@ -115,7 +115,7 @@ MICROSERVICE:
           values: .+
     SECRET:
       summary: Define a secret needed by this microservice
-      description: Defines a secret for this microservice
+      description: Defines a secret for this microservice. For more information see [Admin Secrets](/docs/tools/admin#secrets).
       since: 5.3.0
       parameters:
         - name: Type
@@ -126,7 +126,9 @@ MICROSERVICE:
           values: .*
         - name: Secret Name
           required: true
-          description: The name of the secret to retrieve
+          description:
+            The name of the secret to retrieve from the Admin / Secrets tab.
+            For more information see [Admin Secrets](/docs/tools/admin#secrets).
           values: .*
         - name: Environment Variable or File Path
           required: true
@@ -160,3 +162,14 @@ MICROSERVICE:
           required: false
           description: Regex to match against filenames. If match, then no ERB processing
           values: .+
+    SHARD:
+      summary: Operator shard to run target microservices on
+      description: Operator Shard. Only used if running multiple operator containers typically in Kubernetes
+      since: 6.0.0
+      parameters:
+        - name: Shard
+          required: false
+          description: Shard number starting from 0
+          values: \d+
+      example: |
+        SHARD 0

data/data/config/param_item_modifiers.yaml

@@ -52,7 +52,7 @@ OVERLAP:
   since: 4.4.1
 KEY:
   summary: Defines the key used to access this raw value in the packet.
-  description: Keys are often JsonPath or XPath strings
+  description: Keys are often [JSONPath](https://en.wikipedia.org/wiki/JSONPath) or [XPath](https://en.wikipedia.org/wiki/XPath) strings
   example: KEY $.book.title
   parameters:
     - name: Key string

data/data/config/parameter_modifiers.yaml

@@ -107,7 +107,7 @@ WRITE_CONVERSION:
             super().__init__()
             self.multiplier = float(multiplier)
         def call(self, value, packet, buffer):
-            return value * multiplier
+            return value * self.multiplier
   parameters:
     - name: Class Filename
       required: true

data/data/config/table_manager.yaml

@@ -53,7 +53,7 @@ TABLE:
         or a ROW_COLUMN table with identical rows containing different values.
       values:
         KEY_VALUE:
-          summary: Table rows will be unique items (previously ONE_DIMENSIONAL, now deprecated)
+          summary: Table rows will be unique items
           parameters:
             - name: Description
               requires: true
@@ -61,7 +61,7 @@ TABLE:
                 used in mouseover popups and status line information.
               values: "['\"].*['\"]"
         ROW_COLUMN:
-          summary: Table rows will be identical with multiple columns (previously TWO_DIMENSIONAL, now deprecated)
+          summary: Table rows will be identical with multiple columns
           parameters:
             - name: Rows
               requires: true

data/data/config/target.yaml

@@ -196,3 +196,14 @@ TARGET:
           required: false
           description: Regex to match against filenames. If match, then no ERB processing
           values: .+
+    SHARD:
+      summary: Operator shard to run target microservices on
+      description: Operator Shard. Only used if running multiple operator containers typically in Kubernetes
+      since: 6.0.0
+      parameters:
+        - name: Shard
+          required: false
+          description: Shard number starting from 0
+          values: \d+
+      example: |
+        SHARD 0

data/data/config/telemetry_modifiers.yaml

@@ -165,13 +165,29 @@ HIDDEN:
 ACCESSOR:
   summary: Defines the class used to read and write raw values from the packet
   description: Defines the class that is used too read raw values from the packet. Defaults to BinaryAccessor.
-    Provided accessors also include JsonAccessor, CborAccessor, HtmlAccessor, and XmlAccessor.
+    For more information see [Accessors](accessors).
   parameters:
     - name: Accessor Class Name
       required: true
       description: The name of the accessor class
       values: .+
   since: 5.0.10
+TEMPLATE:
+  summary: Defines a template string used to pull telemetry values from a string buffer
+  parameters:
+    - name: Template
+      required: true
+      description: The template string which should be enclosed in quotes
+      values: "['\"].*['\"]"
+  since: 5.0.10
+TEMPLATE_FILE:
+  summary: Defines a template file used to pull telemetry values from a string buffer
+  parameters:
+    - name: Template File Path
+      required: true
+      description: The relative path to the template file. Filename should generally start with an underscore.
+      values: .+
+  since: 5.0.10
 IGNORE_OVERLAP:
   summary: Ignores any packet items which overlap
   description: Packet items which overlap normally generate a warning unless each individual item has the OVERLAP keyword.

data/data/config/tool.yaml

@@ -82,3 +82,15 @@ TOOL:
           required: false
           description: Regex to match against filenames. If match, then no ERB processing
           values: .+
+    IMPORT_MAP_ITEM:
+      summary: Add an item to the import map
+      since: 6.0.0
+      parameters:
+        - name: key
+          required: true
+          description: Import Map Key
+          values: .+
+        - name: value
+          required: true
+          description: Import Map Value
+          values: .+

data/data/config/widgets.yaml

@@ -173,14 +173,6 @@ Decoration Widgets:
         LABEL Over
         HORIZONTALLINE
         LABEL Under
-    SECTIONHEADER:
-      summary: DEPRECATED - Displays a label that is underlined with a horizontal line
-      description: Use a VERTICALBOX or HORIZONTALBOX with title parameter instead of SECTIONHEADER
-      parameters:
-        - name: Text
-          required: true
-          description: Text to display
-          values: .*
     TITLE:
       summary: Displays a large centered title on the screen
       parameters:
@@ -299,7 +291,7 @@ Telemetry Widgets:
           description: The type of the value to display. Default is CONVERTED.
           values: <%= %w(RAW CONVERTED FORMATTED WITH_UNITS) %>
       example: |
-        BLOCK INST IMAGE IMAGE 400 130 "%02X" 4 4 "0x%08X:"
+        BLOCK INST IMAGE IMAGE 620 200 "%02X" 4 4 "0x%08X:"
     # FORMATFONTVALUE:
     #   summary: Displays a box with a value printed inside
     #     that is formatted by the specified string rather than by a format string given
@@ -377,6 +369,7 @@ Telemetry Widgets:
           values: .*
       example: |
         FORMATVALUE INST LATEST TIMESEC %012u CONVERTED 20
+        FORMATVALUE INST LATEST TEMP1 %.2f CONVERTED 20
     LABELLED:
       summary: Displays a LABEL followed by a LED
       parameters:
@@ -978,12 +971,6 @@ Telemetry Widgets:
       example: |
         LINEGRAPH INST HEALTH_STATUS TEMP1
           SETTING ITEM INST ADCS Q1 # Add additional item to graph
-        LINEGRAPH INST HEALTH_STATUS TEMP2 RAW
-        LINEGRAPH INST HEALTH_STATUS TEMP3 CONVERTED REDUCED_MINUTE MIN
-          SETTING SIZE 600 500 # width height
-          SETTING HISTORY 1h # load 1 hour of data into graph
-        LINEGRAPH INST HEALTH_STATUS TEMP4
-          SETTING HISTORY 30m # load 30 minutes of data into graph
       settings:
         # Inject the graph settings
         <%= MetaConfigParser.load('graph_settings.yaml').to_meta_config_yaml(8) %>
@@ -1232,7 +1219,6 @@ Telemetry Widgets:
           values: .*
       example: |
         TEXTBOX INST HEALTH_STATUS PACKET_TIMEFORMATTED 150 70
-        TEXTBOX INST HEALTH_STATUS PACKET_TIMEFORMATTED
     # TRENDBAR:
     #   summary: Provides the same functionality as the LIMITSBAR
     #     widget except that it also keeps a history of the telemetry item and
@@ -1401,10 +1387,20 @@ Interactive Widgets:
           required: true
           description: Text displayed next to the checkbox
           values: .+
+        - name: Checked
+          required: false
+          description:
+            Whether the initial state of the checkbox is checked (default = false).
+            Do not give a value to make the checkbox unchecked.
+          values: .+
       example: |
-        NAMED_WIDGET CHECK CHECKBUTTON 'Ignore Hazardous Checks'
+        NAMED_WIDGET UNCHECKED CHECKBUTTON 'Default Unchecked'
+        NAMED_WIDGET CHECK CHECKBUTTON 'Ignore Hazardous Checks' CHECKED
         BUTTON 'Send' 'screen.getNamedWidget("CHECK").checked() ? ' \
           'api.cmd_no_hazardous_check("INST CLEAR") : api.cmd("INST CLEAR")'
+        # You can programmatically check or uncheck the checkbox
+        BUTTON 'Check' 'screen.getNamedWidget("CHECK").value = true'
+        BUTTON 'Uncheck' 'screen.getNamedWidget("CHECK").value = false'
     COMBOBOX:
       summary: Displays a drop down list of text items
       description:
@@ -1423,6 +1419,20 @@ Interactive Widgets:
         BUTTON 'Start Collect' 'var type = screen.getNamedWidget("COLLECT_TYPE").text();' +
           'api.cmd("INST COLLECT with TYPE "+type+", DURATION 10.0")'
         NAMED_WIDGET COLLECT_TYPE COMBOBOX NORMAL SPECIAL
+    DATE:
+      summary: Displays a date picker
+      description:
+        Note this is of limited use by itself and is primarily used in
+        conjunction with NAMED_WIDGET.
+      parameters:
+        - name: Date label
+          required: false
+          description: Text to label the data selection ('Date' by default)
+          values: .+
+      example: |
+        BUTTON 'Alert Date' 'var date = screen.getNamedWidget("DATE").text();' +
+          'alert("Date:"+date)'
+        NAMED_WIDGET DATE DATE
     RADIOGROUP:
       summary: Creates a group of RADIOBUTTONs
       description: RADIOBUTTONs must be part of a group to enable selection logic
@@ -1464,6 +1474,20 @@ Interactive Widgets:
         NAMED_WIDGET DURATION TEXTFIELD 12 "10.0"
         BUTTON 'Start Collect' 'var dur = screen.getNamedWidget("DURATION").text();' +
               'api.cmd("INST COLLECT with TYPE NORMAL, DURATION "+dur+"")'
+    TIME:
+      summary: Displays a time picker
+      description:
+        Note this is of limited use by itself and is primarily used in
+        conjunction with NAMED_WIDGET.
+      parameters:
+        - name: Time label
+          required: false
+          description: Text to label the time selection ('Time' by default)
+          values: .+
+      example: |
+        BUTTON 'Alert Time' 'var time = screen.getNamedWidget("TIME").text();' +
+          'alert("Time:"+time)'
+        NAMED_WIDGET TIME TIME
 Canvas Widgets:
   description:
     Canvas Widgets are used to draw custom displays into telemetry screens.

data/ext/openc3/ext/packet/packet.c

@@ -63,6 +63,7 @@ static ID id_ivar_template = 0;
 static ID id_ivar_packet_time = 0;
 static ID id_ivar_ignore_overlap = 0;
 static ID id_ivar_virtual = 0;
+static ID id_ivar_restricted = 0;
 
 /* Sets the target name this packet is associated with. Unidentified packets
  * will have target name set to nil.
@@ -289,6 +290,7 @@ static VALUE packet_initialize(int argc, VALUE *argv, VALUE self)
   rb_ivar_set(self, id_ivar_packet_time, Qnil);
   rb_ivar_set(self, id_ivar_ignore_overlap, Qfalse);
   rb_ivar_set(self, id_ivar_virtual, Qfalse);
+  rb_ivar_set(self, id_ivar_restricted, Qfalse);
   return self;
 }
 
@@ -332,6 +334,7 @@ void Init_packet(void)
   id_ivar_packet_time = rb_intern("@packet_time");
   id_ivar_ignore_overlap = rb_intern("@ignore_overlap");
   id_ivar_virtual = rb_intern("@virtual");
+  id_ivar_restricted = rb_intern("@restricted");
 
   cPacket = rb_define_class_under(mOpenC3, "Packet", cStructure);
   rb_define_method(cPacket, "initialize", packet_initialize, -1);

data/lib/openc3/accessors/form_accessor.rb

@@ -26,11 +26,12 @@ module OpenC3
       value = nil
       ary.each do |key, ary_value|
         if key == item.key
+          # Handle the case of multiple values for the same key
+          # and build up an array of values
           if value
+            # Second time through value is not an Array yet
             if not Array === value
-              value_temp = []
-              value_temp << value
-              value = value_temp
+              value = [value]
             end
             value << ary_value
           else

data/lib/openc3/accessors/html_accessor.rb

@@ -1,6 +1,6 @@
 # encoding: ascii-8bit
 
-# Copyright 2022 OpenC3, Inc.
+# Copyright 2024 OpenC3, Inc.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it
@@ -13,7 +13,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
 #
-# 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.
 
 require 'openc3/accessors/xml_accessor'
@@ -28,4 +28,4 @@ module OpenC3
       doc.to_html
     end
   end
-end
+end