openc3 5.9.1 → 5.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c24a28732bfd8c275b65639cd566b4823d78b70b43781bf14a82e114397e7677
-  data.tar.gz: a8567e57ec8008d505e7f6a30cd3462e435988a46729908fbc17775f2b92e976
+  metadata.gz: e462e9d0a5d73e46212ec61b784b432827b0588b64308449309196e1257ad5b0
+  data.tar.gz: 4811700be9aeab28edc867d11e26481d7cbf63abe8bb3ca9ef956823d8adb17d
 SHA512:
-  metadata.gz: dc287a9895e3ae60c6332389d0b7926bb84aa04d7d65e51c936ba65f66640b179b0baefdcec232d7775a70f2e95d88557faf5e960663c4c28840428e7cb52904
-  data.tar.gz: 578c1f1fe45512344390492e9aa15d7af851bb81e608fbc874189dcc73bc998c472e62d449c114fb300fc58bb0d9cc269cc3dfbcbb31aaaf76c9003abd63c8e7
+  metadata.gz: 0e01b50dc62e075afe78f66101e176ec20118f017122a8f76a1eb3d1b302250e55717897c2302c6bf812cece5bedf0d9e6a0b1fdc2dc43f68998a693d7b04b4d
+  data.tar.gz: 5a93a1b914e84e5555cc88e4c74da80a8283ae621c958c6d9535848c1ff384dd7aa3a6ba59dff7e148b91eb3370ef563ec0a8c94f1ecafc517bd65665f8f8e2a

data/Gemfile

@@ -14,4 +14,4 @@ gem 'tzinfo-data'
 gem 'rspec-rails', '~> 6.0'
 gem 'simplecov', '~> 0.20'
 gem 'simplecov-cobertura', '~> 2.1'
-gem 'mock_redis'
+gem 'mock_redis', '0.36'

data/lib/openc3/accessors/binary_accessor.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.
 
 # This file contains the implementation of the BinaryAccessor class.
@@ -280,7 +280,10 @@ module OpenC3
 
             if upper_bound > lower_bound
               # Combine bytes into a FixNum
-              temp_data[1..temp_upper].each_byte { |temp_value| temp = temp << 8; temp = temp + temp_value }
+              temp_data[1..temp_upper].each_byte do |temp_value|
+                temp = temp << 8
+                temp = temp + temp_value
+              end
             end
 
             # Shift off unwanted bits at end

data/lib/openc3/api/limits_api.rb

@@ -172,7 +172,7 @@ module OpenC3
 
       TargetModel.set_packet(target_name, packet_name, packet, scope: scope)
 
