cosmos 4.4.0-java → 4.4.1-java

data/lib/cosmos/dart/processes/dart.rb

@@ -30,7 +30,8 @@ class Dart
   #      streamed from the packet log binary file
   # 4. Decom Server - JSON DRB server which handles requests for decommutated
   #      or reduced data from the database
-  # 5..n Worker - Decommutates data from the packet log binary file into the DB
+  # 5. Master - Hands out packets to be decommutated by workers
+  # 6..n Worker - Decommutates data from the packet log binary file into the DB
   def run
     Cosmos::Logger.level = Cosmos::Logger::INFO
     dart_logging = DartLogging.new('dart')
@@ -53,7 +54,8 @@ class Dart
       [ruby_process_name, File.join(__dir__, 'dart_ingester.rb')],
       [ruby_process_name, File.join(__dir__, 'dart_reducer.rb')],
       [ruby_process_name, File.join(__dir__, 'dart_stream_server.rb')],
-      [ruby_process_name, File.join(__dir__, 'dart_decom_server.rb')]
+      [ruby_process_name, File.join(__dir__, 'dart_decom_server.rb')],
+      [ruby_process_name, File.join(__dir__, 'dart_master.rb')]
     ]
 
     num_workers.times do |index|

data/lib/cosmos/dart/processes/dart_decom_server.rb

@@ -26,8 +26,8 @@ Cosmos.catch_fatal_exception do
     begin
       json_drb.start_service(Cosmos::System.listen_hosts['DART_DECOM'],
         Cosmos::System.ports['DART_DECOM'], DartDecomQuery.new)
-    rescue Exception
-      raise Cosmos::FatalError.new("Error starting JsonDRb on port #{Cosmos::System.ports['DART_DECOM']}.\nPerhaps another DART Decom Server is already running?")
+    rescue Exception => error
+      raise Cosmos::FatalError.new("Error starting JsonDRb on port #{Cosmos::System.ports['DART_DECOM']}.\nPerhaps another DART Decom Server is already running?\n#{error.formatted}")
     end
     ["TERM", "INT"].each {|sig| Signal.trap(sig) {exit}}
     Cosmos::Logger.info("Dart Decom Server Started...")

data/lib/cosmos/dart/processes/dart_ingester.rb

@@ -16,20 +16,57 @@ require 'dart_logging'
 # Handles packets by writing them to the dart log file. New SYSTEM META packets
 # cause a new log file to be started.
 class DartInterfaceThread < Cosmos::InterfaceThread
+  include DartCommon
+  
   attr_writer :packet_log_writer
   attr_writer :log_type
-
+  
   def handle_packet(packet)
     if packet.target_name == 'SYSTEM'.freeze and packet.packet_name == 'META'.freeze
       Cosmos::Logger.info("#{@log_type}: #{packet.target_name} #{packet.packet_name}")
+      
+      # Manually read the configuration from the buffer because the packet might not be identified if
+      # identify_and_define is false
+      buffer = packet.buffer(false)
+      if buffer.length >= 33
+        system_config_name = Cosmos::BinaryAccessor.read(8, 256, :STRING, buffer, :BIG_ENDIAN)
+        # Switch to this system_config
+        begin
+          switch_and_get_system_config(system_config_name)
+        rescue Exception => e
+          Cosmos::Logger.error(e.formatted)
+          Cosmos::Logger.error("Could not load system_config: #{system_config_name}")
+        end
+      end      
+      
       # Update Current Value Table Used By Packet Log Writer
       cvt_packet = Cosmos::System.telemetry.update!(packet.target_name, packet.packet_name, packet.buffer)
       cvt_packet.received_time = packet.received_time
       cvt_packet.stored = packet.stored
       cvt_packet.extra = packet.extra
+      
       @packet_log_writer.start
       @packet_log_writer.write(cvt_packet)
     else
+      # Define the packet so that packet_time will work correctly
+      begin
+        packet_data = packet.buffer(false)
+        received_time = packet.received_time
+        stored = packet.stored
+        extra = packet.extra
+        if @log_type == :TLM
+          packet = Cosmos::System.telemetry.packet(packet.target_name, packet.packet_name)
+        else
+          packet = Cosmos::System.commands.packet(packet.target_name, packet.packet_name)
+        end
+        packet.buffer = packet_data
+        packet.received_time = received_time
+        packet.stored = stored
+        packet.extra = extra
+      rescue Exception => error
+        # Could not find a definition for this packet
+        Cosmos::Logger.error "Unknown packet #{target_name} #{packet_name}"
+      end
       @packet_log_writer.write(packet)
     end
   end

