openc3 5.6.1 → 5.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec8c77fa13a1d046d9a6a75b0ab2854a5c130a9ea967dc7b9164ae3840ca4a1
-  data.tar.gz: 9071d947cf90051add2c714a74c40ab54b359b4a16861029e93e290cd68b05bd
+  metadata.gz: b2926debd9479ec12631eab7287a0a4ff480c8c4957f7702de4c148f5e87a376
+  data.tar.gz: 687f5c815c7016f34feb4f484cbcf582c8e5d3ef621098beb0d3aacf612c49c0
 SHA512:
-  metadata.gz: 399787f9f75cf2d66d340662e9dbfb57feb700ea6661f0e93668a88e0b327dead2f1ca76a910da7d604ffce64ec627e8a177997d4c6c5292c281c8e410510516
-  data.tar.gz: bae872d3fef6e8e2014d116b461b4685e56222e9d2ac31c5c1ee2720733affa3ae5cb0b482dfc5c30488d34809063e97a352b69c8afb1bb2cb5c8e5eabe4abb6
+  metadata.gz: 4a33e7fe434b726dc9231bcf066d112114ca3e8109496ee4c2742b8925d4c3297f22a7e3d43ec5592ba298969eafd9e37713754efc1556f257ae9b584e7ef38c
+  data.tar.gz: b552b42d338e23625ed78f7fb429deb59a456bd5ab7c783930fe050d8c5ec360c39e2630f39f005c9b370c5f3a49f8d943a04951990edb8e261c5d5e1ab0bd71

data/Gemfile

@@ -11,3 +11,7 @@ gem 'rails', '~> 7.0.0'
 gem 'bootsnap', '>= 1.9.3', require: false
 gem 'rack-cors', '~> 1.1'
 gem 'tzinfo-data'
+gem 'rspec-rails', '~> 6.0'
+gem 'simplecov', '~> 0.20'
+gem 'simplecov-cobertura', '~> 2.1'
+gem 'mock_redis'

data/bin/openc3cli

@@ -141,18 +141,21 @@ def migrate(args)
 
   # Overwrite plugin.txt with specified targets
   plugin = File.open('plugin.txt', 'w')
-  plugin.puts "TARGET #{target_name}"
-
+  FileUtils.mkdir 'targets'
   args.each do |target|
     puts "Migrating target #{target}"
     FileUtils.cp_r "../config/targets/#{target}", 'targets'
-    plugin.puts "TARGET #{target}"
+    plugin.puts "TARGET #{target} #{target}"
   end
   plugin.puts ""
 
-  puts "Migrating /lib & /procedures to #{target_name}"
-  FileUtils.cp_r '../lib', "targets/#{target_name}"
-  FileUtils.cp_r '../procedures', "targets/#{target_name}"
+  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 |file|
@@ -168,6 +171,36 @@ def migrate(args)
     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.')
+        line = "# FIXME (no Qt): #{line.sub("<%", "< %").sub("%>", "% >")}"
+      elsif line.include?('Cosmos::')
+        line = "# 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

data/data/config/interface_modifiers.yaml

@@ -168,3 +168,74 @@ SECRET:
   example: |
     SECRET ENV USERNAME ENV_USERNAME USERNAME
     SECRET FILE KEY "/tmp/DATA/cert" KEY