-      message = "Disabling Limits For '#{target_name} #{packet_name} #{item_name}'"
+      message = "Disabling Limits for '#{target_name} #{packet_name} #{item_name}'"
       Logger.info(message, scope: scope)
 
       event = { type: :LIMITS_ENABLE_STATE, target_name: target_name, packet_name: packet_name,
@@ -344,11 +344,11 @@ module OpenC3
             if action == :enable
               enabled = true
               item['limits']['enabled'] = true
-              message = "Enabling Limits For '#{target_name} #{packet_name} #{item_name}'"
+              message = "Enabling Limits for '#{target_name} #{packet_name} #{item_name}'"
             elsif action == :disable
               enabled = false
               item['limits'].delete('enabled')
-              message = "Disabling Limits For '#{target_name} #{packet_name} #{item_name}'"
+              message = "Disabling Limits for '#{target_name} #{packet_name} #{item_name}'"
             end
             Logger.info(message, scope: scope)
 

data/lib/openc3/microservices/decom_microservice.rb

@@ -115,7 +115,11 @@ module OpenC3
     def limits_change_callback(packet, item, old_limits_state, value, log_change)
       return if @cancel_thread
       packet_time = packet.packet_time
-      message = "#{packet.target_name} #{packet.packet_name} #{item.name} = #{value} is #{item.limits.state}"
+      if value
+        message = "#{packet.target_name} #{packet.packet_name} #{item.name} = #{value} is #{item.limits.state}"
+      else
+        message = "#{packet.target_name} #{packet.packet_name} #{item.name} is disabled"
+      end
       message << " (#{packet.packet_time.sys.formatted})" if packet_time
 
       time_nsec = packet_time ? packet_time.to_nsec_from_epoch : Time.now.to_nsec_from_epoch

data/lib/openc3/microservices/trigger_group_microservice.rb

@@ -355,9 +355,13 @@ module OpenC3
       end
       # This shouldn't happen because the frontend provides valid items but good to check
       # The raise is ultimately rescued inside evaluate_trigger when operand_value is called
-      raise "Packet #{operand[ITEM_TARGET]} #{operand[ITEM_PACKET]} not found" if packet.nil?
+      if packet.nil?
+        raise "Packet #{operand[ITEM_TARGET]} #{operand[ITEM_PACKET]} not found"
+      end
       value = packet.read(operand[ITEM_TYPE], operand[ITEM_VALUE_TYPE].intern)
-      raise "Item #{operand[ITEM_TARGET]} #{operand[ITEM_PACKET]} #{operand[ITEM_TYPE]} not found" if value.nil?
+      if value.nil?
+        raise "Item #{operand[ITEM_TARGET]} #{operand[ITEM_PACKET]} #{operand[ITEM_TYPE]} not found"
+      end
       value
     end
 

data/lib/openc3/models/interface_model.rb

@@ -389,6 +389,8 @@ module OpenC3
         status_model = RouterStatusModel.get_model(name: @name, scope: @scope)
       end
       status_model.destroy if status_model
+    rescue Exception => error
+      Logger.error("Error undeploying interface/router model #{@name} in scope #{@scope} due to #{error}")
     end
 
     def unmap_target(target_name, cmd_only: false, tlm_only: false)

data/lib/openc3/models/microservice_status_model.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/models/model'

data/lib/openc3/models/plugin_model.rb

@@ -297,6 +297,8 @@ module OpenC3
       microservices.each do |name, model_instance|
         model_instance.cleanup
       end
+    rescue Exception => error
+      Logger.error("Error undeploying plugin model #{@name} in scope #{@scope} due to #{error}")
     end
 
     # Reinstall

data/lib/openc3/models/target_model.rb

@@ -639,6 +639,8 @@ module OpenC3
       @@item_map_cache[@name] = nil
 
       ConfigTopic.write({ kind: 'deleted', type: 'target', name: @name, plugin: @plugin }, scope: @scope)
+    rescue Exception => error
+      Logger.error("Error undeploying target model #{@name} in scope #{@scope} due to #{error}")
     end
 
     ##################################################

data/lib/openc3/models/tool_model.rb

@@ -247,6 +247,8 @@ module OpenC3
           ConfigTopic.write({ kind: 'deleted', type: 'tool', name: @folder_name, plugin: @plugin }, scope: @scope)
         end
       end
+    rescue Exception => error
+      Logger.error("Error undeploying tool model #{@name} in scope #{@scope} due to #{error}")
     end
 
     ##################################################

data/lib/openc3/models/widget_model.rb

@@ -139,6 +139,8 @@ module OpenC3
       bucket = Bucket.getClient()
       bucket.delete_object(bucket: ENV['OPENC3_TOOLS_BUCKET'], key: @bucket_key)
       bucket.delete_object(bucket: ENV['OPENC3_TOOLS_BUCKET'], key: @bucket_key + '.map')
+    rescue Exception => error
+      Logger.error("Error undeploying widget model #{@name} in scope #{@scope} due to #{error}")
     end
   end
 end

data/lib/openc3/packets/packet.rb

@@ -540,7 +540,7 @@ module OpenC3
 
     # (see Structure#get_item)
     def get_item(name)
-      super(name)
+      return super(name)
     rescue ArgumentError
       raise "Packet item '#{@target_name} #{@packet_name} #{name.upcase}' does not exist"
     end
@@ -1056,10 +1056,10 @@ module OpenC3
 
       if @processors
         processors = []
-        config['processors'] = processors
         @processors.each do |processor_name, processor|
           processors << processor.as_json(*a)
         end
+        config['processors'] = processors
       end
 
       config['meta'] = @meta if @meta
@@ -1144,17 +1144,11 @@ module OpenC3
         # Update to new limits state
         item.limits.state = limits_state
 
-        if old_limits_state == nil # Changing from nil
-          if limits_state != :GREEN && limits_state != :BLUE # Warnings are needed
-            @limits_change_callback.call(self, item, old_limits_state, value, true) if @limits_change_callback
-          end
-        else # Changing from a state other than nil so always call the callback
-          if @limits_change_callback
-            if item.limits.state.nil?
-              @limits_change_callback.call(self, item, old_limits_state, value, false)
-            else
-              @limits_change_callback.call(self, item, old_limits_state, value, true)
-            end
+        if @limits_change_callback
+          if item.limits.state.nil?
+            @limits_change_callback.call(self, item, old_limits_state, value, false)
+          else
+            @limits_change_callback.call(self, item, old_limits_state, value, true)
           end
         end
       end

data/lib/openc3/packets/structure.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/packets/binary_accessor'
@@ -518,7 +518,7 @@ module OpenC3
     # Take the structure mutex to ensure the buffer does not change while you perform activities
     def synchronize
       setup_mutex()
-      @mutex.synchronize { || yield }
+      @mutex.synchronize { || yield } #|
     end
 
     # Take the structure mutex to ensure the buffer does not change while you perform activities

data/lib/openc3/packets/structure_item.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/ext/packet' if RUBY_ENGINE == 'ruby' and !ENV['OPENC3_NO_EXT']
@@ -76,9 +76,6 @@ module OpenC3
     # @return [Boolean] Whether this structure item can overlap another item in the same packet
     attr_accessor :overlap
 
-    # A large buffer size in bits (1 Megabyte)
-    LARGE_BUFFER_SIZE_BITS = 1024 * 1024 * 8
-
     # Create a StructureItem by setting all the attributes. It
     # calls all the setter routines to do the attribute verification and then
     # verifies the overall integrity.
@@ -135,14 +132,7 @@ module OpenC3
     end
 
     def bit_offset=(bit_offset)
-      if 0.class == Integer
-        # Ruby version >= 2.4.0
-        raise ArgumentError, "#{@name}: bit_offset must be an Integer" unless Integer === bit_offset
-      else
-        # Ruby version < 2.4.0
-        raise ArgumentError, "#{@name}: bit_offset must be a Fixnum" unless Fixnum === bit_offset
-      end
-
+      raise ArgumentError, "#{@name}: bit_offset must be an Integer" unless Integer === bit_offset
       byte_aligned = ((bit_offset % 8) == 0)
       if (@data_type == :FLOAT or @data_type == :STRING or @data_type == :BLOCK) and !byte_aligned
         raise ArgumentError, "#{@name}: bit_offset for :FLOAT, :STRING, and :BLOCK items must be byte aligned"
@@ -156,18 +146,14 @@ module OpenC3
     end
 
     def bit_size=(bit_size)
-      if 0.class == Integer
-        # Ruby version >=  2.4.0
-        raise ArgumentError, "#{name}: bit_size must be an Integer" unless Integer === bit_size
-      else
-        # Ruby version < 2.4.0
-        raise ArgumentError, "#{name}: bit_size must be a Fixnum" unless Fixnum === bit_size
-      end
+      raise ArgumentError, "#{@name}: bit_size must be an Integer" unless Integer === bit_size
       byte_multiple = ((bit_size % 8) == 0)
       if bit_size <= 0 and (@data_type == :INT or @data_type == :UINT or @data_type == :FLOAT)
         raise ArgumentError, "#{@name}: bit_size cannot be negative or zero for :INT, :UINT, and :FLOAT items: #{bit_size}"
       end
-      raise ArgumentError, "#{@name}: bit_size for STRING and BLOCK items must be byte multiples" if (@data_type == :STRING or @data_type == :BLOCK) and !byte_multiple
+      if (@data_type == :STRING or @data_type == :BLOCK) and !byte_multiple
+        raise ArgumentError, "#{@name}: bit_size for STRING and BLOCK items must be byte multiples"
+      end
       if @data_type == :FLOAT and bit_size != 32 and bit_size != 64
         raise ArgumentError, "#{@name}: bit_size for FLOAT items must be 32 or 64. Given: #{bit_size}"
       end
@@ -195,13 +181,7 @@ module OpenC3
 
     def array_size=(array_size)
       if array_size
-        if 0.class == Integer
-          # Ruby version >=  2.4.0
-          raise ArgumentError, "#{@name}: array_size must be an Integer" unless Integer === array_size
-        else
-          # Ruby version < 2.4.0
-          raise ArgumentError, "#{@name}: array_size must be a Fixnum" unless Fixnum === array_size
-        end
+        raise ArgumentError, "#{@name}: array_size must be an Integer" unless Integer === array_size
         raise ArgumentError, "#{@name}: array_size must be a multiple of bit_size" unless @bit_size == 0 or (array_size % @bit_size == 0) or array_size < 0
         raise ArgumentError, "#{@name}: bit_size cannot be negative or zero for array items" if @bit_size <= 0
       end

data/lib/openc3/script/api_shared.rb

@@ -44,17 +44,14 @@ module OpenC3
       _check(*args, scope: scope) { |tgt, pkt, item| tlm(tgt, pkt, item, type: type, scope: scope, token: token) }
     end
 
-    # @deprecated Use check with type: :RAW
     def check_raw(*args, scope: $openc3_scope, token: $openc3_token)
       check(*args, type: :RAW, scope: scope, token: token)
     end
 
-    # @deprecated Use check with type: :FORMATTED
     def check_formatted(*args, scope: $openc3_scope, token: $openc3_token)
       check(*args, type: :FORMATTED, scope: scope, token: token)
     end
 
-    # @deprecated Use check with type: :WITH_UNITS
     def check_with_units(*args, scope: $openc3_scope, token: $openc3_token)
       check(*args, type: :WITH_UNITS, scope: scope, token: token)
     end
@@ -90,10 +87,10 @@ module OpenC3
       raise "Invalid type '#{type}' for check_tolerance" unless %i(RAW CONVERTED).include?(type)
 
       target_name, packet_name, item_name, expected_value, tolerance =
-        _check_tolerance_process_args(args, scope: scope, token: token)
+        _check_tolerance_process_args(args)
       value = tlm(target_name, packet_name, item_name, type: type, scope: scope, token: token)
       if value.is_a?(Array)
-        expected_value, tolerance = array_tolerance_process_args(value.size, expected_value, tolerance, 'check_tolerance', scope: scope, token: token)
+        expected_value, tolerance = _array_tolerance_process_args(value.size, expected_value, tolerance, 'check_tolerance')
 
         message = ""
         all_checks_ok = true
@@ -166,23 +163,23 @@ module OpenC3
     # @param args [String|Array<String>] See the description for calling style
     # @param type [Symbol] Telemetry type, :RAW, :CONVERTED (default), :FORMATTED, or :WITH_UNITS
     def wait(*args, type: :CONVERTED, quiet: false, scope: $openc3_scope, token: $openc3_token)
-      time = nil
+      time_diff = nil
 
       case args.length
       # wait() # indefinitely until they click Go
       when 0
         start_time = Time.now.sys
         openc3_script_sleep()
-        time = Time.now.sys - start_time
-        Logger.info("WAIT: Indefinite for actual time of #{time} seconds") unless quiet
+        time_diff = Time.now.sys - start_time
+        Logger.info("WAIT: Indefinite for actual time of #{time_diff} seconds") unless quiet
 
       # wait(5) # absolute wait time
       when 1
         if args[0].kind_of? Numeric
           start_time = Time.now.sys
           openc3_script_sleep(args[0])
-          time = Time.now.sys - start_time
-          Logger.info("WAIT: #{args[0]} seconds with actual time of #{time} seconds") unless quiet
+          time_diff = Time.now.sys - start_time
+          Logger.info("WAIT: #{args[0]} seconds with actual time of #{time_diff} seconds") unless quiet
         else
           raise "Non-numeric wait time specified"
         end
@@ -216,7 +213,7 @@ module OpenC3
         # Invalid number of arguments
         raise "ERROR: Invalid number of arguments (#{args.length}) passed to wait()"
       end
-      time
+      time_diff
     end
 
     # @deprecated Use wait with type: :RAW
@@ -235,11 +232,11 @@ module OpenC3
     def wait_tolerance(*args, type: :CONVERTED, quiet: false, scope: $openc3_scope, token: $openc3_token)
       raise "Invalid type '#{type}' for wait_tolerance" unless %i(RAW CONVERTED).include?(type)
 
-      target_name, packet_name, item_name, expected_value, tolerance, timeout, polling_rate = _wait_tolerance_process_args(args, scope: scope, token: token)
+      target_name, packet_name, item_name, expected_value, tolerance, timeout, polling_rate = _wait_tolerance_process_args(args)
       start_time = Time.now.sys
       value = tlm(target_name, packet_name, item_name, type: type, scope: scope, token: token)
       if value.is_a?(Array)
-        expected_value, tolerance = array_tolerance_process_args(value.size, expected_value, tolerance, 'wait_tolerance', scope: scope, token: token)
+        expected_value, tolerance = _array_tolerance_process_args(value.size, expected_value, tolerance, 'wait_tolerance')
 
         success, value = openc3_script_wait_implementation_array_tolerance(value.size, target_name, packet_name, item_name, type, expected_value, tolerance, timeout, polling_rate, scope: scope, token: token)
         time = Time.now.sys - start_time
@@ -285,13 +282,13 @@ module OpenC3
     def wait_expression(exp_to_eval, timeout, polling_rate = DEFAULT_TLM_POLLING_RATE, context = nil, quiet: false, scope: $openc3_scope, token: $openc3_token)
       start_time = Time.now.sys
       success = openc3_script_wait_implementation_expression(exp_to_eval, timeout, polling_rate, context, scope: scope, token: token)
-      time = Time.now.sys - start_time
+      time_diff = Time.now.sys - start_time
       if success
-        Logger.info "WAIT: #{exp_to_eval} is TRUE after waiting #{time} seconds" unless quiet
+        Logger.info "WAIT: #{exp_to_eval} is TRUE after waiting #{time_diff} seconds" unless quiet
       else
-        Logger.warn "WAIT: #{exp_to_eval} is FALSE after waiting #{time} seconds" unless quiet
+        Logger.warn "WAIT: #{exp_to_eval} is FALSE after waiting #{time_diff} seconds" unless quiet
       end
-      time
+      time_diff
     end
 
     # Wait for the converted value of a telmetry item against a condition or for a timeout
@@ -304,13 +301,13 @@ module OpenC3
     # @param args [String|Array<String>] See the description for calling style
     # @param type [Symbol] Telemetry type, :RAW, :CONVERTED (default), :FORMATTED, or :WITH_UNITS
     def wait_check(*args, type: :CONVERTED, scope: $openc3_scope, token: $openc3_token, &block)
-      target_name, packet_name, item_name, comparison_to_eval, timeout, polling_rate = _wait_check_process_args(args, scope: scope, token: token)
+      target_name, packet_name, item_name, comparison_to_eval, timeout, polling_rate = _wait_check_process_args(args)
       start_time = Time.now.sys
       success, value = openc3_script_wait_implementation(target_name, packet_name, item_name, type, comparison_to_eval, timeout, polling_rate, scope: scope, token: token, &block)
       value = "'#{value}'" if value.is_a? String # Show user the check against a quoted string
-      time = Time.now.sys - start_time
+      time_diff = Time.now.sys - start_time
       check_str = "CHECK: #{_upcase(target_name, packet_name, item_name)} #{comparison_to_eval}"
-      with_value_str = "with value == #{value} after waiting #{time} seconds"
+      with_value_str = "with value == #{value} after waiting #{time_diff} seconds"
       if success
         Logger.info "#{check_str} success #{with_value_str}"
       else
@@ -321,7 +318,7 @@ module OpenC3
           raise CheckError, message
         end
       end
-      time
+      time_diff
     end
 
     # @deprecated use wait_check with type: :RAW
@@ -341,20 +338,20 @@ module OpenC3
     def wait_check_tolerance(*args, type: :CONVERTED, scope: $openc3_scope, token: $openc3_token, &block)
       raise "Invalid type '#{type}' for wait_check_tolerance" unless %i(RAW CONVERTED).include?(type)
 
-      target_name, packet_name, item_name, expected_value, tolerance, timeout, polling_rate = _wait_tolerance_process_args(args, scope: scope, token: token)
+      target_name, packet_name, item_name, expected_value, tolerance, timeout, polling_rate = _wait_tolerance_process_args(args)
       start_time = Time.now.sys
       value = tlm(target_name, packet_name, item_name, type: type, scope: scope, token: token)
       if value.is_a?(Array)
-        expected_value, tolerance = array_tolerance_process_args(value.size, expected_value, tolerance, 'wait_check_tolerance', scope: scope, token: token)
+        expected_value, tolerance = _array_tolerance_process_args(value.size, expected_value, tolerance, 'wait_check_tolerance')
 
         success, value = openc3_script_wait_implementation_array_tolerance(value.size, target_name, packet_name, item_name, type, expected_value, tolerance, timeout, polling_rate, scope: scope, token: token, &block)
-        time = Time.now.sys - start_time
+        time_diff = Time.now.sys - start_time
 
         message = ""
         value.size.times do |i|
           range = (expected_value[i] - tolerance[i]..expected_value[i] + tolerance[i])
           check_str = "CHECK: #{_upcase(target_name, packet_name, item_name)}[#{i}]"
-          range_str = "range #{range.first} to #{range.last} with value == #{value[i]} after waiting #{time} seconds"
+          range_str = "range #{range.first} to #{range.last} with value == #{value[i]} after waiting #{time_diff} seconds"
           if range.include?(value[i])
             message << "#{check_str} was within #{range_str}\n"
           else
@@ -373,10 +370,10 @@ module OpenC3
         end
       else
         success, value = openc3_script_wait_implementation_tolerance(target_name, packet_name, item_name, type, expected_value, tolerance, timeout, polling_rate, scope: scope, token: token)
-        time = Time.now.sys - start_time
+        time_diff = Time.now.sys - start_time
         range = (expected_value - tolerance)..(expected_value + tolerance)
         check_str = "CHECK: #{_upcase(target_name, packet_name, item_name)}"
-        range_str = "range #{range.first} to #{range.last} with value == #{value} after waiting #{time} seconds"
+        range_str = "range #{range.first} to #{range.last} with value == #{value} after waiting #{time_diff} seconds"
         if success
           Logger.info "#{check_str} was within #{range_str}"
         else
@@ -388,7 +385,7 @@ module OpenC3
           end
         end
       end
-      time
+      time_diff
     end
 
     # @deprecated Use wait_check_tolerance with type: :RAW
@@ -407,18 +404,18 @@ module OpenC3
                                                              timeout,
                                                              polling_rate,
                                                              context, scope: scope, token: token, &block)