data/lib/cosmos/dart/processes/dart_master.rb

@@ -0,0 +1,44 @@
+# encoding: ascii-8bit
+
+# Copyright 2018 Ball Aerospace & Technologies Corp.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+
+ENV['RAILS_ENV'] = 'production'
+require File.expand_path('../../config/environment', __FILE__)
+require 'dart_common'
+require 'dart_master_query'
+
+ples_per_request = ENV['DART_PLE_REQ_SIZE']
+ples_per_request ||= 5
+ples_per_request = ples_per_request.to_i
+
+Cosmos.catch_fatal_exception do
+  DartCommon.handle_argv
+
+  Cosmos::Logger.level = Cosmos::Logger::INFO
+  dart_logging = DartLogging.new('dart_master')
+
+  json_drb = Cosmos::JsonDRb.new
+  json_drb.acl = Cosmos::System.acl if Cosmos::System.acl
+  begin
+    json_drb.method_whitelist = ['get_decom_ple_ids']
+    begin
+      json_drb.start_service(Cosmos::System.listen_hosts['DART_MASTER'],
+        Cosmos::System.ports['DART_MASTER'], DartMasterQuery.new(ples_per_request))
+    rescue Exception => error
+      raise Cosmos::FatalError.new("Error starting JsonDRb on port #{Cosmos::System.ports['DART_MASTER']}.\nPerhaps another DART Master is already running?\n#{error.formatted}")
+    end
+    ["TERM", "INT"].each {|sig| Signal.trap(sig) {exit}}
+    Cosmos::Logger.info("Dart Master Started...")
+    sleep(1) while true
+  rescue Interrupt
+    Cosmos::Logger.info("Dart Master Closing...")
+    json_drb.stop_service
+    dart_logging.stop
+  end
+end

data/lib/cosmos/dart/processes/dart_util.rb

@@ -56,6 +56,8 @@ ENV['RAILS_ENV'] = 'production'
 require File.expand_path('../../config/environment', __FILE__)
 require 'dart_database_cleaner'
 
+include DartCommon
+
 Cosmos.catch_fatal_exception do
   case action.downcase
   when 'showpleerrors'
@@ -77,6 +79,119 @@ Cosmos.catch_fatal_exception do
     Cosmos::Logger.level = Cosmos::Logger::INFO
     DartDatabaseCleaner.new.remove_packet_log(ARGV[1])
 
