rmodbus 1.0.0-java → 1.0.1-java

data/NEWS.md

@@ -1,4 +1,8 @@
-Release 1.0.0
+2011-06-30 Release 1.0.1
+
+1. Fixed issue #8
+
+2011-06-27 Release 1.0.0
 =====================================
 New API for client part of library
 ---------------------------------------

data/lib/rmodbus/rtu.rb

@@ -20,7 +20,11 @@ module ModBus
     # We have to read specific amounts of numbers of bytes from the network depending on the function code and content
     def read_rtu_response(io)
 	    # Read the slave_id and function code
-	    msg = io.read(2)
+      msg = nil
+      while msg.nil?
+	      msg = io.read(2)
+      end
+
       function_code = msg.getbyte(1)
       case function_code
         when 1,2,3,4 then

data/lib/rmodbus/rtu_client.rb

@@ -20,7 +20,7 @@ module ModBus
   #     end
   #   end
   #
-  # @see RTUClient#open_connection
+  # @see SP#open_serial_port
   # @see Client#initialize
   class RTUClient < Client
     include RTU
@@ -28,12 +28,10 @@ module ModBus
 
     protected
     # Open serial port
-    # @see SP#open_serial_port
     def open_connection(port, baud=9600, opts = {})
       open_serial_port(port, baud, opts)
     end
 
-    # @private
     def get_slave(uid, io)
       RTUSlave.new(uid, io)
     end

data/lib/rmodbus/rtu_via_tcp_client.rb

@@ -21,7 +21,7 @@ module ModBus
   #     end
   #   end
   #
-  # @see RTUViaTCPClient#open_connection
+  # @see TCP#open_tcp_connection
   # @see Client#initialize
   class RTUViaTCPClient < Client
 		include RTU
@@ -29,7 +29,6 @@ module ModBus
 
     protected
 		# Open TCP\IP connection
-    # @see TCP#open_tcp_connection
     def open_connection(ipaddr, port = 10002, opts = {})
       io = open_tcp_connection(ipaddr, port, opts)
 		end

data/lib/rmodbus/sp.rb

@@ -35,7 +35,7 @@ module ModBus
       @data_bits = opts[:data_bits] unless opts[:data_bits].nil?
       @stop_bits = opts[:stop_bits] unless opts[:stop_bits].nil?
       @parity = opts[:parity] unless opts[:parity].nil?
-      @read_timeout = options[:read_timeout] unless opts[:read_timeout].nil?
+      @read_timeout = opts[:read_timeout] unless opts[:read_timeout].nil?
 
       io = SerialPort.new(@port, @baud, @data_bits, @stop_bits, @parity)
       io.read_timeout = @read_timeout

data/lib/rmodbus/tcp.rb

@@ -18,8 +18,6 @@ module ModBus
   module TCP
     include Timeout
     attr_reader :ipaddr, :port
-
-    private
     # Open TCP socket
     #
     # @param [String] ipaddr IP address of remote server

data/lib/rmodbus/tcp_client.rb

@@ -21,13 +21,12 @@ module ModBus
   #   end
   #
   # @see TCPClient#open_connection
-  # @see Client#initialize
+  # @see TCP::open_connection
   class TCPClient < Client
     include TCP
 
     protected
     # Open TCP\IP connection
-    # @see TCP::open_connection
     def open_connection(ipaddr, port = 502, opts = {})
       open_tcp_connection(ipaddr, port, opts)
     end

data/lib/rmodbus/version.rb

@@ -13,5 +13,5 @@
 # GNU General Public License for more details.
 module ModBus
   # Package version
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -2,7 +2,7 @@
 name: rmodbus
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: java
 authors: 
   - A.Timin, J. Sanders, K. Reynolds
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 +06:00
+date: 2011-07-01 00:00:00 +06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency