openc3 6.9.2 → 6.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d4fd7006c78d3a21531579d68d42bc5cba596c92091e8cd7895c4b42ecff569
-  data.tar.gz: 85fdaa738dafbfafcc16fb463abb5d86517f9f1edefb4bbef9a5e7171738211c
+  metadata.gz: 1432f7bc925107320f327e82f47ebe6d6da648d00fc6c6469f4f093e69a8dc96
+  data.tar.gz: 5aea790bee69e50decbbf418b295eda17a653305f78661c334531afa94f9d265
 SHA512:
-  metadata.gz: 419ddee4f6203f3500c9d3eb45347824dfa57a074527086fd8bfdaee16c4dc10ec07b3b78122e1a753a064913bbb1193f29344e260ba7a04b029cdb11682a9e7
-  data.tar.gz: 961d67c9c972a2cdf60c31c9279b69a7e1fc315e62813935eb66fefbbd853cf931c633c36aa6b9606cb1eedfd66ef8ba2db07b34f24acf99967aa6983755deb3
+  metadata.gz: dbb54c3b45300cc626c4497ef71c7069567dad94d6f6c73fb1a7dd7093219531d31ffee8bd175ac08b9fee682ab93a488c796d3bf408365a64027740ed9913a3
+  data.tar.gz: a703fe408f123953eccf8e9e2b6fb63306404501456a5463410babb95512c68387440279e0d91e61b674ea3bf72122d3480d0001d994cf943d6b901f1a10cc08

data/data/config/command_modifiers.yaml

@@ -96,6 +96,68 @@ APPEND_ARRAY_PARAMETER:
       values: .*
     <%= MetaConfigParser.load('_array_params.yaml').to_meta_config_yaml(4) %>
   example: APPEND_ARRAY_PARAMETER ARRAY 64 FLOAT 640 "Array of 10 64bit floats"
+STRUCTURE:
+  modifiers:
+    <%= MetaConfigParser.load('parameter_modifiers.yaml').to_meta_config_yaml(4) %>
+  summary: Adds and flattens a structure (generally a virtual packet) into the current packet. The specific named item is BLOCK type and hidden.
+  parameters:
+    - name: Name
+      required: true
+      description: Name of the parameter. Must be unique within the command.
+      values: .*
+    - name: Bit Offset
+      required: true
+      description: Bit offset into the command packet of the Most Significant Bit of this parameter.
+        May be negative to indicate an offset from the end of the packet.
+        Always use a bit offset of 0 for derived parameters.
+      values: '[-]?\d+'
+    - name: Bit Size
+      required: true
+      description: Bit size of this parameter. Zero or Negative values may be used
+        to indicate that a string fills the packet up to the offset from the end of
+        the packet specified by this value. If Bit Offset is 0 and Bit Size is 0 then
+        this is a derived parameter and the Data Type must be set to 'DERIVED'.
+      values: \d+
+    - name: Command or telemetry
+      required: true
+      description: Whether the structure packet is a command or telemetry packet
+      values: <%= %w(CMD COMMAND TLM TELEMETRY) %>
+    - name: Target Name
+      required: true
+      description: Target Name of the structure packet
+      values: .+
+    - name: Packet Name
+      required: true
+      description: Packet Name of the structure packet
+      values: .+
+APPEND_STRUCTURE:
+  modifiers:
+    <%= MetaConfigParser.load('parameter_modifiers.yaml').to_meta_config_yaml(4) %>
+  summary: Adds and flattens a structure (generally a virtual packet) into the current packet. The specific named item is BLOCK type and hidden.
+  parameters:
+    - name: Name
+      required: true
+      description: Name of the parameter. Must be unique within the command.
+      values: .*
+    - name: Bit Size
+      required: true
+      description: Bit size of this parameter. Zero or Negative values may be used
+        to indicate that a string fills the packet up to the offset from the end of
+        the packet specified by this value. If Bit Offset is 0 and Bit Size is 0 then
+        this is a derived parameter and the Data Type must be set to 'DERIVED'.
+      values: \d+
+    - name: Command or telemetry
+      required: true
+      description: Whether the structure packet is a command or telemetry packet
+      values: <%= %w(CMD COMMAND TLM TELEMETRY) %>
+    - name: Target Name
+      required: true
+      description: Target Name of the structure packet
+      values: .+
+    - name: Packet Name
+      required: true
+      description: Packet Name of the structure packet
+      values: .+
 SELECT_PARAMETER:
   modifiers:
     <%= MetaConfigParser.load('parameter_modifiers.yaml').to_meta_config_yaml(4) %>