+  when 'showdatabase'
+    puts "Status:"
+    status = Status.last
+    puts "  Updated At: #{status.updated_at.formatted}"
+    puts "  Decom Count: #{status.decom_count}"
+    puts "  Decom Error Count: #{status.decom_error_count}"
+    puts "  Decom Message: #{status.decom_message}"
+    puts "  Decom Message Time: #{status.decom_message_time.formatted}"
+    puts "  Reduction Count: #{status.reduction_count}"
+    puts "  Reduction Error Count: #{status.reduction_error_count}"
+    puts "  Reduction Message: #{status.reduction_message}"
+    puts "  Reduction Message Time: #{status.reduction_message_time}"
+    puts ""
+
+    puts "System Configs:"
+    SystemConfig.all.each do |system_config|
+      puts "  #{sprintf("%6d", system_config.id)} #{system_config.name}"
+    end
+    puts ""
+
+    puts "Targets:"
+    Target.all.each do |target|
+      puts "  #{sprintf("%6d", target.id)} #{target.name}"
+    end
+    puts ""
+    
+    puts "Packets:"
+    Packet.all.each do |packet|
+      target = Target.find(packet.target_id)
+      puts "  #{sprintf("%6d", packet.id)} #{target.name} #{packet.name} (#{packet.is_tlm ? "TLM" : "CMD"})"
+    end
+    puts ""
+
+    puts "Items:"
+    Item.find_each do |item|
+      packet = Packet.find(item.packet_id)
+      target = Target.find(packet.target_id)
+      puts "  #{sprintf("%6d", item.id)} #{target.name} #{packet.name} #{item.name}"
+    end
+    puts ""
+
+    puts "Packet Logs:"
+    PacketLog.all.each do |packet_log|
+      puts "  #{sprintf("%6d", packet_log.id)} #{packet_log.filename} (#{packet_log.is_tlm ? "TLM" : "CMD"}) #{packet_log.created_at.formatted}"
+    end
+    puts ""
+    
+    puts "Packet Log Entry Count: #{PacketLogEntry.count}"
+    puts ""
+    
+    puts "Packet Configs:"
+    PacketConfig.all.each do |packet_config|
+      packet = Packet.find(packet_config.packet_id)
+      target = Target.find(packet.target_id)
+      puts "  #{sprintf("%6d", packet_config.id)} #{target.name} #{packet.name} (#{packet_config.name}) sysconfig:#{packet_config.first_system_config_id} maxindex:#{packet_config.max_table_index} ready:#{packet_config.ready} start:#{packet_config.start_time.formatted} end:#{packet_config.end_time.formatted}"
+    end
+    puts ""
+    
+    value_type_lookup = {0 => "RAW", 1 => "CONVERTED", 2 => "RAW_CON"}
+    puts "Item to Decom Table Mappings:"
+    ItemToDecomTableMapping.find_each do |itdtm|
+      item = Item.find(itdtm.item_id)
+      packet = Packet.find(item.packet_id)
+      target = Target.find(packet.target_id)
+      puts "  #{sprintf("%6d", itdtm.id)} #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]} packet_config:#{itdtm.packet_config_id} item_index:#{itdtm.item_index} table_index:#{itdtm.table_index} reduced:#{itdtm.reduced}"
+    end
+    puts ""
+    
+    puts "Decom and Reduced Tables:"
+    each_decom_and_reduced_table do |packet_config_id, table_index, decom_model, minute_model, hour_model, day_model|
+      puts "  t#{decom_model.name.split("::")[1][1..-1]}: (#{decom_model.count} entries)"
+      ItemToDecomTableMapping.where("packet_config_id = ? and table_index = ?", packet_config_id, table_index).order("item_index ASC").each do |itdtm|
+        item = Item.find(itdtm.item_id)
+        packet = Packet.find(item.packet_id)
+        target = Target.find(packet.target_id)
+        puts "    i#{itdtm.item_index} #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+      end
+      puts ""
+      puts "  t#{minute_model.name.split("::")[1][1..-1]}: (#{minute_model.count} entries)"
+      ItemToDecomTableMapping.where("packet_config_id = ? and table_index = ? and reduced = true", packet_config_id, table_index).order("item_index ASC").each do |itdtm|
+        item = Item.find(itdtm.item_id)
+        packet = Packet.find(item.packet_id)
+        target = Target.find(packet.target_id)
+        puts "    i#{itdtm.item_index}max #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}min #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}avg #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}stddev #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+      end      
+      puts ""
+      puts "  t#{hour_model.name.split("::")[1][1..-1]}: (#{hour_model.count} entries)"
+      ItemToDecomTableMapping.where("packet_config_id = ? and table_index = ? and reduced = true", packet_config_id, table_index).order("item_index ASC").each do |itdtm|
+        item = Item.find(itdtm.item_id)
+        packet = Packet.find(item.packet_id)
+        target = Target.find(packet.target_id)
+        puts "    i#{itdtm.item_index}max #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}min #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}avg #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}stddev #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+      end    
+      puts ""      
+      puts "  t#{day_model.name.split("::")[1][1..-1]}: (#{day_model.count} entries)"
+      ItemToDecomTableMapping.where("packet_config_id = ? and table_index = ? and reduced = true", packet_config_id, table_index).order("item_index ASC").each do |itdtm|
+        item = Item.find(itdtm.item_id)
+        packet = Packet.find(item.packet_id)
+        target = Target.find(packet.target_id)
+        puts "    i#{itdtm.item_index}max #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}min #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}avg #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}stddev #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+      end      
+      puts ""
+    end
+    
   when 'showpacketlogs'
     total_size = 0
     packet_logs = PacketLog.all

data/lib/cosmos/gui/widgets/dart_meta_frame.rb

@@ -16,6 +16,13 @@ module Cosmos
   class DartMetaFrame < Qt::Widget
     @@meta_filters = []
 
+    class LabelPopup < Qt::Label
+      attr_accessor :text
+      def mousePressEvent(event)
+        Qt::MessageBox.critical(self.parent, 'Error', @text)
+      end
+    end
+
     def initialize(parent)
       super(parent)
 