+ENV:
+  summary: Sets an environment variable in the microservice.
+  since: 5.7.0
+  parameters:
+    - name: Key
+      required: true
+      description: Environment variable name
+      values: .+
+    - name: Value
+      required: true
+      description: Environment variable value
+      values: .+
+  example: |
+    ENV COMPANY OpenC3
+WORK_DIR:
+  summary: Set the working directory
+  description: Working directory to run the microservice CMD in.  Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
+  since: 5.7.0
+  parameters:
+    - name: Directory
+      required: true
+      description: Working directory to run the microservice CMD in. Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
+      values: .+
+  example: |
+    WORK_DIR '/openc3/lib/openc3/microservices'
+PORT:
+  summary: Open port for the microservice
+  description: Kubernetes needs a Service to be applied to open a port so this is required for Kubernetes support
+  since: 5.7.0
+  parameters:
+    - name: Number
+      required: true
+      description: Port number
+      values: \d+
+    - name: Protocol
+      required: false
+      description: Port protocol. Default is TCP.
+      values: .+
+  example: |
+    PORT 7272
+CMD:
+  summary: Command line to execute to run the microservice.
+  description: Command line to execute to run the microservice.
+  since: 5.7.0
+  parameters:
+    - name: Args
+      required: true
+      description: One or more arguments to exec to run the microservice.
+      values: .+
+  example: |
+    CMD ruby interface_microservice.rb DEFAULT__INTERFACE__INT1
+CONTAINER:
+  summary: Docker Container
+  description: Container to execute and run the microservice in. Only used in COSMOS Enterprise Edition.
+  since: 5.7.0
+  parameters:
+    - name: Args
+      required: false
+      description: Name of the container
+      values: .+
+ROUTE_PREFIX:
+  summary: Prefix of route
+  description: Prefix of route to the microservice to expose externally with Traefik
+  since: 5.7.0
+  parameters:
+    - name: Route Prefix
+      required: true
+      description: Route prefix. Must be unique across all scopes. Something like /myprefix
+      values: .*
+  example: |
+    ROUTE_PREFIX /interface

data/data/config/protocols.yaml

@@ -288,3 +288,49 @@ TEMPLATE:
         or response timeouts. 'DISCONNECT' to disconnect after errors. The default
         is 'LOG' to log an error and continue.
       values: ["LOG", "DISCONNECT"]
+SLIP:
+  description:
+    The SLIP Protocol implements RFC 1055. This is a terminated protocol which terminates
+    with a 0xC0 character, and escapes internally conflicting bytes.
+  parameters:
+    - name: Start Character
+      required: false
+      description:
+        Character to place at the beginning of a packet.  Defaults to nil. Some variants of the
+        SLIP Protocol also place a 0xC0 byte at the beginning of packets.
+      values: \d+
+    - name: Read Strip Characters
+      required: false
+      description:
+        Whether or not to strip the start and end characters out of the packet when reading. Defaults
+        to true.
+      values: ["true", "false"]
+    - name: Read Enable Escaping
+      required: false
+      description: Whether or not to escape conflicting characters in the packet om reads. Defaults to true.
+      values: ["true", "false"]
+    - name: Write Enable Escaping
+      required: false
+      description: Whether or not to escape conflicting characters in the packet on writes. Defaults to true.
+      values: ["true", "false"]
+    - name: End Character
+      required: false
+      description: Character to end packets with. Defaults to 0xC0.
+      values: \d+
+    - name: Escape Character
+      required: false
+      description: Character that indicates an escape sequence. Defaults to 0xDB.
+      values: \d+
+    - name: Escaped End Character
+      required: false
+      description: Escaped version of the end character. Defaults to 0xDC.
+      values: \d+
+    - name: Escaped Escape Character
+      required: false
+      description: Escaped version of the escape character. Defaults to 0xDD.
+      values: \d+
+COBS:
+  description:
+    The COBS Protocol implements the Consistent Overhead Byte Stuffing Protocol. This is a terminated protocol which terminates
+    with a 0x00 character, and escapes internal 0's using a unique algorithm that only adds one byte of overhead for every
+    254 bytes.

data/lib/openc3/interfaces/interface.rb

@@ -492,6 +492,7 @@ module OpenC3
       end
       @protocol_info << [protocol_class, protocol_args, read_write]
       protocol.interface = self
+      return protocol
     end
 
     def interface_cmd(cmd_name, *cmd_args)

data/lib/openc3/interfaces/protocols/cobs_protocol.rb