-      time = Time.now.sys - start_time
+      time_diff = Time.now.sys - start_time
       if success
-        Logger.info "CHECK: #{exp_to_eval} is TRUE after waiting #{time} seconds"
+        Logger.info "CHECK: #{exp_to_eval} is TRUE after waiting #{time_diff} seconds"
       else
-        message = "CHECK: #{exp_to_eval} is FALSE after waiting #{time} seconds"
+        message = "CHECK: #{exp_to_eval} is FALSE after waiting #{time_diff} seconds"
         if $disconnect
           Logger.error message
         else
           raise CheckError, message
         end
       end
-      time
+      time_diff
     end
     alias wait_expression_stop_on_timeout wait_check_expression
 
@@ -483,7 +480,7 @@ module OpenC3
     ###########################################################################
     # Scripts Outside of ScriptRunner Support
     # ScriptRunner overrides these methods to work in the OpenC3 cluster
-    # They are only here to allow for scripts to have a change to work
+    # They are only here to allow for scripts to have a chance to work
     # unaltered outside of the cluster
     ###########################################################################
 
@@ -534,17 +531,17 @@ module OpenC3
     # caller to allow the return of the value through various telemetry calls.
     # This method should not be called directly by application code.
     def _check(*args, scope: $openc3_scope, token: $openc3_token)
