waterfurnace_aurora 0.7.6 → 0.7.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/aurora/abc_client.rb +3 -3
- data/lib/aurora/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7af20433d8163a332a3d09c36b23af07b95d9beb088d4a0ce69436a54e46e434
|
|
4
|
+
data.tar.gz: 29a7c84feb1f58ecb6b0a44538f1a530add179ea95b0285f1739f172730b2d24
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 81c6604273350396388be239846997ee151f1b92ac47c270977e63347a5eeea81025eefece7d60cb3f2e374bca65816548bf3b8cc36bf249a1dbec57fbc0cb3a
|
|
7
|
+
data.tar.gz: 75ac82e3784f556b13274d5de4e64889023963286a3787e2521fef74ca5fb19ff0c49ea40a35fef7ea95bcae80b463ff84d15e67e4ddce098ffd69a3ead95843
|
data/lib/aurora/abc_client.rb
CHANGED
|
@@ -63,20 +63,20 @@ module Aurora
|
|
|
63
63
|
registers = {}
|
|
64
64
|
queries.each do |subquery|
|
|
65
65
|
registers.merge!(modbus_slave.read_multiple_holding_registers(*subquery))
|
|
66
|
-
rescue ::ModBus::Errors::IllegalDataAddress
|
|
66
|
+
rescue ::ModBus::Errors::IllegalDataAddress, ::ModBus::Errors::IllegalFunction
|
|
67
67
|
# maybe this unit doesn't respond to all the addresses we want?
|
|
68
68
|
raise unless implicit
|
|
69
69
|
|
|
70
70
|
# try each query individually
|
|
71
71
|
subquery.each do |subsubquery|
|
|
72
72
|
registers.merge!(modbus_slave.read_multiple_holding_registers(subsubquery))
|
|
73
|
-
rescue ::ModBus::Errors::IllegalDataAddress
|
|
73
|
+
rescue ::ModBus::Errors::IllegalDataAddress, ::ModBus::Errors::IllegalFunction
|
|
74
74
|
next unless try_individual
|
|
75
75
|
|
|
76
76
|
# seriously?? try each register individually
|
|
77
77
|
subsubquery.each do |i|
|
|
78
78
|
registers[i] = modbus_slave.holding_registers[i]
|
|
79
|
-
rescue ::ModBus::Errors::IllegalDataAddress
|
|
79
|
+
rescue ::ModBus::Errors::IllegalDataAddress, ::ModBus::Errors::IllegalFunction
|
|
80
80
|
next
|
|
81
81
|
end
|
|
82
82
|
end
|
data/lib/aurora/version.rb
CHANGED