@@ -0,0 +1,120 @@
+# encoding: ascii-8bit
+
+# Copyright 2023 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# 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
+# if purchased from OpenC3, Inc.
+
+require 'openc3/interfaces/protocols/terminated_protocol'
+require 'openc3/config/config_parser'
+
+# This file implements the COBS protocol as here:
+# https://en.wikipedia.org/wiki/Consistent_Overhead_Byte_Stuffing
+# http://www.stuartcheshire.org/papers/COBSforToN.pdf
+
+# COBS is a framing protocol and is therefore expected to be used for packet deliniation
+
+module OpenC3
+
+  # Usage in plugin.txt:
+  #
+  # INTERFACE ...
+  #   PROTOCOL READ_WRITE CobsProtocol
+
+  class CobsProtocol < TerminatedProtocol
+
+    # @param allow_empty_data [true/false/nil] See Protocol#initialize
+    def initialize(allow_empty_data = nil)
+
+      strip_read_termination = true
+      discard_leading_bytes = 0
+      sync_pattern = nil
+      fill_fields = false # Handled in write_data below
+
+      super(
+        "", # Write termination handled in write_data below
+        "00",
+        strip_read_termination,
+        discard_leading_bytes,
+        sync_pattern,
+        fill_fields,
+        allow_empty_data
+      )
+    end
+
+    def read_data(data)
+      data = super(data)
+      return data if data.length <= 0 or Symbol === data
+
+      result_data = ''
+      while data.length > 1
+        # Read the offset to the next zero byte
+        # Note: This may be off the end of the data. If so, the packet is over
+        zero_offset = data[0].unpack('C')[0]
+        if zero_offset == 0xFF # No zeros in this segment
+          result_data << data[1..254]
+          data = data[255..-1]
+        elsif zero_offset <= 1 # End of data or 1 zero
+          result_data << "\x00"
+          data = data[1..-1]
+        else # Mid range zero or end of packet
+          result_data << data[1..(zero_offset - 1)]
+          data = data[zero_offset..-1]
+          result_data << "\x00" if data.length >= 1
+        end
+      end
+
+      return result_data
+    end
+
+    def write_data(data)
+      # Intentionally not calling super()
+
+      need_insert = false
+      result_data = ''
+      while data.length > 0
+        index = data.index("\x00")
+        if (index and index > 253) or (index.nil? and data.length >= 254)
+          result_data << "\xFF"
+          result_data << data[0..253]
+          data = data[254..-1]
+          need_insert = false
+        else # index <= 254 or (index.nil? and data.length < 254)
+          if index
+            result_data << [index + 1].pack('C')
+            if index >= 1
+              result_data << data[0..(index - 1)]
+            end
+            data = data[(index + 1)..-1]
+            need_insert = true
+          else
+            result_data << [data.length + 1].pack('C')
+            result_data << data
+            data = ''
+            need_insert = false
+          end
+        end
+      end
+
+      # Handle a zero at the end of the packet
+      result_data << "\x01" if need_insert
+
+      # Terminate message with 0x00
+      result_data << "\x00"
+
+      return result_data
+    end
+  end
+
+end

data/lib/openc3/interfaces/protocols/slip_protocol.rb