-      target_name, packet_name, item_name, comparison_to_eval = _check_process_args(args, 'check', scope: scope, token: token)
+      target_name, packet_name, item_name, comparison_to_eval = _check_process_args(args, 'check')
 
       value = yield(target_name, packet_name, item_name)
       if comparison_to_eval
-        check_eval(target_name, packet_name, item_name, comparison_to_eval, value, scope: scope)
+        _check_eval(target_name, packet_name, item_name, comparison_to_eval, value)
       else
         Logger.info "CHECK: #{_upcase(target_name, packet_name, item_name)} == #{value}"
       end
     end
 
-    def _check_process_args(args, method_name, scope: $openc3_scope, token: $openc3_token)
+    def _check_process_args(args, method_name)
       case args.length
       when 1
         target_name, packet_name, item_name, comparison_to_eval = extract_fields_from_check_text(args[0])
@@ -557,10 +554,11 @@ module OpenC3
         # Invalid number of arguments
         raise "ERROR: Invalid number of arguments (#{args.length}) passed to #{method_name}()"
       end
+      raise "Invalid comparison to non-ascii value" unless comparison_to_eval.is_printable?
       return [target_name, packet_name, item_name, comparison_to_eval]
     end
 
-    def _check_tolerance_process_args(args, scope: $openc3_scope, token: $openc3_token)
+    def _check_tolerance_process_args(args)
       case args.length
       when 3
         target_name, packet_name, item_name = extract_fields_from_tlm_text(args[0])