@@ -176,6 +238,19 @@ ACCESSOR:
       description: Additional argument passed to the accessor class constructor
       values: .+
   since: 5.0.10
+SUBPACKETIZER:
+  summary: Defines a class used to break up the packet into subpackets before decom
+  description: Defines a class used to break up the packet into subpackets before decom. Defaults to nil/None.
+  parameters:
+    - name: Subpacketizer Class Name
+      required: true
+      description: The name of the Subpacketizer class
+      values: .+
+    - name: Argument
+      required: false
+      description: Additional argument passed to the Subpacketizer class constructor
+      values: .+
+  since: 6.10.0
 TEMPLATE:
   summary: Defines a template string used to initialize the command before default values are filled in
   description: Generally the template string is formatted in JSON or HTML and then values are filled in with
@@ -256,6 +331,10 @@ 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
+SUBPACKET:
+  summary: Marks this packet as as a subpacket which will exclude it from Interface level identification
+  description: Used with a SUBPACKETIZER to breakup up packets into subpackets at decom time
+  since: 6.10.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.

data/data/config/item_modifiers.yaml

@@ -176,3 +176,8 @@ LIMITS_RESPONSE:
       description: Variable length number of options that will be passed to the
         class constructor
       values: .+
+HIDDEN:
+  summary: Hides this item from all the OpenC3 tools
+  description: This item will not appear in PacketViewer or Item Choosers.
+    It also hides this item from appearing in the Script Runner popup helper
+    when writing scripts. The item will also not be included in decom data.

data/data/config/parameter_modifiers.yaml

@@ -167,3 +167,8 @@ OVERFLOW:
       description: How OpenC3 treats an overflow value. Only applies to signed and
         unsigned integer data types.
       values: <%= %w(ERROR ERROR_ALLOW_HEX TRUNCATE SATURATE) %>
+HIDDEN:
+  summary: Hides this parameter from all the OpenC3 tools
+  description: This item will not appear in CmdSender.
+    It also hides this item from appearing in the Script Runner popup helper
+    when writing scripts. The parameter should not be provided to commands.

data/data/config/telemetry_modifiers.yaml

@@ -86,6 +86,68 @@ APPEND_ARRAY_ITEM:
       description: Name of the telemety item. Must be unique within the packet.
       values: \'
     <%= MetaConfigParser.load('_array_params.yaml').to_meta_config_yaml(4) %>
+STRUCTURE:
+  modifiers:
+    <%= MetaConfigParser.load('item_modifiers.yaml').to_meta_config_yaml(4) %>
+  summary: Adds and flattens a structure (generally a virtual packet) into the current packet. The specific named item is BLOCK type and hidden.
+  parameters:
+    - name: Name
+      required: true
+      description: Name of the parameter. Must be unique within the command.
+      values: .*
+    - name: Bit Offset
+      required: true
+      description: Bit offset into the command packet of the Most Significant Bit of this parameter.
+        May be negative to indicate an offset from the end of the packet.
+        Always use a bit offset of 0 for derived parameters.
+      values: '[-]?\d+'
+    - name: Bit Size
+      required: true
+      description: Bit size of this parameter. Zero or Negative values may be used
+        to indicate that a string fills the packet up to the offset from the end of
+        the packet specified by this value. If Bit Offset is 0 and Bit Size is 0 then
+        this is a derived parameter and the Data Type must be set to 'DERIVED'.
+      values: \d+
+    - name: Command or telemetry
+      required: true
+      description: Whether the structure packet is a command or telemetry packet
+      values: <%= %w(CMD COMMAND TLM TELEMETRY) %>
+    - name: Target Name
+      required: true
+      description: Target Name of the structure packet
+      values: .+
+    - name: Packet Name
+      required: true
+      description: Packet Name of the structure packet
+      values: .+
+APPEND_STRUCTURE:
+  modifiers:
+    <%= MetaConfigParser.load('item_modifiers.yaml').to_meta_config_yaml(4) %>
+  summary: Adds and flattens a structure (generally a virtual packet) into the current packet. The specific named item is BLOCK type and hidden.
+  parameters:
+    - name: Name
+      required: true
+      description: Name of the parameter. Must be unique within the command.
+      values: .*
+    - name: Bit Size
+      required: true
+      description: Bit size of this parameter. Zero or Negative values may be used
+        to indicate that a string fills the packet up to the offset from the end of
+        the packet specified by this value. If Bit Offset is 0 and Bit Size is 0 then
+        this is a derived parameter and the Data Type must be set to 'DERIVED'.
+      values: \d+
+    - name: Command or telemetry
+      required: true
+      description: Whether the structure packet is a command or telemetry packet
+      values: <%= %w(CMD COMMAND TLM TELEMETRY) %>
+    - name: Target Name
+      required: true
+      description: Target Name of the structure packet
+      values: .+
+    - name: Packet Name
+      required: true
+      description: Packet Name of the structure packet
+      values: .+
 SELECT_ITEM:
   modifiers:
     <%= MetaConfigParser.load('item_modifiers.yaml').to_meta_config_yaml(4) %>
