cosmos 4.2.3-java → 4.2.4-java

data/lib/cosmos/dart/spec/dart/dart_reducer_manager_spec.rb

@@ -21,6 +21,7 @@ describe DartReducerManager do
   before(:each) do
     DatabaseCleaner.strategy = :truncation
     DatabaseCleaner.clean
+    Rails.application.load_seed
   end
 
   def setup_ples(entries, delta_time)
@@ -48,13 +49,13 @@ describe DartReducerManager do
     end
     ples = 0
     count = 0
+    writer.shutdown
     while ples != (entries + 1) # SYSTEM META is the plus 1
       ples = PacketLogEntry.count
       sleep 0.1 # Allow the log writer to work
       count += 1
       break if count == 100 # 10s
     end
-    writer.shutdown
     sleep 0.1
     expect(count).to be < 100
 

data/lib/cosmos/dart/spec/dart/dart_tcpip_server_interface_spec.rb

@@ -22,6 +22,7 @@ describe DartTcpipServerInterface do
   before(:each) do
     DatabaseCleaner.strategy = :truncation
     DatabaseCleaner.clean
+    Rails.application.load_seed
   end
 
   describe "initialize" do
@@ -48,8 +49,6 @@ describe DartTcpipServerInterface do
       @request.write('REQUEST', "BLAH")
       interface.write(@request)
       sleep 0.1
-      # TODO: Why is the interface still connected?
-      # expect(interface.connected?).to be false
       i.disconnect
 
       Dir["#{Cosmos::System.paths['DART_LOGS']}/*"].each do |file|

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

@@ -82,9 +82,14 @@ module Cosmos
 
       setLayout(@layout)
 
-      @resize_timer = Qt::Timer.new
-      @resize_timer.connect(SIGNAL('timeout()')) { update_meta_item_names() }
-      @resize_timer.start(100)
+      Thread.new do
+        sleep(0.1)
+        Qt.execute_in_main_thread(true) do
+          unless self.disposed?
+            update_meta_item_names()
+          end
+        end
+      end
     end
 
     def meta_filters
@@ -100,9 +105,11 @@ module Cosmos
             server = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'])
             item_names = server.item_names("SYSTEM", "META")
             Qt.execute_in_main_thread do
-              @meta_item_name.clear
-              item_names.each do |item|
-                @meta_item_name.addItem(item)
+              unless self.disposed?
+                @meta_item_name.clear
+                item_names.each do |item|
+                  @meta_item_name.addItem(item)
+                end
               end
             end
             @got_meta_item_names = true

data/lib/cosmos/interfaces.rb

@@ -9,6 +9,7 @@ require 'cosmos/interfaces/tcpip_client_interface'
 require 'cosmos/interfaces/tcpip_server_interface'
 require 'cosmos/interfaces/udp_interface'
 require 'cosmos/interfaces/linc_interface'
+require 'cosmos/interfaces/dart_status_interface'
 
 require 'cosmos/interfaces/protocols/protocol'
 require 'cosmos/interfaces/protocols/burst_protocol'

data/lib/cosmos/interfaces/dart_status_interface.rb

@@ -0,0 +1,91 @@
+# 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
+
+require 'cosmos/interfaces/interface'
+require 'cosmos/io/json_drb_object'
+require 'cosmos/utilities/sleeper'
+
+module Cosmos
+
+  # Defines all the attributes and methods common to all interface classes
+  # used by COSMOS.
+  class DartStatusInterface < Interface
+    # Initialize default attribute values
+    def initialize(query_period = 20.0)
+      super()
+      @write_raw_allowed = false
+      @dart = nil
+      @first = true
+      @query_period = query_period.to_f
+      @query_time = nil
+    end
+
+    # Connects the interface to its target(s). Must be implemented by a
+    # subclass.
+    def connect
+      super()
+      @first = true
+      @status_packet = System.telemetry.packet('DART', 'STATUS').clone
+      @status_packet.write('PACKET_ID', 1)
+      @clear_errors_command = System.commands.packet('DART', 'CLEAR_ERRORS')
+      @sleeper = Sleeper.new
+      @dart = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'])
+    end
+
+    # Indicates if the interface is connected to its target(s) or not. Must be
+    # implemented by a subclass.
+    def connected?
+      if @dart
+        true
+      else
+        false
+      end
+    end
+
+    # Disconnects the interface from its target(s). Must be implemented by a
+    # subclass.
+    def disconnect
+      super()
+      @sleeper.cancel
+      @dart.disconnect if @dart
+      @dart = nil
+    end
+
+    def read_interface
+      canceled = false
+      unless @first
+        if @query_time
+          sleep_time = @query_period - (Time.now - @query_time)
+          canceled = @sleeper.sleep(sleep_time) if sleep_time > 0
+        end
+        @query_time = Time.now
+      end
+      @first = false
+      unless canceled
+        data = @dart.dart_status
+        write_interface_base(@dart.request_data.to_s)
+        read_interface_base(@dart.response_data.to_s)
+        data.each do |key, value|
+          @status_packet.write(key, value)
+        end
+        return @status_packet.buffer
+      else
+        return nil
+      end
+    end
+
+    def write_interface(data)
+      @dart.clear_errors
+      write_interface_base(@dart.request_data.to_s)
+      read_interface_base(@dart.response_data.to_s)
+      return nil
+    end
+  end
+end