@@ -612,11 +610,11 @@ module OpenC3
                                                          token: token)
       # If the packet has not been received the value could be nil
       value = 0 unless value
-      time = Time.now.sys - start_time
+      time_diff = Time.now.sys - start_time
       if success
-        Logger.info "#{type}: #{target_name.upcase} #{packet_name.upcase} received #{value - initial_count} times after waiting #{time} seconds" unless quiet
+        Logger.info "#{type}: #{target_name.upcase} #{packet_name.upcase} received #{value - initial_count} times after waiting #{time_diff} seconds" unless quiet
       else
-        message = "#{type}: #{target_name.upcase} #{packet_name.upcase} expected to be received #{num_packets} times but only received #{value - initial_count} times after waiting #{time} seconds"
+        message = "#{type}: #{target_name.upcase} #{packet_name.upcase} expected to be received #{num_packets} times but only received #{value - initial_count} times after waiting #{time_diff} seconds"
         if check
           if $disconnect
             Logger.error message
@@ -627,16 +625,16 @@ module OpenC3
           Logger.warn message unless quiet
         end
       end
-      time
+      time_diff
     end
 
     def _execute_wait(target_name, packet_name, item_name, value_type, comparison_to_eval, timeout, polling_rate, quiet: false, scope: $openc3_scope, token: $openc3_token)
       start_time = Time.now.sys
       success, value = openc3_script_wait_implementation(target_name, packet_name, item_name, value_type, comparison_to_eval, timeout, polling_rate, scope: scope, token: token)
       value = "'#{value}'" if value.is_a? String # Show user the check against a quoted string