@@ -0,0 +1,150 @@
+# encoding: ascii-8bit
+
+# Copyright 2023 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# 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
+# if purchased from OpenC3, Inc.
+
+require 'openc3/interfaces/protocols/terminated_protocol'
+require 'openc3/config/config_parser'
+
+# This file implements the SLIP protocol as documented in RFC 1055
+# https://datatracker.ietf.org/doc/html/rfc1055
+
+# SLIP is a framing protocol and is therefore expected to be used for packet deliniation
+
+module OpenC3
+
+  # Usage in plugin.txt:
+  #
+  # INTERFACE ...
+  #   PROTOCOL READ_WRITE SlipProtocol
+
+  class SlipProtocol < TerminatedProtocol
+
+    # Note: Characters are expected to be given as integers
+    # @param start_char   [Integer/nil] Character to place at the start of frames (Defaults to nil)
+    # @param read_strip_characters [true/false] Strip off start_char and end_char from reads
+    # @param read_enable_escaping [true/false] Whether to enable or disable character escaping on reads
+    # @param write_enable_escaping [true/false] Whether to enable or disable character escaping on writes
+    # @param end_char     [Integer] Character to place at the end of frames (Defaults to 0xC0)
+    # @param esc_char     [Integer] Escape character (Defaults to 0xDB)
+    # @param esc_end_char [Integer] Character to Escape End character (Defaults to 0xDC)
+    # @param esc_esc_char [Integer] Character to Escape Escape character (Defaults to 0xDD)
+    # @param allow_empty_data [true/false/nil] See Protocol#initialize
+    def initialize(
+      start_char = nil,
+      read_strip_characters = true,
+      read_enable_escaping = true,
+      write_enable_escaping = true,
+      end_char = 0xC0,
+      esc_char = 0xDB,
+      esc_end_char = 0xDC,
+      esc_esc_char = 0xDD,
+      allow_empty_data = nil)
+
+      @start_char = ConfigParser.handle_nil(start_char)
+      @start_char = [Integer(end_char)].pack('C') if @start_char
+      @end_char = [Integer(end_char)].pack('C')
+      @esc_char = [Integer(esc_char)].pack('C')
+      @esc_end_char = [Integer(esc_end_char)].pack('C')
+      @esc_esc_char = [Integer(esc_esc_char)].pack('C')
+      @replace_end = @esc_char + @esc_end_char
+      @replace_esc = @esc_char + @esc_esc_char
+      @read_strip_characters = ConfigParser.handle_true_false(read_strip_characters)
+      raise "read_strip_characters must be true or false" if @read_strip_characters != true and @read_strip_characters != false
+      @read_enable_escaping = ConfigParser.handle_true_false(read_enable_escaping)
+      raise "read_enable_escaping must be true or false" if @read_enable_escaping != true and @read_enable_escaping != false
+      @write_enable_escaping = ConfigParser.handle_true_false(write_enable_escaping)
+      raise "write_enable_escaping must be true or false" if @write_enable_escaping != true and @write_enable_escaping != false
+
+      strip_read_termination = false
+      discard_leading_bytes = 0
+      if @start_char
+        sync_pattern = sprintf("%0X", Integer(start_char))
+      else
+        sync_pattern = nil
+      end
+      fill_fields = false # Handled in write_data below
+
+      super(
+        "", # Write termination handled in write_data below
+        sprintf("%0X", Integer(end_char)), # Expects Hex Character String
+        strip_read_termination,
+        discard_leading_bytes,
+        sync_pattern,
+        fill_fields,
+        allow_empty_data
+      )
+    end
+
+    def read_data(data)
+      data = super(data)
+      return data if data.length <= 0 or Symbol === data
+
+      if @read_strip_characters
+        if @start_char
+          data = data[1..-1]
+        end
+        data = data[0..-2]
+      end
+
+      if @read_enable_escaping
+        data = data.gsub(@replace_end, @end_char).gsub(@replace_esc, @esc_char)
+      end
+
+      return data
+    end
+
+    def write_data(data)
+      # Intentionally not calling super()
+
+      if @write_enable_escaping
+        data = data.gsub(@esc_char, @replace_esc).gsub(@end_char, @replace_end)
+      end
+
+      if @start_char
+        data = @start_char + data
+      end
+
+      data << @end_char
+
+      return data
+    end
+
+    def reduce_to_single_packet
+      return :STOP if @data.length <= 0
+      if @start_char
+        index = @data[1..-1].index(@read_termination_characters)
+        index = index + 1 if index
+      else
+        index = @data.index(@read_termination_characters)
+      end
+
+      # Reduce to packet data and setup current_data for next packet
+      if index
+        if index > 0
+          packet_data = @data[0..(index + @read_termination_characters.length - 1)]
+        else # @data begins with the termination characters
+          packet_data = @data[0..(@read_termination_characters.length - 1)]
+        end
+        @data.replace(@data[(index + @read_termination_characters.length)..-1])
+        return packet_data
+      else
+        return :STOP
+      end
+    end
+  end
+
+end