@@ -173,6 +235,19 @@ ACCESSOR:
       description: The name of the accessor class
       values: .+
   since: 5.0.10
+SUBPACKETIZER:
+  summary: Defines a class used to break up the packet into subpackets before decom
+  description: Defines a class used to break up the packet into subpackets before decom. Defaults to nil/None.
+  parameters:
+    - name: Subpacketizer Class Name
+      required: true
+      description: The name of the Subpacketizer class
+      values: .+
+    - name: Argument
+      required: false
+      description: Additional argument passed to the Subpacketizer class constructor
+      values: .+
+  since: 6.10.0
 TEMPLATE:
   summary: Defines a template string used to pull telemetry values from a string buffer
   parameters:
@@ -198,3 +273,7 @@ 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
+SUBPACKET:
+  summary: Marks this packet as as a subpacket which will exclude it from Interface level identification
+  description: Used with a SUBPACKETIZER to breakup up packets into subpackets at decom time
+  since: 6.10.0

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

@@ -64,6 +64,9 @@ 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;
+static ID id_ivar_subpacket = 0;
+static ID id_ivar_subpacketizer = 0;
+static ID id_ivar_obfuscated_items = 0;
 
 /* Sets the target name this packet is associated with. Unidentified packets
  * will have target name set to nil.
@@ -291,6 +294,9 @@ static VALUE packet_initialize(int argc, VALUE *argv, VALUE self)
   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);
+  rb_ivar_set(self, id_ivar_subpacket, Qfalse);
+  rb_ivar_set(self, id_ivar_subpacketizer, Qnil);
+  rb_ivar_set(self, id_ivar_obfuscated_items, Qnil);
   return self;
 }
 
@@ -335,6 +341,9 @@ void Init_packet(void)
   id_ivar_ignore_overlap = rb_intern("@ignore_overlap");
   id_ivar_virtual = rb_intern("@virtual");
   id_ivar_restricted = rb_intern("@restricted");
+  id_ivar_subpacket = rb_intern("@subpacket");
+  id_ivar_subpacketizer = rb_intern("@subpacketizer");
+  id_ivar_obfuscated_items = rb_intern("@obfuscated_items");
 
   cPacket = rb_define_class_under(mOpenC3, "Packet", cStructure);
   rb_define_method(cPacket, "initialize", packet_initialize, -1);

data/lib/openc3/accessors/accessor.rb

@@ -17,6 +17,7 @@
 # if purchased from OpenC3, Inc.
 
 require 'json'
+require 'openc3/config/config_parser'
 
 module OpenC3
   class Accessor
@@ -28,11 +29,26 @@ module OpenC3
     end
 
     def read_item(item, buffer)
-      self.class.read_item(item, buffer)
+      if item.parent_item
+        # Structure is used to read items with parent, not accessor
+        structure_buffer = read_item(item.parent_item, buffer)
+        structure = item.parent_item.structure
+        structure.read(item.key, :RAW, structure_buffer)
+      else
+        self.class.read_item(item, buffer)
+      end
     end
 
     def write_item(item, value, buffer)
-      self.class.write_item(item, value, buffer)
+      if item.parent_item
+        # Structure is used to write items with parent, not accessor
+        structure_buffer = read_item(item.parent_item, buffer)
+        structure = item.parent_item.structure
+        structure.write(item.key, value, :RAW, structure_buffer)
+        self.class.write_item(item.parent_item, structure_buffer, buffer)
+      else
+        self.class.write_item(item, value, buffer)
+      end
     end
 
     def read_items(items, buffer)
@@ -106,8 +122,16 @@ module OpenC3
     def self.convert_to_type(value, item)
       return value if value.nil?
       case item.data_type
+      when :ANY
+        begin
+          value = JSON.parse(value) if value.is_a? String
+        rescue Exception
+          # Just leave value as is
+        end
+      when :BOOL
+        value = ConfigParser.handle_true_false(value) if value.is_a? String
       when :OBJECT, :ARRAY
-        # Do nothing for complex object types
+        value = JSON.parse(value) if value.is_a? String
       when :STRING, :BLOCK
         if item.array_size
           value = JSON.parse(value) if value.is_a? String

data/lib/openc3/accessors/binary_accessor.rb

@@ -137,8 +137,16 @@ module OpenC3
 
     def read_item(item, buffer)
       return nil if item.data_type == :DERIVED
-      handle_read_variable_bit_size(item, buffer) if item.variable_bit_size
-      self.class.read_item(item, buffer)
+      if item.parent_item
+        handle_read_variable_bit_size(item.parent_item, buffer) if item.parent_item.variable_bit_size
+        # Structure is used to read items with parent, not accessor
+        structure_buffer = read_item(item.parent_item, buffer)
+        structure = item.parent_item.structure
+        structure.read(item.key, :RAW, structure_buffer)
+      else
+        handle_read_variable_bit_size(item, buffer) if item.variable_bit_size
+        self.class.read_item(item, buffer)
+      end
     end
 
     def handle_write_variable_bit_size(item, value, buffer)
@@ -270,8 +278,17 @@ module OpenC3
 
     def write_item(item, value, buffer)
       return nil if item.data_type == :DERIVED
-      handle_write_variable_bit_size(item, value, buffer) if item.variable_bit_size
-      self.class.write_item(item, value, buffer)
+      if item.parent_item
+        # Structure is used to write items with parent, not accessor
+        structure_buffer = read_item(item.parent_item, buffer)
+        structure = item.parent_item.structure
+        structure.write(item.key, value, :RAW, structure_buffer)
+        handle_write_variable_bit_size(item.parent_item, structure_buffer, buffer) if item.parent_item.variable_bit_size
+        self.class.write_item(item.parent_item, structure_buffer, buffer)
+      else
+        handle_write_variable_bit_size(item, value, buffer) if item.variable_bit_size
+        self.class.write_item(item, value, buffer)
+      end
     end
 
     # Note: do not use directly - use instance read_item

data/lib/openc3/accessors/template_accessor.rb

@@ -25,6 +25,7 @@ module OpenC3
       @left_char = left_char
       @right_char = right_char
       @configured = false
+      @args = [left_char, right_char]
     end
 
     def configure
@@ -65,7 +66,7 @@ module OpenC3
         values.each_with_index do |value, i|
           item_key = @item_keys[i]
           if item_key == item.key
-            return Accessor.convert_to_type(value, item)
+            return self.class.convert_to_type(value, item)
           end
         end
       end
@@ -89,7 +90,7 @@ module OpenC3
           end
           index = @item_keys.index(item.key)
           if index
-            result[item.name] = Accessor.convert_to_type(values[index], item)
+            result[item.name] = self.class.convert_to_type(values[index], item)
           else
             raise "Unknown item with key #{item.key} requested"
           end

data/lib/openc3/api/cmd_api.rb

@@ -545,9 +545,13 @@ module OpenC3
         queue = ENV['OPENC3_DEFAULT_QUEUE']
       end
       if queue
-        # Pull the command out of the script string, e.g. cmd("INST ABORT")
-        queued = cmd_string.split('("')[1].split('")')[0]
-        QueueModel.queue_command(queue, command: queued, username: username, scope: scope)
+        # Pass the command components separately for the queue microservice to use the 3-parameter cmd() method
+        QueueModel.queue_command(queue,
+          target_name: target_name,
+          cmd_name: cmd_name,
+          cmd_params: cmd_params,
+          username: username,
+          scope: scope)
       else
         CommandTopic.send_command(command, timeout: timeout, scope: scope)
       end

data/lib/openc3/api/tlm_api.rb

@@ -221,15 +221,21 @@ module OpenC3
     # @param target_name [String] Name of the target
     # @param packet_name [String] Name of the packet
     # @return [Hash] telemetry hash with last telemetry buffer
-    def get_tlm_buffer(*args, manual: false, scope: $openc3_scope, token: $openc3_token)
+    def get_tlm_buffer(*args, manual: false, scope: $openc3_scope, token: $openc3_token, timeout: 5)
       target_name, packet_name = _extract_target_packet_names('get_tlm_buffer', *args)
       authorize(permission: 'tlm', target_name: target_name, packet_name: packet_name, manual: manual, scope: scope, token: token)
-      TargetModel.packet(target_name, packet_name, scope: scope)
-      topic = "#{scope}__TELEMETRY__{#{target_name}}__#{packet_name}"
-      msg_id, msg_hash = Topic.get_newest_message(topic)
-      if msg_id
+      model = TargetModel.packet(target_name, packet_name, scope: scope)
+      if model["subpacket"]
+        msg_hash = DecomInterfaceTopic.get_tlm_buffer(target_name, packet_name, timeout: timeout, scope: scope)
         msg_hash['buffer'] = msg_hash['buffer'].b
         return msg_hash
+      else
+        topic = "#{scope}__TELEMETRY__{#{target_name}}__#{packet_name}"
+        msg_id, msg_hash = Topic.get_newest_message(topic)
+        if msg_id
+          msg_hash['buffer'] = msg_hash['buffer'].b
+          return msg_hash
+        end
       end
       return nil
     end
@@ -249,7 +255,8 @@ module OpenC3
       packet = TargetModel.packet(target_name, packet_name, scope: scope)
       t = _validate_tlm_type(type)
       raise ArgumentError, "Unknown type '#{type}' for #{target_name} #{packet_name}" if t.nil?
-      items = packet['items'].map { | item | item['name'].upcase }
+      items = packet["items"].reject { | item | item["hidden"] }
+      items = items.map { | item | item['name'].upcase }
       cvt_items = items.map { | item | [target_name, packet_name, item, type] }
       current_values = CvtModel.get_tlm_values(cvt_items, stale_time: stale_time, cache_timeout: cache_timeout, scope: scope)
       items.zip(current_values).map { | item , values | [item, values[0], values[1]]}
@@ -437,8 +444,11 @@ module OpenC3
     # @param packet_name [String] Name of the packet
     # @param item_name [String] Name of the packet
     # @return [Hash] Telemetry packet item hash
-    def get_item(*args, manual: false, scope: $openc3_scope, token: $openc3_token)
+    def get_item(*args, manual: false, scope: $openc3_scope, token: $openc3_token, cache_timeout: nil)
       target_name, packet_name, item_name = _extract_target_packet_item_names('get_item', *args)
+      if packet_name == 'LATEST'
+        packet_name = CvtModel.determine_latest_packet_for_item(target_name, item_name, cache_timeout: cache_timeout, scope: scope)
+      end
       authorize(permission: 'tlm', target_name: target_name, packet_name: packet_name, manual: manual, scope: scope, token: token)
       TargetModel.packet_item(target_name, packet_name, item_name, scope: scope)
     end

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

@@ -89,12 +89,10 @@ module OpenC3
         begin
           if @telemetry
             target_packets = System.telemetry.packets(target_name)
-            target = System.targets[target_name]
-            unique_id_mode = target.tlm_unique_id_mode if target
+            unique_id_mode = System.telemetry.tlm_unique_id_mode(target_name)
           else
             target_packets = System.commands.packets(target_name)
-            target = System.targets[target_name]
-            unique_id_mode = target.cmd_unique_id_mode if target
+            unique_id_mode = System.commands.cmd_unique_id_mode(target_name)
           end
         rescue RuntimeError
           # No commands/telemetry for this target
@@ -103,7 +101,7 @@ module OpenC3
 
         if unique_id_mode
           target_packets.each do |_packet_name, packet|
-            if packet.identify?(@data[@discard_leading_bytes..-1])
+            if not packet.subpacket and packet.identify?(@data[@discard_leading_bytes..-1]) # identify? handles virtual
               identified_packet = packet
               break
             end
@@ -111,15 +109,23 @@ module OpenC3
         else
           # Do a hash lookup to quickly identify the packet
           if target_packets.length > 0
-            packet = target_packets.first[1]
-            key = packet.read_id_values(@data[@discard_leading_bytes..-1])
-            if @telemetry
-              hash = System.telemetry.config.tlm_id_value_hash[target_name]
-            else
-              hash = System.commands.config.cmd_id_value_hash[target_name]
+            packet = nil
+            target_packets.each do |_packet_name, target_packet|
+              next if target_packet.virtual
+              next if target_packet.subpacket
+              packet = target_packet
+              break
+            end
+            if packet
+              key = packet.read_id_values(@data[@discard_leading_bytes..-1])
+              if @telemetry
+                hash = System.telemetry.config.tlm_id_value_hash[target_name]
+              else
+                hash = System.commands.config.cmd_id_value_hash[target_name]
+              end
+              identified_packet = hash[key]
+              identified_packet = hash['CATCHALL'.freeze] unless identified_packet
             end
-            identified_packet = hash[key]
-            identified_packet = hash['CATCHALL'.freeze] unless identified_packet
           end
         end
 

data/lib/openc3/io/json_rpc.rb

@@ -59,6 +59,12 @@ class String
   NON_ASCII_PRINTABLE = /[^\x21-\x7e\s]/
   NON_UTF8_PRINTABLE = /[\x00-\x08\x0E-\x1F\x7F]/
   def as_json(_options = nil)
+    # If string is ASCII-8BIT (binary) and has non-ASCII bytes (> 127), encode as binary
+    # This handles data from hex_to_byte_string and other binary sources
+    if self.encoding == Encoding::ASCII_8BIT && self.bytes.any? { |b| b > 127 }
+      return self.to_json_raw_object
+    end
+
     as_utf8 = self.dup.force_encoding('UTF-8')
     if as_utf8.valid_encoding?
       if as_utf8 =~ NON_UTF8_PRINTABLE

data/lib/openc3/microservices/decom_microservice.rb

@@ -24,6 +24,7 @@ require 'time'
 require 'thread'
 require 'openc3/microservices/microservice'
 require 'openc3/microservices/interface_decom_common'
+require 'openc3/microservices/interface_microservice'
 require 'openc3/topics/telemetry_decom_topic'
 require 'openc3/topics/limits_event_topic'
 
@@ -127,6 +128,10 @@ module OpenC3
                   handle_build_cmd(msg_hash['build_cmd'], msg_id)
                   next
                 end
+                if msg_hash.key?('get_tlm_buffer')
+                  handle_get_tlm_buffer(msg_hash['get_tlm_buffer'], msg_id)
+                  next
+                end
               else
                 decom_packet(topic, msg_id, msg_hash, redis)
                 @metric.set(name: 'decom_total', value: @count, type: 'counter')
@@ -154,9 +159,12 @@ module OpenC3
         @metric.set(name: 'decom_topic_delta_seconds', value: delta, type: 'gauge', unit: 'seconds', help: 'Delta time between data written to stream and decom start')
 
         start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+        #######################################
+        # Build packet object from topic data
+        #######################################
         target_name = msg_hash["target_name"]
         packet_name = msg_hash["packet_name"]
-
         packet = System.telemetry.packet(target_name, packet_name)
         packet.stored = ConfigParser.handle_true_false(msg_hash["stored"])
         # Note: Packet time will be recalculated as part of decom so not setting
@@ -168,29 +176,101 @@ module OpenC3
           packet.extra = extra
         end
         packet.buffer = msg_hash["buffer"]
-        # Processors are user code points which must be rescued
-        # so the TelemetryDecomTopic can write the packet
-        begin
-          packet.process # Run processors
-        rescue Exception => e
-          @error_count += 1
-          @metric.set(name: 'decom_error_total', value: @error_count, type: 'counter')
-          @error = e
-          @logger.error e.message
-        end
-        # Process all the limits and call the limits_change_callback (as necessary)
-        # check_limits also can call user code in the limits response
-        # but that is rescued separately in the limits_change_callback
-        packet.check_limits(System.limits_set)
 
-        # This is what actually decommutates the packet and updates the CVT
-        TelemetryDecomTopic.write_packet(packet, scope: @scope)
+        ################################################################################
+        # Break packet into subpackets (if necessary)
+        # Subpackets are typically channelized data
+        ################################################################################
+        packet_and_subpackets = packet.subpacketize
+
+        packet_and_subpackets.each do |packet_or_subpacket|
+          if packet_or_subpacket.subpacket
+            packet_or_subpacket = handle_subpacket(packet, packet_or_subpacket)
+          end
+
+          #####################################################################################
+          # Run Processors
+          # This must be before the full decom so that processor derived values are available
+          #####################################################################################
+          begin
+            packet_or_subpacket.process # Run processors
+          rescue Exception => e
+            @error_count += 1
+            @metric.set(name: 'decom_error_total', value: @error_count, type: 'counter')
+            @error = e
+            @logger.error e.message
+          end
+
+          #############################################################################
+          # Process all the limits and call the limits_change_callback (as necessary)
+          # This must be before the full decom so that limits states are available
+          #############################################################################
+          packet_or_subpacket.check_limits(System.limits_set)
+
+          # This is what actually decommutates the packet and updates the CVT
+          TelemetryDecomTopic.write_packet(packet_or_subpacket, scope: @scope)
+        end
 
         diff = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start # seconds as a float
         @metric.set(name: 'decom_duration_seconds', value: diff, type: 'gauge', unit: 'seconds')
       end
     end
 
+    def handle_subpacket(packet, subpacket)
+      # Subpacket received time always = packet.received_time
+      # Use packet_time appropriately if another timestamp is needed
+      subpacket.received_time = packet.received_time
+      subpacket.stored = packet.stored
+      subpacket.extra = packet.extra
+
+      if subpacket.stored
+        # Stored telemetry does not update the current value table
+        identified_subpacket = System.telemetry.identify_and_define_packet(subpacket, @target_names, subpackets: true)
+      else
+        # Identify and update subpacket
+        if subpacket.identified?
+          begin
+            # Preidentifed subpacket - place it into the current value table
+            identified_subpacket = System.telemetry.update!(subpacket.target_name,
+                                                            subpacket.packet_name,
+                                                            subpacket.buffer)
+          rescue RuntimeError
+            # Subpacket identified but we don't know about it
+            # Clear packet_name and target_name and try to identify
+            @logger.warn "#{@name}: Received unknown identified subpacket: #{subpacket.target_name} #{subpacket.packet_name}"
+            subpacket.target_name = nil
+            subpacket.packet_name = nil
+            identified_subpacket = System.telemetry.identify!(subpacket.buffer,
+                                                              @target_names, subpackets: true)
+          end
+        else
+          # Packet needs to be identified
+          identified_subpacket = System.telemetry.identify!(subpacket.buffer,
+                                                            @target_names, subpackets: true)
+        end
+      end
+
+      if identified_subpacket
+        identified_subpacket.received_time = subpacket.received_time
+        identified_subpacket.stored = subpacket.stored
+        identified_subpacket.extra = subpacket.extra
+        subpacket = identified_subpacket
+      else
+        unknown_subpacket = System.telemetry.update!('UNKNOWN', 'UNKNOWN', subpacket.buffer)
+        unknown_subpacket.received_time = subpacket.received_time
+        unknown_subpacket.stored = subpacket.stored
+        unknown_subpacket.extra = subpacket.extra
+        subpacket = unknown_subpacket
+        num_bytes_to_print = [InterfaceMicroservice::UNKNOWN_BYTES_TO_PRINT, subpacket.length].min
+        data = subpacket.buffer(false)[0..(num_bytes_to_print - 1)]
+        prefix = data.each_byte.map { | byte | sprintf("%02X", byte) }.join()
+        @logger.warn "#{@name} #{subpacket.target_name} packet length: #{subpacket.length} starting with: #{prefix}"
+      end
+
+      TargetModel.sync_tlm_packet_counts(subpacket, @target_names, scope: @scope)
+      return subpacket
+    end
+
     # Called when an item in any packet changes limits states.
     #
     # @param packet [Packet] Packet which has had an item change limits state