openc3 7.1.0 → 7.2.0

data/lib/openc3/packets/parsers/xtce_parser.rb

@@ -709,6 +709,26 @@ module OpenC3
       end
     end
 
+    def set_item_range_and_default(item)
+      return if item.range
+      return if item.data_type == :STRING || item.data_type == :BLOCK
+
+      if item.data_type == :INT
+        item.range = (-(2**(item.bit_size - 1)))..((2**(item.bit_size - 1)) - 1)
+        item.default = 0 if item.default.nil?
+      elsif item.data_type == :UINT
+        item.range = 0..((2**item.bit_size) - 1)
+        item.default = 0 if item.default.nil?
+      elsif item.data_type == :FLOAT
+        if item.bit_size == 32
+          item.range = -3.402823e38..3.402823e38
+        else
+          item.range = -Float::MAX..Float::MAX
+        end
+        item.default = 0.0 if item.default.nil?
+      end
+    end
+
     def set_limits(item, type)
       return unless @current_cmd_or_tlm == PacketConfig::TELEMETRY
 
@@ -756,7 +776,9 @@ module OpenC3
                 @current_packet.get_item(item.name)
               rescue
                 # Item hasn't already been added so define it
-                @current_packet.define(item.clone)
+                cloned_item = item.clone
+                @current_packet.define(cloned_item)
+                set_item_range_and_default(cloned_item) if @current_cmd_or_tlm == PacketConfig::COMMAND
                 count += 1
               end
             end

data/lib/openc3/script/script.rb

@@ -206,10 +206,12 @@ module OpenC3
       _file_dialog(title, message, filter)
     end
 
-    def open_bucket_dialog(title, message = "Open Bucket File")
+    def open_bucket_dialog(title, message = "Open Bucket File", default_path: nil, filter: nil)
       answer = ''
+      hint = default_path ? " [default: #{default_path}]" : ''
+      hint += " filter: #{filter}" if filter
       while answer.empty?
-        print "#{title}\n#{message}\n<Type bucket file path (e.g. BUCKET/path/to/file)>:"
+        print "#{title}\n#{message}\n<Type bucket file path (e.g. BUCKET/path/to/file)>#{hint}:"
         answer = gets
         answer.chomp!
       end

data/lib/openc3/script/suite.rb

@@ -287,7 +287,7 @@ module OpenC3
       # Find all the script methods
       methods = []
       self.instance_methods.each do |method_name|
-        if /^test|^script|op_/.match?(method_name.to_s)
+        if /^test_|^script_|^op_/.match?(method_name.to_s)
           methods << method_name.to_s
         end
       end

data/lib/openc3/script/web_socket_api.rb

@@ -91,6 +91,10 @@ module OpenC3
     # Will subscribe to the channel based on @identifier
     def subscribe
       unless @subscribed
+        # Token is part of the identifier so it surfaces as params[:token] in
+        # ApplicationCable::Channel#authenticate_subscription! — ActionCable
+        # ignores `data` on `subscribe` commands.
+        @identifier['token'] = @authentication.token(include_bearer: false)
         json_hash = {}
         json_hash['command'] = 'subscribe'
         json_hash['identifier'] = JSON.generate(@identifier, allow_nan: true)
@@ -128,7 +132,7 @@ module OpenC3
     # Connect to the websocket with authorization in query params
     def connect
       disconnect()
-      final_url = @url + "?scope=#{@scope}&authorization=#{@authentication.get_otp(scope: @scope)}"
+      final_url = @url + "?scope=#{@scope}"
       @stream = WebSocketClientStream.new(final_url, @write_timeout, @read_timeout, @connect_timeout)
       @stream.headers = {
         'Sec-WebSocket-Protocol' => 'actioncable-v1-json, actioncable-unsupported',

data/lib/openc3/topics/command_topic.rb

@@ -33,6 +33,7 @@ module OpenC3
                    received_count: packet.received_count,
                    stored: packet.stored.to_s,
                    buffer: packet.buffer(false) }
+      msg_hash[:extra] = JSON.generate(packet.extra.as_json, allow_nan: true) if packet.extra
       db_shard = Store.db_shard_for_target(packet.target_name, scope: scope)
       EphemeralStoreQueued.instance(db_shard: db_shard).write_topic(topic, msg_hash)
     end

data/lib/openc3/topics/telemetry_decom_topic.rb

@@ -43,6 +43,7 @@ module OpenC3
           :received_count => packet.received_count,
           :json_data => json_data,
         }
+        msg_hash[:extra] = JSON.generate(packet.extra.as_json, allow_nan: true) if packet.extra
         db_shard = Store.db_shard_for_target(packet.target_name, scope: scope)
         Topic.write_topic("#{scope}__DECOM__{#{packet.target_name}}__#{packet.packet_name}", msg_hash, id, db_shard: db_shard)