-      time = Time.now.sys - start_time
+      time_diff = Time.now.sys - start_time
       wait_str = "WAIT: #{_upcase(target_name, packet_name, item_name)} #{comparison_to_eval}"
-      value_str = "with value == #{value} after waiting #{time} seconds"
+      value_str = "with value == #{value} after waiting #{time_diff} seconds"
       if success
         Logger.info "#{wait_str} success #{value_str}" unless quiet
       else
@@ -644,7 +642,7 @@ module OpenC3
       end
     end
 
-    def _wait_tolerance_process_args(args, scope: $openc3_scope, token: $openc3_token)
+    def _wait_tolerance_process_args(args)
       case args.length
       when 4, 5
         target_name, packet_name, item_name = extract_fields_from_tlm_text(args[0])
@@ -686,7 +684,7 @@ module OpenC3
     # When testing an array with a tolerance, the expected value and tolerance
     # can both be supplied as either an array or a single value.  If a single
     # value is passed in, that value will be used for all array elements.
-    def array_tolerance_process_args(array_size, expected_value, tolerance, method_name, scope: $openc3_scope, token: $openc3_token)
+    def _array_tolerance_process_args(array_size, expected_value, tolerance, method_name)
       if expected_value.is_a?(Array)
         if array_size != expected_value.size
           raise "ERROR: Invalid array size for expected_value passed to #{method_name}()"