data/lib/cosmos/interfaces/serial_interface.rb

@@ -51,6 +51,7 @@ module Cosmos
       @write_raw_allowed = false unless @write_port_name
       @read_allowed = false unless @read_port_name
       @flow_control = :NONE
+      @data_bits = 8
     end
 
     # Creates a new {SerialStream} using the parameters passed in the constructor
@@ -63,7 +64,8 @@ module Cosmos
         @stop_bits,
         @write_timeout,
         @read_timeout,
-        @flow_control
+        @flow_control,
+        @data_bits
       )
       super()
     end
@@ -75,6 +77,8 @@ module Cosmos
       case option_name.upcase
       when 'FLOW_CONTROL'
         @flow_control = option_values[0]
+      when 'DATA_BITS'
+        @data_bits = option_values[0].to_i
       end
     end
   end

data/lib/cosmos/io/json_drb.rb

@@ -17,8 +17,13 @@ require 'set'
 require 'cosmos/io/json_rpc'
 require 'cosmos/io/json_drb_rack'
 require 'rack/handler/puma'
-if RUBY_ENGINE == 'ruby' and %w(2.2.7 2.2.8 2.3.4 2.4.1).include? RUBY_VERSION
-  require 'stopgap_13632'
+if RUBY_ENGINE == 'ruby' and %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
+  begin
+    require 'stopgap_13632'
+  rescue Exception => err
+    msg = "Error loading stopgap. Make sure gem install stopgap_13632 succeeds: #{err.message}"
+    raise $!, msg, $!.backtrace
+  end
 end
 
 # Add methods to the Puma::Launcher and Puma::Single class so we can tell

data/lib/cosmos/io/json_drb_object.rb

@@ -32,6 +32,9 @@ module Cosmos
   #   server.cmd(*args)
   #
   class JsonDRbObject
+    attr_reader :request_data
+    attr_reader :response_data
+
     # @param hostname [String] The name of the machine which has started
     #   the JSON service
     # @param port [Integer] The port number of the JSON service
@@ -46,6 +49,8 @@ module Cosmos
           raise error
         end
       end
+      @request_data = ""
+      @response_data = ""
       @hostname = hostname
       @port = port
       @uri = URI("http://#{@hostname}:#{@port}")
@@ -117,25 +122,25 @@ module Cosmos
       request = JsonRpcRequest.new(method_name, method_params, @id)
       @id += 1
 
-      request_data = request.to_json(:allow_nan => true)
+      @request_data = request.to_json(:allow_nan => true)
       begin
         STDOUT.puts "\nRequest:\n" if JsonDRb.debug?
-        STDOUT.puts request_data if JsonDRb.debug?
+        STDOUT.puts @request_data if JsonDRb.debug?
         @request_in_progress = true
         headers = {'Content-Type' => 'application/json-rpc'}
         res = @http.post(@uri,
-                         :body   => request_data,
+                         :body   => @request_data,
                          :header => headers)
-        response_data = res.body
+        @response_data = res.body
         @request_in_progress = false
         STDOUT.puts "Response:\n" if JsonDRb.debug?
-        STDOUT.puts response_data if JsonDRb.debug?
+        STDOUT.puts @response_data if JsonDRb.debug?
       rescue => e
         disconnect()
         return false if first_try
         raise DRb::DRbConnError, e.message, e.backtrace
       end
-      response_data
+      @response_data
     end
 
     def handle_response(response_data)

data/lib/cosmos/io/json_rpc.rb

@@ -175,6 +175,7 @@ module Cosmos
 
     # @param other [JsonRpc] Another JsonRpc to compare hash values with
     def <=>(other)
+      return nil unless other.respond_to?(:as_json)
       self.as_json <=> other.as_json
     end
 

data/lib/cosmos/io/posix_serial_driver.rb

@@ -24,7 +24,8 @@ module Cosmos
                    stop_bits = 1,
                    write_timeout = 10.0,
                    read_timeout = nil,
