rmodbus 1.2.7 → 1.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 72ada248b0d55d8dfecb8cb022e30e0dbd4e50b3
4
- data.tar.gz: 8de3ae040a26b173faa3bb1eca98b6d9bdba37c8
3
+ metadata.gz: ecce0e7d2825aed58c4c71440c7503a22ef5536e
4
+ data.tar.gz: e146d2b22d73acacb18b86f5726f385e5030460c
5
5
  SHA512:
6
- metadata.gz: 52ba64f23e37297732981cfb7a21f0633b4959b813a20005903148539cb341086250135ff7607c68d7c204e5c71d93be428ea6bf78253409ef7bce153d1e1008
7
- data.tar.gz: acc3b11d3b438c2af0ed52dcb2126f1e7360523efb6135ecd933999550869b57a5820d034ee6907277a0ca6b879084f7b0bdf5b0b04d4ebc26deab72edad18af
6
+ metadata.gz: 8761eeec49c335bcacb0da9dc1fd2e01b4e3aa8a564649193b1fb95d845346cfe296e2081253081520459656acaf29a8312f9fa2c400cc037a04e440de30c79d
7
+ data.tar.gz: 2a2c3644dc58fb84d2cdd3063736df405f30ab1d36fecb21942e84eaa44ef17c1b769217508c3a4719ed0a3226e3797c6b3d6ad8ab38babb2db7ae525c364608
data/NEWS.md CHANGED
@@ -1,3 +1,7 @@
1
+ ###2016-09-20 Release 1.2.8
2
+
3
+ 1. Fix warning on ruby 2.3 when calling Timeout.timeout
4
+
1
5
  ###2015-07-30 Release 1.2.7
2
6
 
3
7
  1. RTUServer doesn't stop serving when there is no RTU messages. Pull request [#37](https://github.com/flipback/rmodbus/pull/37).
@@ -19,7 +23,7 @@
19
23
 
20
24
  ###2015-01-29 Release 1.2.3
21
25
 