@@ -27,6 +34,7 @@ module Cosmos
       @groupbox = Qt::GroupBox.new("Meta Filter Selection")
       @vbox = Qt::VBoxLayout.new(@groupbox)
       @hbox1 = Qt::HBoxLayout.new
+
       @label = Qt::Label.new("Meta Filters: ")
       @hbox1.addWidget(@label)
       @meta_filters_text = Qt::LineEdit.new
@@ -43,6 +51,10 @@ module Cosmos
       @vbox.addLayout(@hbox1)
 
       @hbox2 = Qt::HBoxLayout.new
+      @error = LabelPopup.new
+      @error.setPixmap(Qt::Application.style.standardIcon(Qt::Style::SP_MessageBoxCritical).pixmap(20, 20))
+      @error.hide
+      @hbox2.addWidget(@error)
       @meta_item_name = Qt::ComboBox.new
       @meta_item_name.setMinimumWidth(200)
       @meta_item_name.setMaxVisibleItems(6)
@@ -113,8 +125,15 @@ module Cosmos
               end
             end
             @got_meta_item_names = true
-          rescue Exception
-            # We tried...
+            Qt.execute_in_main_thread { @error.hide }
+          rescue Exception => e
+            case e.message
+            when /execution expired/
+              @error.text = "Could not connect to the DART Decom Server. Is it running?"
+            else
+              @error.text = e.message
+            end
+            Qt.execute_in_main_thread { @error.show }
           ensure
             @update_thread = nil
             server.disconnect if defined? server

data/lib/cosmos/interfaces/protocols/length_protocol.rb

@@ -135,6 +135,11 @@ module Cosmos
                                    @length_endianness)
       raise "Length value received larger than max_length: #{length} > #{@max_length}" if @max_length and length > @max_length
       packet_length = (length * @length_bytes_per_count) + @length_value_offset
+      # Ensure the calculated packet length is long enough to support the location of the length field
+      # without overlap into the next packet
+      if (packet_length * 8) < (@length_bit_offset + @length_bit_size)
+        raise "Calculated packet length of #{packet_length * 8} bits < (offset:#{@length_bit_offset} + size:#{@length_bit_size})"
+      end
 
       # Make sure we have enough data for the packet
       return :STOP if @data.length < packet_length

data/lib/cosmos/io/json_drb.rb

@@ -259,10 +259,10 @@ module Cosmos
         error_code = nil
         response_data = nil
 
-        if (@method_whitelist and @method_whitelist.include?(request.method)) or
-           (!@method_whitelist and !JsonRpcRequest::DANGEROUS_METHODS.include?(request.method))
+        if (@method_whitelist and @method_whitelist.include?(request.method.downcase())) or
+           (!@method_whitelist and !JsonRpcRequest::DANGEROUS_METHODS.include?(request.method.downcase()))
           begin
-            result = @object.send(request.method.intern, *request.params)
+            result = @object.send(request.method.downcase().intern, *request.params)
             if request.id
               response = JsonRpcSuccessResponse.new(result, request.id)
             end

data/lib/cosmos/io/posix_serial_driver.rb

@@ -59,7 +59,7 @@ module Cosmos
       cflags |= Termios::CLOCAL # Ignore Modem Control Lines
       cflags |= Termios::CSTOPB if stop_bits == 2
       cflags |= Termios::PARENB if parity
-      cflags |= Termios::PADODD if parity == :ODD
+      cflags |= Termios::PARODD if parity == :ODD
       cflags |= Termios::CRTSCTS if flow_control == :RTSCTS
       tio.iflag = iflags
       tio.oflag = 0

data/lib/cosmos/io/win32_serial_driver.rb

@@ -80,8 +80,29 @@ module Cosmos
       end
       Win32.set_comm_state(@handle, dcb)
 