@@ -704,7 +702,7 @@ module OpenC3
       return [expected_value, tolerance]
     end
 
-    def _wait_check_process_args(args, scope: $openc3_scope, token: $openc3_token)
+    def _wait_check_process_args(args)
       case args.length
       when 2, 3
         target_name, packet_name, item_name, comparison_to_eval = extract_fields_from_check_text(args[0])
@@ -849,8 +847,7 @@ module OpenC3
       end
     end
 
-    def check_eval(target_name, packet_name, item_name, comparison_to_eval, value, scope: $openc3_scope, token: $openc3_token)
-      raise "Invalid comparison to non-ascii value" unless comparison_to_eval.is_printable?
+    def _check_eval(target_name, packet_name, item_name, comparison_to_eval, value)
       string = "value " + comparison_to_eval
       check_str = "CHECK: #{_upcase(target_name, packet_name, item_name)} #{comparison_to_eval}"
       # Show user the check against a quoted string

data/lib/openc3/script/web_socket_api.rb

@@ -405,9 +405,9 @@ end
 # # Environment variables are already set inside of our containers
 # # START OUTSIDE OF DOCKER ONLY
 # $openc3_scope = 'DEFAULT'
-# ENV['OPENC3_API_HOSTNAME'] = 'localhost'
+# ENV['OPENC3_API_HOSTNAME'] = '127.0.0.1'
 # ENV['OPENC3_API_PORT'] = '2900'