22
- 1. Fixed bug [#30](https://github.com/flipback/rmodbus/pull/30) in parsing command 'write_register' for server implementation part.
26
+ 1. Fixed bug [#30](https://github.com/flipback/rmodbus/pull/30) in parsing command 'write_register' for server implementation part.
23
27
 
24
28
  ###2013-10-28 Release 1.2.2
25
29
 
@@ -31,7 +35,7 @@
31
35
 
32
36
  ###2013-03-12 Release 1.2.0
33
37
 
34
- 1. Transaction number mismatch doesn't throw exception in TCPSlave#query method.
38
+ 1. Transaction number mismatch doesn't throw exception in TCPSlave#query method.
35
39
  Now this method will wait correct transaction until timeout breaks waiting.
36
40
  2. Added ruby-2.0 experimental compatibility
37
41
 
@@ -42,19 +46,19 @@ Now this method will wait correct transaction until timeout breaks waiting.
42
46
  ###2012-06-28 Release 1.1.4
43
47
 
44
48
  1. Fixed issue [#23](https://github.com/flipback/rmodbus/issues/23).
45
- 2. Improved speed of the RTU\RTUViaTCP part.
49
+ 2. Improved speed of the RTU\RTUViaTCP part.
46
50
 
47
51
  ###2012-06-06 Release 1.1.3
48
52
 
49
- 1. Fixed issue [#22](https://github.com/flipback/rmodbus/issues/22)
53
+ 1. Fixed issue [#22](https://github.com/flipback/rmodbus/issues/22)
50
54
 
51
55
  ###2012-05-12 Release 1.1.2
52
56
 
53
- 1. Fixed issue [#20](https://github.com/flipback/rmodbus/issues/20)
57
+ 1. Fixed issue [#20](https://github.com/flipback/rmodbus/issues/20)
54
58
 
55
59
  ###2012-04-12 Release 1.1.1
56
60
 
57
- 1. Fixed issue [#15](https://github.com/flipback/rmodbus/issues/15)
61
+ 1. Fixed issue [#15](https://github.com/flipback/rmodbus/issues/15)
58
62
 
59
63
  2011-10-29 Release 1.1.0
60
64
  ===================================
@@ -64,11 +68,11 @@ Now this method will wait correct transaction until timeout breaks waiting.
64
68
 
65
69
  ```ruby
66
70
  @cl.debug = true
67
-
71
+
68
72
  @cl.with_slave(1) do |slave_1|
69
73
  slave_1.debug #=> true
70
74
  end
71
-
75
+
72
76
  @cl.with_slave(2) do |slave_2|
73
77
  slave_2.debug = false
74
78
  slave_2.debug #=> false
@@ -146,7 +150,7 @@ The built-in examples assume registers in a particular order but it's trivial to
146
150
  cl.holding_registers[2..3] = [384.620788574219].from_32f
147
151
  cl.holding_registers[2..3] => [20342, 17344]
148
152
  ```
149
-
153
+
150
154
  Support JRuby
151
155
  --------------------------------------
152
156
  Now you could use RModBus on JRuby without RTU implementation.
data/README.md CHANGED
@@ -1,11 +1,11 @@
1
- RModBus [![Build Status](https://secure.travis-ci.org/flipback/rmodbus.png)](http://travis-ci.org/flipback/rmodbus)
1
+ RModBus [![Build Status](https://secure.travis-ci.org/flipback/rmodbus.png)](http://travis-ci.org/flipback/rmodbus) [![Gem Version](https://badge.fury.io/rb/rmodbus.svg)](http://badge.fury.io/rb/rmodbus)
2
2
  ==========================
3
3
 
4
4
  **RModBus** - free implementation of ModBus protocol in pure Ruby.
5
5
 
6
6
  Features
7
7
  ---------------------------
8
- - Ruby 1.8.7, Ruby 1.9, Ruby 2.0, JRuby (without serial ModBus RTU)
8
+ - Ruby 2.1, 2.2 and JRuby (without serial ModBus RTU)
9
9
  - TCP, RTU, RTU over TCP protocols
10
10
  - Client(master) and server(slave)
11
11
  - 16, 32 -bit and float registers
data/lib/rmodbus/slave.rb CHANGED
@@ -243,7 +243,7 @@ module ModBus
243
243
  tried = 0
244
244
  response = ""
245
245
  begin
246
- timeout(@read_retry_timeout, ModBusTimeout) do
246
+ ::Timeout.timeout(@read_retry_timeout, ModBusTimeout) do
247
247
  send_pdu(request)
248
248
  response = read_pdu
249
249
  end
@@ -285,7 +285,7 @@ module ModBus
285
285
  msg = "Byte count is mismatch (expected #{bc}, got #{data.size} bytes)"
286
286
  end
287
287
  when 3,4
288
- rc = request.getword(3)
288
+ rc = request.getword(3)
289
289
  if data.size/2 != rc
290
290
  msg = "Register count is mismatch (expected #{rc}, got #{data.size/2} regs)"
291
291
  end
@@ -307,7 +307,7 @@ module ModBus
307
307
  if exp_addr != got_addr
308
308
  msg = "Address is mismatch (expected #{exp_addr}, got #{got_addr})"
309
309
  end
310
-
310
+
311
311
  exp_quant = request.getword(3)
312
312
  got_quant = response.getword(3)
313
313
  if exp_quant != got_quant
@@ -13,5 +13,5 @@
13
13
  # GNU General Public License for more details.
14
14
  module ModBus
15
15
  # Package version
16
- VERSION = '1.2.7'
16
+ VERSION = '1.2.8'
17
17
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rmodbus
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.7
4
+ version: 1.2.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - A.Timin, J. Sanders, K. Reynolds
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-30 00:00:00.000000000 Z
11
+ date: 2016-09-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
187
187
  version: '0'
188
188
  requirements: []
189
189
  rubyforge_project:
190
- rubygems_version: 2.4.5
190
+ rubygems_version: 2.6.6
191
191
  signing_key:
192
192
  specification_version: 4
193
193
  summary: RModBus - free implementation of protocol ModBus