-                   flow_control = :NONE)
+                   flow_control = :NONE,
+                   data_bits = 8)
 
       # Convert Baud Rate into Termios constant
       begin
@@ -34,6 +35,7 @@ module Cosmos
       end
 
       # Verify Parameters
+      raise(ArgumentError, "Invalid Data Bits: #{data_bits}") unless [5,6,7,8].include?(data_bits)
       raise(ArgumentError, "Invalid parity: #{parity}") if parity and !SerialDriver::VALID_PARITY.include?(parity)
       raise(ArgumentError, "Invalid Stop Bits: #{stop_bits}") unless [1,2].include?(stop_bits)
       @write_timeout = write_timeout
@@ -53,7 +55,7 @@ module Cosmos
       iflags |= Termios::IGNPAR unless parity
       cflags = 0
       cflags |= Termios::CREAD # Enable receiver
-      cflags |= Termios::CS8 # 8-bit bytes
+      cflags |= Termios.const_get("CS#{data_bits}") # data bits
       cflags |= Termios::CLOCAL # Ignore Modem Control Lines
       cflags |= Termios::CSTOPB if stop_bits == 2
       cflags |= Termios::PARENB if parity

data/lib/cosmos/io/serial_driver.rb

@@ -32,14 +32,16 @@ module Cosmos
     #   complete or nil to block
     # @param read_timeout [Float|nil] Number of seconds to wait for the read to
     #   complete or nil to block
-    # @param flow_control [Symbol] Currently supported :NONE and :RTSCTS
+    # @param flow_control [Symbol] Currently supported :NONE and :RTSCTS (default :NONE)
+    # @param data_bits [Integer] Number of data bits (default 8)
     def initialize(port_name,
                    baud_rate,
                    parity = :NONE,
                    stop_bits = 1,
                    write_timeout = 10.0,
                    read_timeout = nil,
-                   flow_control = :NONE)
+                   flow_control = :NONE,
+                   data_bits = 8)
       raise(ArgumentError, "Invalid parity: #{parity}") unless VALID_PARITY.include? parity
       if Kernel.is_windows?
         @driver = Win32SerialDriver.new(port_name,
@@ -50,7 +52,8 @@ module Cosmos
                                         read_timeout,
                                         0.01,
                                         1000,
-                                        flow_control)
+                                        flow_control,
+                                        data_bits)
       elsif RUBY_ENGINE == 'ruby'
         @driver = PosixSerialDriver.new(port_name,
                                         baud_rate,
@@ -58,7 +61,8 @@ module Cosmos
                                         stop_bits,
                                         write_timeout,
                                         read_timeout,
-                                        flow_control)
+                                        flow_control,
+                                        data_bits)
       else
         @driver = nil # JRuby Serial on Linux not currently supported
       end

data/lib/cosmos/io/win32_serial_driver.rb

@@ -23,13 +23,14 @@ module Cosmos
                    read_timeout = nil,
                    read_polling_period = 0.01,
                    read_max_length = 1000,
-                   flow_control = :NONE)
+                   flow_control = :NONE,
+                   data_bits = 8)
 
       # Verify Parameters
       port_name = '\\\\.\\' + port_name if port_name =~ /^COM[0-9]{2,3}$/
 
       raise(ArgumentError, "Invalid baud rate: #{baud_rate}") unless baud_rate.between?(Win32::BAUD_RATES[0], Win32::BAUD_RATES[-1])
-
+      raise(ArgumentError, "Invalid data bits: #{data_bits}") unless [5,6,7,8].include?(data_bits)
       raise(ArgumentError, "Invalid parity: #{parity}") if parity and !SerialDriver::VALID_PARITY.include?(parity)
       case parity
       when SerialDriver::ODD
@@ -64,7 +65,7 @@ module Cosmos
       # Configure the Comm Port - See: https://msdn.microsoft.com/en-us/library/windows/desktop/aa363214(v=vs.85).aspx
       dcb = Win32.get_comm_state(@handle)
       dcb.write('BaudRate', baud_rate)
-      dcb.write('ByteSize', 8)
+      dcb.write('ByteSize', data_bits)
       dcb.write('Parity',   parity)
       dcb.write('StopBits', stop_bits)
       if flow_control == :RTSCTS

data/lib/cosmos/packets/packet_config.rb

@@ -395,8 +395,13 @@ module Cosmos
           # require should be performed in target.txt
           klass = params[0].filename_to_class_name.to_class
           raise parser.error("#{params[0].filename_to_class_name} class not found. Did you require the file in target.txt?", usage) unless klass