data/lib/openc3/interfaces/protocols/terminated_protocol.rb

@@ -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.
 
 require 'openc3/config/config_parser'
@@ -52,6 +52,7 @@ module OpenC3
       @write_termination_characters = write_termination_characters.hex_to_byte_string
       @read_termination_characters = read_termination_characters.hex_to_byte_string
       @strip_read_termination = ConfigParser.handle_true_false(strip_read_termination)
+      raise "strip_read_termination must be true or false" if @strip_read_termination != true and @strip_read_termination != false
 
       super(discard_leading_bytes, sync_pattern, fill_fields, allow_empty_data)
     end

data/lib/openc3/io/json_api.rb

@@ -65,7 +65,7 @@ module OpenC3
 
     def _request(*method_params, **kw_params)
       kw_params[:scope] = $openc3_scope unless kw_params[:scope]
-      kw_params[:json] => true unless kw_params[:json]
+      kw_params[:json] = true unless kw_params[:json]
       @json_api.request(*method_params, **kw_params)
     end
   end

data/lib/openc3/microservices/interface_decom_common.rb

@@ -33,7 +33,6 @@ module OpenC3
           packet.write(name.to_s, value, type)
         end
       end
-      topic = "#{@scope}__TELEMETRY__{#{target_name}}__#{packet_name}"
       packet.received_count += 1
       packet.received_time = Time.now.sys
       TelemetryTopic.write_packet(packet, scope: @scope)

data/lib/openc3/models/interface_model.rb

@@ -44,6 +44,12 @@ module OpenC3
     attr_accessor :log_stream
     attr_accessor :needs_dependencies
     attr_accessor :secrets
+    attr_accessor :cmd
+    attr_accessor :container
+    attr_accessor :env
+    attr_accessor :work_dir
+    attr_accessor :ports
+    attr_accessor :prefix
 
     # NOTE: The following three class methods are used by the ModelController
     # and are reimplemented to enable various Model class methods to work
@@ -109,6 +115,12 @@ module OpenC3
       plugin: nil,
       needs_dependencies: false,
       secrets: [],
+      cmd: nil,
+      work_dir: '/openc3/lib/openc3/microservices',
+      ports: [],
+      env: {},
+      container: nil,
+      prefix: nil,
       scope:
     )
       if self.class._get_type == 'INTERFACE'
@@ -129,6 +141,17 @@ module OpenC3
       @protocols = protocols
       @log_stream = log_stream
       @needs_dependencies = needs_dependencies
+      @cmd = cmd
+      unless @cmd
+        type = self.class._get_type
+        microservice_name = "#{@scope}__#{type}__#{@name}"
+        @cmd = ["ruby", "#{type.downcase}_microservice.rb", microservice_name]
+      end
+      @work_dir = work_dir
+      @ports = ports
+      @env = env
+      @container = container
+      @prefix = prefix
       @secrets = secrets
     end
 
@@ -187,6 +210,12 @@ module OpenC3
         'plugin' => @plugin,
         'needs_dependencies' => @needs_dependencies,
         'secrets' => @secrets.as_json(*a),
+        'cmd' => @cmd,
+        'work_dir' => @work_dir,
+        'ports' => @ports,
+        'env' => @env,
+        'container' => @container,
+        'prefix' => @prefix,
         'updated_at' => @updated_at
       }
     end
@@ -266,6 +295,46 @@ module OpenC3
           @secrets[-1] << parameters[4]
         end
 
