rmodbus 0.3.0 → 0.3.1

data/ChangeLog

@@ -17,4 +17,6 @@
 2010-01-7 Timin Aleksey <atimin@gmail.com>
 	* lib/rmodbus/tcp_client.rb: Fixed bug of overflow transaction counter (thanks
 	Tallak Tveide)
+2010-01-12 Timin Aleksey <atimin@gmail.com>
+	* lib/rmodbus/rtu_client.rb: RTUClient is live!!!
 

data/lib/rmodbus/rtu_client.rb

@@ -10,7 +10,9 @@ module ModBus
     
     def initialize(port, rate=9600, slaveaddr=1)
       @port = SerialPort.new(port, rate)
+      @port.read_timeout = 5
       @slave = slaveaddr
+      super()
     end
 
     protected
@@ -21,7 +23,11 @@ module ModBus
     end
 
     def read_pdu
-      msg =  @port.read
+      msg = ''
+      while msg.size == 0 do
+        msg =  @port.read
+      end
+
       if msg.getbyte(0) == @slave
         return msg[1..-3] if msg[-2,2] == crc16(msg[0..-3]).to_word
       end

data/lib/rmodbus/tcp_client.rb

@@ -28,6 +28,7 @@ module ModBus
     # Connect with a ModBus server
     def initialize(ipaddr, port = 502, slaveaddr = 1)
       @ipaddr, @port = ipaddr, port
+      super()
       tried = 0
       begin
         timeout(1, ModBusTimeout) do

data/spec/rtu_client_spec.rb

@@ -11,6 +11,7 @@ describe RTUClient do
   before do 
     @port = mock('Serial port')
     SerialPort.should_receive(:new).with("/dev/port1", 9600).and_return(@port)    
+    @port.stub!(:read_timeout=)
     @mb_client = RTUClient.new("/dev/port1", 9600, 1)
     @mb_client.read_retries = 0
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rmodbus
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - A.Timin, J. Sanders
@@ -9,10 +9,19 @@ autorequire: rmodbus
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +05:00
+date: 2010-01-12 00:00:00 +05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: serialport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.0
+    version: 
 description: 
 email: 
 executables: []