cosmos 4.4.0-java → 4.4.1-java

data/lib/cosmos/tools/tlm_grapher/tlm_grapher.rb

@@ -73,17 +73,24 @@ module Cosmos
         target_name.upcase!
         packet_name.upcase!
         item_name.upcase!
-        # Check to see if the item name is followed by an array index,
-        # notated by square brackets around an integer; i.e. ARRAY_ITEM[1]
-        if (item_name =~ /\[\d+\]$/)
-          # We found an array index.
-          # The $` special variable is the string before the regex match, i.e. ARRAY_ITEM
-          item_name = $`
-          # The $& special variable is the string matched by the regex, i.e. [1].
-          # Strip off the brackets and then convert the array index to an integer.
-          item_array_index = $&.gsub(/[\[\]]/, "").to_i
-        else
-          item_array_index = nil
+
+        item_array_index = nil
+        begin
+          # See if we can access the item
+          _, item = System.telemetry.packet_and_item(target_name, packet_name, item_name)
+        rescue => error
+          # Check to see if the item name is followed by an array index,
+          # notated by square brackets around an integer; i.e. ARRAY_ITEM[1]
+          if (item_name =~ /\[\d+\]$/)
+            # The $` special variable is the string before the regex match, i.e. ARRAY_ITEM
+            item_name = $`
+            # The $& special variable is the string matched by the regex, i.e. [1].
+            # Strip off the brackets and then convert the array index to an integer.
+            item_array_index = $&.gsub(/[\[\]]/, "").to_i
+          else
+            # If we couldn't access the item and it's not bracket notation then it's an error
+            raise error
+          end
         end
         # Default configuration has one plot so don't add plot for first item
         data_object = HousekeepingDataObject.new

data/lib/cosmos/tools/tlm_viewer/tlm_viewer.rb

@@ -53,6 +53,12 @@ module Cosmos
     @@instance = nil
 
     def self.instance
+      unless @@instance
+        _, options = create_default_options()
+        options.listen = false
+        options.show_main = false
+        TlmViewer.new(options)
+      end
       @@instance
     end
 
@@ -118,12 +124,14 @@ module Cosmos
 
       Splash.execute(self) do |splash|
         ConfigParser.splash = splash
-        splash.message = "Displaying requested screens"
+        if options.show_main
+          splash.message = "Displaying requested screens"
 
-        # Startup desired screens once we're running
-        @tlm_viewer_config.screen_infos.each do |screen_full_name, screen_info|
-          if screen_info.show_on_startup
-            display(screen_full_name, screen_info.x_pos, screen_info.y_pos)
+          # Startup desired screens once we're running
+          @tlm_viewer_config.screen_infos.each do |screen_full_name, screen_info|
+            if screen_info.show_on_startup
+              display(screen_full_name, screen_info.x_pos, screen_info.y_pos)
+            end
           end
         end
 
@@ -163,6 +171,8 @@ module Cosmos
 
         ConfigParser.splash = nil
       end
+      
+      hide() unless options.show_main
     end
 
     def initialize_actions
@@ -551,6 +561,7 @@ module Cosmos
           options.title = 'Telemetry Viewer'
           options.screen = nil
           options.listen = true
+          options.show_main = true
           options.restore_size = false
           options.production = false
           options.replay = false

data/lib/cosmos/utilities/ruby_lex_utils.rb

@@ -45,41 +45,45 @@ class RubyLex
     @exception_on_syntax_error = true
     @prompt                    = nil
   end
+  
+  # Monkey patch to keep this from looping forever if the string never is closed with a right brace
+  def identify_string_dvar
+    begin
+      getc
 
-  # Monkey patch to fix performance issue caused by call to reverse
-  def get_readed
-    if idx = @readed.rindex("\n")
-      @base_char_no = @readed.size - (idx + 1)
-    else
-      @base_char_no += @readed.size
-    end
+      reserve_continue = @continue
+      reserve_ltype = @ltype
+      reserve_indent = @indent
+      reserve_indent_stack = @indent_stack
+      reserve_state = @lex_state
+      reserve_quoted = @quoted
 
-    readed = @readed.join("")
-    @readed = []
-    readed
-  end
+      @ltype = nil
+      @quoted = nil
+      @indent = 0
+      @indent_stack = []
+      @lex_state = EXPR_BEG
 
-  # Monkey patch to fix performance issue caused by call to reverse
-  def ungetc(c = nil)
-    if @here_readed.empty?
-      c2 = @readed.pop
-    else
-      c2 = @here_readed.pop
-    end
-    c = c2 unless c
-    @rests.unshift c #c =
-    @seek -= 1
-    if c == "\n"
-      @line_no -= 1
-      if idx = @readed.rindex("\n")
-        @char_no = idx + 1
-      else
-        @char_no = @base_char_no + @readed.size
+      loop do
+        @continue = false
+        prompt
+        tk = token
+        break if tk.nil? # This is the patch
+        if @ltype or @continue or @indent >= 0
+          next
+        end
+        break if tk.kind_of?(TkRBRACE)
       end
-    else
-      @char_no -= 1
+    ensure
+      @continue = reserve_continue
+      @ltype = reserve_ltype
+      @indent = reserve_indent
+      @indent_stack = reserve_indent_stack
+      @lex_state = reserve_state
+      @quoted = reserve_quoted
     end
-  end
+  end  
+  
 end
 $VERBOSE = old_verbose
 

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '4.4.0'
+COSMOS_VERSION = '4.4.1'
 module Cosmos
   module Version
     MAJOR = '4'
     MINOR = '4'
-    PATCH = '0'
-    BUILD = '30bd354efce074e6684f2fb4f4df8dc12d2f3df5'
+    PATCH = '1'
+    BUILD = 'f8e9c89b2d7fcd0c558806ff6c9dd59d167786e4'
   end
-  VERSION = '4.4.0'
+  VERSION = '4.4.1'
 end

data/lib/cosmos/win32/excel.rb

@@ -31,8 +31,10 @@ module Cosmos
 
         # Build a lookup table based on the first column
         @lkup = {}
-        @data.each do |row|
-          @lkup[row[0]] = row[1..-1]
+        if @data
+          @data.each do |row|
+            @lkup[row[0]] = row[1..-1]
+          end
         end
       end
 
@@ -70,23 +72,27 @@ module Cosmos
         File.chmod(0444, archive) # Mark read-only
       end
 
-      excel = WIN32OLE.new('excel.application')
-      excel.visible = false
-      wb = excel.workbooks.open(filename)
+      begin
+        excel = WIN32OLE.new('excel.application')
+        excel.visible = false
+        wb = excel.workbooks.open(filename)
 
-      @worksheets = []
-      @lkup = {}
-      count = wb.worksheets.count
-      count.times do |index|
-        ws = wb.worksheets(index + 1)
-        @worksheets << ExcelWorksheet.new(ws)
-        @lkup[ws.name] = @worksheets[-1]
+        @worksheets = []
+        @lkup = {}
+        count = wb.worksheets.count
+        count.times do |index|
+          ws = wb.worksheets(index + 1)
+          @worksheets << ExcelWorksheet.new(ws)
+          @lkup[ws.name] = @worksheets[-1]
+        end
+      ensure
+        if excel
+          excel.DisplayAlerts = false
+          excel.quit
+        end
+        excel = nil
+        GC.start
       end
-
-      excel.DisplayAlerts = false
-      excel.quit
-      excel = nil
-      GC.start
     end
 
     # @return [Array<String>] Array of all the worksheet names

data/run_gui_tests.bat

@@ -1,5 +1,6 @@
 call bundle exec ruby autohotkey\tools\CmdExtractorAHK --defaultsize
 call bundle exec ruby autohotkey\tools\CmdSenderAHK -w 650 -t 650
+call bundle exec ruby autohotkey\tools\CmdSenderAHK2 -w 650 -t 650 -p "INST COLLECT" --production
 call bundle exec ruby autohotkey\tools\CmdSequenceAHK -w 650 -t 650
 call bundle exec ruby autohotkey\tools\CmdSequenceAHK2 -w 650 -t 650 -r run_sequence.txt -o procedures
 call bundle exec ruby autohotkey\tools\CmdTlmServerAHK -x 50 -y 50 -w 900 -t 1000

data/spec/core_ext/socket_spec.rb

@@ -27,7 +27,7 @@ describe Socket do
     it "returns the hostname for the ip address" do
       if !ENV['APPVEYOR']
         ipaddr = Resolv.getaddress "localhost"
-        expect(Socket.lookup_hostname_from_ip(ipaddr)).to match("localhost")
+        expect(Socket.lookup_hostname_from_ip(ipaddr)).to_not be_nil
       end
     end
   end

data/spec/install/yaml_docs_spec.rb

@@ -15,6 +15,25 @@ module Cosmos
     OPENGL = %w(STL_FILE TEXTURE_MAPPED_SPHERE TIP_TEXT POSITION ROTATION_X ROTATION_Y ROTATION_Z)
     OPENGL.concat(%w(ZOOM ORIENTATION CENTER BOUNDS))
 
+    def process_line(line)
+      line.split(',').each do |item|
+        item.strip!
+        if (item[0] == "'" || item[0] == '"') && (item[-1] == "'" || item[-1] == '"')
+          @src_keywords << item[1..-2]
+        end
+      end
+    end
+
+    def process_continuation(line)
+      if line[-1] == "\\"
+        continuation = true
+        line = line[0..-2] # remove the continuation character
+      else
+        continuation = false
+      end
+      return continuation
+    end
+
     def get_src_keywords
       @src_keywords = []
       path = File.expand_path(File.join(File.dirname(__FILE__), "../../lib/**/*.rb"))
@@ -27,15 +46,16 @@ module Cosmos
           part = data.split('handle_keyword(parser, keyword, parameters)')[1..-1].join
         end
         if part
+          continuation = false
           part.split("\n").each do |line|
+            if continuation
+              continuation = process_continuation(line)
+              process_line(line)
+            end
             if match = line.match(/when (.*)/)
               line = match.captures[0]
-              line.split(',').each do |item|
-                item.strip!
-                if (item[0] == "'" || item[0] == '"') && (item[-1] == "'" || item[-1] == '"')
-                  @src_keywords << item[1..-2]
-                end
-              end
+              continuation = process_continuation(line)
+              process_line(line)
             end
           end
         end

data/spec/interfaces/protocols/length_protocol_spec.rb

@@ -160,6 +160,45 @@ module Cosmos
         expect(packet.buffer.length).to eql 5
       end
 
+      it "raises an error with a packet length of 0" do
+        @interface.instance_variable_set(:@stream, LengthStream.new)
+        @interface.add_protocol(LengthProtocol, [
+          16, # bit offset
+          16, # bit size
+          0,  # length offset
+          1, # bytes per count
+          'BIG_ENDIAN'], :READ_WRITE)
+        $buffer = "\x00\x01\x00\x00\x03\x04\x05\x06\x07\x08\x09"
+        expect { @interface.read }.to raise_error(RuntimeError, /Calculated packet length of 0 bits/)
+      end
+
+      it "raises an error if packet length not enough to support offset and size" do
+        @interface.instance_variable_set(:@stream, LengthStream.new)
+        @interface.add_protocol(LengthProtocol, [
+          16, # bit offset
+          16, # bit size
+          3,  # length offset of 3 not enough to support 2 byte length field at offset 2 bytes
+          1, # bytes per count
+          'BIG_ENDIAN'], :READ_WRITE)
+        $buffer = "\x00\x01\x00\x00\x03\x04\x05\x06\x07\x08\x09"
+        expect { @interface.read }.to raise_error(RuntimeError, /Calculated packet length of 24 bits/)
+      end
+
+      it "processes a 0 length with a non-zero length offset" do
+        @interface.instance_variable_set(:@stream, LengthStream.new)
+        @interface.add_protocol(LengthProtocol, [
+          0, # bit offset
+          16, # bit size
+          4,  # length offset
+          1, # bytes per count
+          'BIG_ENDIAN'], :READ_WRITE)
+        $buffer = "\x00\x00\x01\x02\x00\x00\x03\x04"
+        packet = @interface.read
+        expect(packet.buffer).to eql "\x00\x00\x01\x02"
+        packet = @interface.read
+        expect(packet.buffer).to eql "\x00\x00\x03\x04"
+      end
+
       it "validates length against the maximum length" do
         @interface.instance_variable_set(:@stream, LengthStream.new)
         @interface.add_protocol(LengthProtocol, [

data/spec/io/json_drb_spec.rb

@@ -200,6 +200,20 @@ module Cosmos
         sleep(0.1)
       end
 
+      it "processes success requests with uppercase" do
+        class MyServer5
+          def my_method(param)
+          end
+        end
+
+        @json.start_service('127.0.0.1', 7777, MyServer5.new)
+        request_data = JsonRpcRequest.new('MY_METHOD', 'param', 1).to_json
+        _, error_code = @json.process_request(request_data, Time.now)
+        expect(error_code).to eq nil
+        @json.stop_service
+        sleep(0.1)
+      end
+
       it "does not allow dangerous methods" do
         @json.start_service('127.0.0.1', 7777, self)
         request_data = JsonRpcRequest.new('send', 'param', 1).to_json

data/spec/io/win32_serial_driver_spec.rb

@@ -50,6 +50,22 @@ if RUBY_ENGINE == 'ruby' or Gem.win_platform?
           expect { Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,8) }.to_not raise_error
           expect { Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,9) }.to raise_error(ArgumentError, "Invalid data bits: 9")
         end
+
+        it "calculates the correct timeouts" do
+          Win32::BAUD_RATES.each do |baud|
+            (5..8).each do |data_bits|
+              (1..2).each do |stop_bits|
+                [:EVEN, :ODD, :NONE].each do |parity|
+                  # data_bits + 1 start bit + stop bits + potentially a parity bit
+                  symbols = data_bits + 1 + stop_bits + (parity == :NONE ? 0 : 1)
+                  delay = 1000.0 / (baud.to_f / symbols)
+                  expect(Win32).to receive(:set_comm_timeouts).with(anything, 0xFFFFFFFF,0,0,delay.ceil,1000)
+                  Win32SerialDriver.new('COM1',baud,parity,stop_bits,10,nil,0.01,1000,:NONE,data_bits)
+                end
+              end
+            end
+          end
+        end
       end
 
       describe "close, closed?" do
@@ -92,8 +108,6 @@ if RUBY_ENGINE == 'ruby' or Gem.win_platform?
           expect { driver.read }.to raise_error(Timeout::Error)
         end
       end
-
     end
   end
-
 end

data/spec/packet_logs/packet_log_reader_spec.rb

@@ -121,7 +121,7 @@ module Cosmos
           file.write [pkt.buffer.length].pack('N')
           file.write pkt.buffer
         end
-        expect(@plr.open(filename)).to eql [false, nil]
+        expect(@plr.open(filename)[0]).to eql false
         pkt1 = @plr.read
         expect(pkt1.target_name).to eql 'TGT1'
         expect(pkt1.packet_name).to eql 'PKT1'
@@ -149,7 +149,7 @@ module Cosmos
           file.write [pkt.buffer.length].pack('N')
           file.write pkt.buffer
         end
-        expect(@plr.open(filename)).to eql [false, nil]
+        expect(@plr.open(filename)[0]).to eql false
         pkt1 = @plr.read
         expect(pkt1.target_name).to eql 'TGT1'
         expect(pkt1.packet_name).to eql 'PKT1'

data/spec/packets/structure_spec.rb

@@ -185,6 +185,8 @@ module Cosmos
         expect(@s.defined_length).to eql 1
         si = StructureItem.new("test1",0,16,:INT,:BIG_ENDIAN)
         @s.define(si)
+        expect(@s.items.length).to eql 1
+        expect(@s.sorted_items.length).to eql 1
         expect(@s.sorted_items[0].name).to eql "TEST1"
         expect(@s.items["TEST1"].bit_size).to eql 16
         expect(@s.items["TEST1"].data_type).to eql :INT
@@ -290,6 +292,56 @@ module Cosmos
       end
     end
 
+    describe "delete_item" do
+      before(:each) do
+        @s = Structure.new(:BIG_ENDIAN)
+        @s.define_item("test1", 0, 8, :UINT)
+      end
+
+      it "removes the item and leaves a hole" do
+        @s.append_item("test2", 16, :UINT)
+        expect(@s.defined_length).to eql 3
+        @s.delete_item("test1")
+        expect { @s.get_item("test1") }.to raise_error(ArgumentError, "Unknown item: test1")
+        expect(@s.defined_length).to eql 3
+        expect(@s.items["TEST1"]).to be_nil
+        expect(@s.items["TEST2"]).not_to be_nil
+        expect(@s.sorted_items.length).to eql 1
+        expect(@s.sorted_items[0]).to eql(@s.get_item("test2"))
+        buffer = "\x01\x02\x03"
+        expect(@s.read("test2", :RAW, buffer)).to eql 0x0203
+      end
+
+      it "allows new items to be defined in place" do
+        @s.append_item("test2", 16, :UINT)
+        @s.append_item("test3", 8, :UINT)
+        expect(@s.defined_length).to eql 4
+        # Delete the first 2 items, note a 3 byte hole now exists
+        @s.delete_item("test1")
+        @s.delete_item("test2")
+        expect(@s.defined_length).to eql 4
+        expect(@s.items.length).to eql 1
+        expect(@s.sorted_items.length).to eql 1
+        # Fill the hole and overlap the last byte
+        @s.define_item("test4", 0, 16, :UINT)
+        @s.define_item("test5", 16, 16, :UINT)
+        @s.define_item("test6", 32, 32, :UINT)
+        buffer = "\x01\x02\x03\x04\x05\x06\x07\x08"
+        expect(@s.read("test4", :RAW, buffer)).to eql 0x0102
+        expect(@s.read("test5", :RAW, buffer)).to eql 0x0304
+        expect(@s.read("test6", :RAW, buffer)).to eql 0x05060708
+        # test3 is still defined
+        expect(@s.read("test3", :RAW, buffer)).to eql 0x04
+        expect(@s.items.length).to eql 4
+        expect(@s.sorted_items.length).to eql 4
+        # Check that everything is sorted correctly
+        expect(@s.sorted_items[0].name).to eql "TEST4"
+        expect(@s.sorted_items[1].name).to eql "TEST5"
+        expect(@s.sorted_items[2].name).to eql "TEST3"
+        expect(@s.sorted_items[3].name).to eql "TEST6"
+      end
+    end
+
     describe "read_item" do
       it "complains if no buffer given" do
         s = Structure.new
@@ -601,7 +653,5 @@ module Cosmos
         expect { s.test1 }.to raise_error(ArgumentError, "Unknown item: test1")
       end
     end
-
   end # describe Structure
-
 end