-# ENV['OPENC3_SCRIPT_API_HOSTNAME'] = 'localhost'
+# ENV['OPENC3_SCRIPT_API_HOSTNAME'] = '127.0.0.1'
 # ENV['OPENC3_SCRIPT_API_PORT'] = '2900'
 # ENV['OPENC3_API_PASSWORD'] = 'password'
 # # END OUTSIDE OF DOCKER ONLY

data/lib/openc3/system/target.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'
@@ -226,8 +226,8 @@ module OpenC3
     # Process the target's configuration file if it exists
     def process_target_config_file
       @filename = File.join(@dir, 'target.txt')
-      if File.exist?(filename)
-        process_file(filename)
+      if File.exist?(@filename)
+        process_file(@filename)
       else
         @filename = nil
       end

data/lib/openc3/top_level.rb

@@ -43,7 +43,7 @@ class HazardousError < StandardError
   attr_accessor :formatted # formatted command for use in resending original
 
   def to_s
-    string = "#{target_name} #{cmd_name} with #{cmd_params} is Hazardous"
+    string = "#{target_name} #{cmd_name} with #{cmd_params} is Hazardous "
     string << "due to '#{hazardous_description}'" if hazardous_description
     # Pass along the original formatted command so it can be resent
     string << ".\n#{formatted}"