+      when 'ENV'
+        parser.verify_num_parameters(2, 2, "#{keyword} <Key> <Value>")
+        @env[parameters[0]] = parameters[1]
+
+      when 'PORT'
+        usage = "PORT <Number> <Protocol (Optional)"
+        parser.verify_num_parameters(1, 2, usage)
+        begin
+          @ports << [Integer(parameters[0])]
+        rescue # In case Integer fails
+          raise ConfigParser::Error.new(parser, "Port must be an integer: #{parameters[0]}", usage)
+        end
+        protocol = ConfigParser.handle_nil(parameters[1])
+        if protocol
+          # Per https://kubernetes.io/docs/concepts/services-networking/service/#protocol-support
+          if %w(TCP UDP SCTP).include?(protocol.upcase)
+            @ports[-1] << protocol.upcase
+          else
+            raise ConfigParser::Error.new(parser, "Unknown port protocol: #{parameters[1]}", usage)
+          end
+        else
+          @ports[-1] << 'TCP'
+        end
+
+      when 'WORK_DIR'
+        parser.verify_num_parameters(1, 1, "#{keyword} <Dir>")
+        @work_dir = parameters[0]
+
+      when 'CMD'
+        parser.verify_num_parameters(1, nil, "#{keyword} <Args>")
+        @cmd = parameters.dup
+
+      when 'CONTAINER'
+        parser.verify_num_parameters(1, 1, "#{keyword} <Container Image Name>")
+        @container = parameters[0]
+
+      when 'ROUTE_PREFIX'
+        parser.verify_num_parameters(1, 1, "#{keyword} <Route Prefix>")
+        @prefix = parameters[0]
+
       else
         raise ConfigParser::Error.new(parser, "Unknown keyword and parameters for Interface/Router: #{keyword} #{parameters.join(" ")}")
 
@@ -280,12 +349,16 @@ module OpenC3
       microservice_name = "#{@scope}__#{type}__#{@name}"
       microservice = MicroserviceModel.new(
         name: microservice_name,
-        work_dir: '/openc3/lib/openc3/microservices',
-        cmd: ["ruby", "#{type.downcase}_microservice.rb", microservice_name],
+        work_dir: @work_dir,
+        cmd: @cmd,
+        env: @env,
+        ports: @ports,
+        container: @container,
         target_names: @target_names,
         plugin: @plugin,
         needs_dependencies: @needs_dependencies,
         secrets: @secrets,
+        prefix: @prefix,
         scope: @scope
       )
       unless validate_only

data/lib/openc3/models/microservice_model.rb

@@ -168,7 +168,7 @@ module OpenC3
         protocol = ConfigParser.handle_nil(parameters[1])
         if protocol
           # Per https://kubernetes.io/docs/concepts/services-networking/service/#protocol-support
-          if %w(TCP UDP SCTP HTTP SCTP).include?(protocol.upcase)
+          if %w(TCP UDP SCTP).include?(protocol.upcase)
             @ports[-1] << protocol.upcase
           else
             raise ConfigParser::Error.new(parser, "Unknown port protocol: #{parameters[1]}", usage)

data/lib/openc3/models/reaction_model.rb

@@ -108,9 +108,6 @@ module OpenC3
       unless snooze.is_a?(Integer)
         raise ReactionInputError.new "invalid snooze value: #{snooze}"
       end
-      if snooze < 30
-        raise ReactionInputError.new "invalid snooze: '#{snooze}' must be greater than 30"
-      end
       return snooze
     end
 

data/lib/openc3/models/target_model.rb

@@ -227,7 +227,7 @@ module OpenC3
       raise "Unknown type #{type} for #{target_name} #{packet_name}" unless VALID_TYPES.include?(type)
 
       begin
-        Store.hset("#{scope}__openc3tlm__#{target_name}", packet_name, JSON.generate(packet.as_json(:allow_nan => true)))
+        Store.hset("#{scope}__openc3#{type.to_s.downcase}__#{target_name}", packet_name, JSON.generate(packet.as_json(:allow_nan => true)))
       rescue JSON::GeneratorError => err
         Logger.error("Invalid text present in #{target_name} #{packet_name} #{type.to_s.downcase} packet")
         raise err