-          @current_item.send("#{keyword.downcase}=".to_sym,
-            klass.new(*params[1..(params.length - 1)]))
+          conversion = klass.new(*params[1..(params.length - 1)])
+          @current_item.send("#{keyword.downcase}=".to_sym, conversion)
+          if klass != ProcessorConversion and (conversion.converted_type.nil? or conversion.converted_bit_size.nil?)
+            msg = "Read Conversion #{params[0].filename_to_class_name} on item #{@current_item.name} does not specify converted type or bit size. Will not be supported by DART"
+            @warnings << msg
+            Logger.instance.warn @warnings[-1]
+          end
         rescue Exception => err
           raise parser.error(err)
         end
@@ -445,6 +450,11 @@ module Cosmos
           raise parser.error("Invalid converted_type: #{@converted_type}.") unless [:INT, :UINT, :FLOAT, :STRING, :BLOCK].include? @converted_type
         end
         @converted_bit_size = Integer(params[1]) if params[1]
+        if @converted_type.nil? or @converted_bit_size.nil?
+          msg = "Generic Conversion on item #{@current_item.name} does not specify converted type or bit size. Will not be supported by DART"
+          @warnings << msg
+          Logger.instance.warn @warnings[-1]
+        end
 
       # Define a set of limits for the current telemetry item
       when 'LIMITS'

data/lib/cosmos/packets/structure_item.rb

@@ -203,6 +203,7 @@ module Cosmos
       # with different names or bit sizes are equal if they have the same bit
       # offset.
       def <=>(other_item)
+        return nil unless other_item.kind_of?(StructureItem)
         other_bit_offset = other_item.bit_offset
         other_bit_size = other_item.bit_size
 

data/lib/cosmos/script/extract.rb

@@ -45,7 +45,7 @@ module Cosmos
       target_name = first_half[0]
       cmd_name = first_half[1]
       cmd_params = {}
-    
+
       begin
         packet = System.commands.packet(target_name, cmd_name).clone
       rescue
@@ -129,7 +129,9 @@ module Cosmos
       comparison_to_eval = nil
       return [target_name, packet_name, item_name, comparison_to_eval] if split_string.length == 3
       raise "ERROR: Check improperly specified: #{text}" if split_string.length < 4
-      comparison_to_eval = split_string[3..(split_string.length - 1)].join(" ")
+      split_string = text.split(/ /) # Split on regex spaces to preserve spaces in comparison
+      index = split_string.index(item_name)
+      comparison_to_eval = split_string[(index + 1)..(split_string.length - 1)].join(" ")
       raise "ERROR: Use '==' instead of '=': #{text}" if split_string[3] == '='
       return [target_name, packet_name, item_name, comparison_to_eval]
     end

data/lib/cosmos/streams/serial_stream.rb

@@ -35,7 +35,8 @@ module Cosmos
     #   complete. Pass nil to create no timeout. The {SerialDriver} will
     #   continously try to read data until it has received data or an error
     #   occurs.
-    # @param flow_control [Symbol] Currently supported :NONE and :RTSCTS
+    # @param flow_control [Symbol] Currently supported :NONE and :RTSCTS (default :NONE)
+    # @param data_bits [Integer] Number of data bits (default 8)
     def initialize(write_port_name,
                    read_port_name,
                    baud_rate,
@@ -43,7 +44,8 @@ module Cosmos
                    stop_bits,
                    write_timeout,
                    read_timeout,
-                   flow_control = :NONE)
+                   flow_control = :NONE,
+                   data_bits = 8)
       super()
 
       # The SerialDriver class will validate the parameters
@@ -56,7 +58,8 @@ module Cosmos
       @write_timeout   = @write_timeout.to_f if @write_timeout
       @read_timeout    = ConfigParser.handle_nil(read_timeout)
       @read_timeout    = @read_timeout.to_f if @read_timeout
-      @flow_control = flow_control.to_s.intern
+      @flow_control    = flow_control.to_s.intern
+      @data_bits       = data_bits.to_i
 
       if @write_port_name
         @write_serial_port = SerialDriver.new(@write_port_name,
@@ -65,7 +68,8 @@ module Cosmos
                                               @stop_bits,
                                               @write_timeout,
                                               @read_timeout,
-                                              @flow_control)
+                                              @flow_control,
+                                              @data_bits)
       else
         @write_serial_port = nil
       end
@@ -79,7 +83,8 @@ module Cosmos
                                                @stop_bits,
                                                @write_timeout,
                                                @read_timeout,
-                                               @flow_control)
+                                               @flow_control,
+                                               @data_bits)
         end
       else
         @read_serial_port = nil