-      # Configure Timeouts
-      Win32.set_comm_timeouts(@handle, 4294967295, 0, 0, 0, 0)
+      # Configure Timeouts, the WinAPI structure is COMMTIMEOUTS:
+      #   DWORD ReadIntervalTimeout;
+      #   DWORD ReadTotalTimeoutMultiplier;
+      #   DWORD ReadTotalTimeoutConstant;
+      #   DWORD WriteTotalTimeoutMultiplier;
+      #   DWORD WriteTotalTimeoutConstant;
+      # 0xFFFFFFFF, 0, 0 specifies that the read operation is to return immediately
+      # with the bytes that have already been received, even if no bytes have been received.
+      # The WriteTotalTimeoutMultiplier is multiplied by the number of bytes to be written
+      # and the WriteTotalTimeoutConstant is added to that total (both are in milliseconds).
+      bits_per_symbol = data_bits + 1 # 1 start bit
+      case stop_bits
+      when Win32::ONESTOPBIT
+        bits_per_symbol += 1
+      when Win32::TWOSTOPBITS
+        bits_per_symbol += 2
+      end
+      case parity
+      when Win32::ODDPARITY, Win32::EVENPARITY
+        bits_per_symbol += 1
+      end
+      delay = (1000.0 / (baud_rate / bits_per_symbol.to_f)).ceil
+      Win32.set_comm_timeouts(@handle, 0xFFFFFFFF, 0, 0, delay, 1000)
     end
 
     # (see SerialDriver#close)

data/lib/cosmos/packet_logs/packet_log_reader.rb

@@ -152,7 +152,7 @@ module Cosmos
 
       # Read Packet Data
       packet_data = @file.read_length_bytes(4, @max_read_size)
-      return nil unless packet_data and packet_data.length > 0
+      return nil unless packet_data and packet_data.length >= 0
 
       if identify_and_define
         packet = identify_and_define_packet_data(target_name, packet_name, received_time, packet_data)
@@ -275,7 +275,7 @@ module Cosmos
           end
           packet.buffer = packet_data
           packet.set_received_time_fast(received_time)
-        rescue
+        rescue Exception => error
           # Could not find a definition for this packet
           Logger.instance.error "Unknown packet #{target_name} #{packet_name}"
           packet = Packet.new(target_name, packet_name, :BIG_ENDIAN, nil, packet_data)

data/lib/cosmos/packets/packet.rb

@@ -341,7 +341,7 @@ module Cosmos
       previous_item = nil
       warnings = []
       @sorted_items.each do |item|
-        if expected_next_offset and item.bit_offset < expected_next_offset
+        if expected_next_offset and (item.bit_offset < expected_next_offset) and !item.overlap
           msg = "Bit definition overlap at bit offset #{item.bit_offset} for packet #{@target_name} #{@packet_name} items #{item.name} and #{previous_item.name}"
           Logger.instance.warn(msg)
           warnings << msg

data/lib/cosmos/packets/packet_config.rb

@@ -198,14 +198,22 @@ module Cosmos
           #######################################################################
           # All the following keywords must have a current packet defined
           #######################################################################
-          when 'SELECT_ITEM', 'SELECT_PARAMETER', 'ITEM', 'PARAMETER', 'ID_ITEM', 'ID_PARAMETER', 'ARRAY_ITEM', 'ARRAY_PARAMETER', 'APPEND_ITEM', 'APPEND_PARAMETER', 'APPEND_ID_ITEM', 'APPEND_ID_PARAMETER', 'APPEND_ARRAY_ITEM', 'APPEND_ARRAY_PARAMETER', 'MACRO_APPEND_START', 'MACRO_APPEND_END', 'ALLOW_SHORT', 'HAZARDOUS', 'PROCESSOR', 'META', 'DISABLE_MESSAGES', 'HIDDEN', 'DISABLED'
+          when 'SELECT_ITEM', 'SELECT_PARAMETER', 'DELETE_ITEM', 'DELETE_PARAMETER', 'ITEM',\
+              'PARAMETER', 'ID_ITEM', 'ID_PARAMETER', 'ARRAY_ITEM', 'ARRAY_PARAMETER', 'APPEND_ITEM',\
+              'APPEND_PARAMETER', 'APPEND_ID_ITEM', 'APPEND_ID_PARAMETER', 'APPEND_ARRAY_ITEM',\
+              'APPEND_ARRAY_PARAMETER', 'MACRO_APPEND_START', 'MACRO_APPEND_END', 'ALLOW_SHORT',\
+              'HAZARDOUS', 'PROCESSOR', 'META', 'DISABLE_MESSAGES', 'HIDDEN', 'DISABLED'
             raise parser.error("No current packet for #{keyword}") unless @current_packet
             process_current_packet(parser, keyword, params)
 
           #######################################################################
           # All the following keywords must have a current item defined
           #######################################################################
-          when 'STATE', 'READ_CONVERSION', 'WRITE_CONVERSION', 'POLY_READ_CONVERSION', 'POLY_WRITE_CONVERSION', 'SEG_POLY_READ_CONVERSION', 'SEG_POLY_WRITE_CONVERSION', 'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START', 'REQUIRED', 'LIMITS', 'LIMITS_RESPONSE', 'UNITS', 'FORMAT_STRING', 'DESCRIPTION', 'MINIMUM_VALUE', 'MAXIMUM_VALUE', 'DEFAULT_VALUE', 'OVERFLOW'
+          when 'STATE', 'READ_CONVERSION', 'WRITE_CONVERSION', 'POLY_READ_CONVERSION',\
+              'POLY_WRITE_CONVERSION', 'SEG_POLY_READ_CONVERSION', 'SEG_POLY_WRITE_CONVERSION',\
+              'GENERIC_READ_CONVERSION_START', 'GENERIC_WRITE_CONVERSION_START', 'REQUIRED',\
+              'LIMITS', 'LIMITS_RESPONSE', 'UNITS', 'FORMAT_STRING', 'DESCRIPTION',\
+              'MINIMUM_VALUE', 'MAXIMUM_VALUE', 'DEFAULT_VALUE', 'OVERFLOW', 'OVERLAP'
             raise parser.error("No current item for #{keyword}") unless @current_item
             process_current_item(parser, keyword, params)
 
@@ -327,25 +335,31 @@ module Cosmos
     def process_current_packet(parser, keyword, params)
       case keyword
 
-      # Select an item in the current telemetry packet for editing
-      when 'SELECT_PARAMETER', 'SELECT_ITEM'
+      # Select or delete an item in the current packet
+      when 'SELECT_PARAMETER', 'SELECT_ITEM', 'DELETE_PARAMETER', 'DELETE_ITEM'
         if (@current_cmd_or_tlm == COMMAND) && (keyword.split('_')[1] == 'ITEM')
-          raise parser.error("SELECT_ITEM only applies to telemetry packets")
+          raise parser.error("#{keyword} only applies to telemetry packets")
         end
         if (@current_cmd_or_tlm == TELEMETRY) && (keyword.split('_')[1] == 'PARAMETER')
-          raise parser.error("SELECT_PARAMETER only applies to command packets")
+          raise parser.error("#{keyword} only applies to command packets")
         end
         usage = "#{keyword} <#{keyword.split('_')[1]} NAME>"
         finish_item()
         parser.verify_num_parameters(1, 1, usage)
         begin
-          @current_item = @current_packet.get_item(params[0])
+          if keyword.include?("SELECT")
+            @current_item = @current_packet.get_item(params[0])
+          else # DELETE
+            @current_packet.delete_item(params[0])
+          end
         rescue # Rescue the default execption to provide a nicer error message
           raise parser.error("#{params[0]} not found in #{@current_cmd_or_tlm.downcase} packet #{@current_packet.target_name} #{@current_packet.packet_name}", usage)
         end
 
       # Start a new telemetry item in the current packet
-      when 'ITEM', 'PARAMETER', 'ID_ITEM', 'ID_PARAMETER', 'ARRAY_ITEM', 'ARRAY_PARAMETER', 'APPEND_ITEM', 'APPEND_PARAMETER', 'APPEND_ID_ITEM', 'APPEND_ID_PARAMETER', 'APPEND_ARRAY_ITEM', 'APPEND_ARRAY_PARAMETER'
+      when 'ITEM', 'PARAMETER', 'ID_ITEM', 'ID_PARAMETER', 'ARRAY_ITEM', 'ARRAY_PARAMETER',\
+          'APPEND_ITEM', 'APPEND_PARAMETER', 'APPEND_ID_ITEM', 'APPEND_ID_PARAMETER',\
+          'APPEND_ARRAY_ITEM', 'APPEND_ARRAY_PARAMETER'
         start_item(parser)
 
       # Start the creation of a macro-expanded list of items
@@ -570,6 +584,10 @@ module Cosmos
         parser.verify_num_parameters(1, 1, usage)
         @current_item.overflow = params[0].to_s.upcase.intern
 
+      when 'OVERLAP'
+        parser.verify_num_parameters(0, 0, 'OVERLAP')
+        @current_item.overlap = true
+
       end
     end