waterfurnace_aurora 0.3.1 → 0.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/exe/aurora_mqtt_bridge +16 -5
- data/lib/aurora/abc_client.rb +4 -0
- data/lib/aurora/modbus/slave.rb +1 -2
- data/lib/aurora/version.rb +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 47ba3e76677f00093692ed3f75daac6629fc77c71102a200efe88a846d271045
|
4
|
+
data.tar.gz: 6183cec3c273fafa6eb529e3e9fb0c6769941a51bd22d808528ffbd0f75b3fad
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6a961b2e49137c51cb888f0bf3a551c530be8eed02cc9fc978c38ab0ef3b00c582b90c1d44466f126f90bed0934632b22fe976166b3c59ded871b61b2ee6202c
|
7
|
+
data.tar.gz: f275fe6dce4542e0212abd90b7346c7e6970e23af7b657bc4c05ed3dd9682b36ad87e68abcbf03644e5fff62af89d2149edc0aa16605f33021734a52c81ca263
|
data/exe/aurora_mqtt_bridge
CHANGED
@@ -29,7 +29,7 @@ class MQTTBridge
|
|
29
29
|
@homie = homie
|
30
30
|
@mutex = Mutex.new
|
31
31
|
|
32
|
-
@homie.
|
32
|
+
@homie.out_of_band_topic_proc = lambda do |topic, value|
|
33
33
|
@mutex.synchronize do
|
34
34
|
case topic
|
35
35
|
when /\$modbus$/
|
@@ -62,9 +62,10 @@ class MQTTBridge
|
|
62
62
|
end
|
63
63
|
end
|
64
64
|
rescue StandardError => e
|
65
|
-
|
66
|
-
end
|
65
|
+
logger.error("failed processing message: #{e}\n#{e.backtrace}")
|
66
|
+
end
|
67
67
|
|
68
|
+
@abc.refresh
|
68
69
|
publish_basic_attributes
|
69
70
|
|
70
71
|
loop do
|
@@ -75,6 +76,7 @@ class MQTTBridge
|
|
75
76
|
current_mode
|
76
77
|
dhw_water_temperature
|
77
78
|
entering_air_temperature
|
79
|
+
entering_water_temperature
|
78
80
|
fan_speed
|
79
81
|
leaving_air_temperature
|
80
82
|
leaving_water_temperature
|
@@ -99,7 +101,7 @@ class MQTTBridge
|
|
99
101
|
end
|
100
102
|
end
|
101
103
|
rescue => e
|
102
|
-
|
104
|
+
logger.error("got garbage: #{e}; #{e.backtrace}")
|
103
105
|
exit 1
|
104
106
|
end
|
105
107
|
sleep(5)
|
@@ -186,4 +188,13 @@ class MQTTBridge
|
|
186
188
|
end
|
187
189
|
end
|
188
190
|
|
189
|
-
|
191
|
+
log_level = ARGV.include?("--debug") ? :debug : :warn
|
192
|
+
logger = Logger.new($stdout)
|
193
|
+
logger.level = log_level
|
194
|
+
slave.logger = logger
|
195
|
+
|
196
|
+
device = "aurora-#{abc.serial_number}"
|
197
|
+
homie = MQTT::Homie::Device.new(device, "Aurora MQTT Bridge", mqtt: mqtt_uri)
|
198
|
+
homie.logger = logger
|
199
|
+
|
200
|
+
MQTTBridge.new(abc, homie)
|
data/lib/aurora/abc_client.rb
CHANGED
@@ -3,6 +3,7 @@
|
|
3
3
|
module Aurora
|
4
4
|
class ABCClient
|
5
5
|
attr_reader :modbus_slave,
|
6
|
+
:serial_number,
|
6
7
|
:zones,
|
7
8
|
:current_mode,
|
8
9
|
:fan_speed,
|
@@ -27,6 +28,9 @@ module Aurora
|
|
27
28
|
@modbus_slave = modbus_slave
|
28
29
|
@modbus_slave.read_retry_timeout = 15
|
29
30
|
@modbus_slave.read_retries = 2
|
31
|
+
registers_array = @modbus_slave.holding_registers[105...110]
|
32
|
+
registers = registers_array.each_with_index.map { |r, i| [i + 105, r] }.to_h
|
33
|
+
@serial_number = Aurora.transform_registers(registers)[105]
|
30
34
|
iz2_zone_count = @modbus_slave.holding_registers[483]
|
31
35
|
# TODO: better detect IZ2/Non-IZ2
|
32
36
|
@zones = if iz2_zone_count > 1
|
data/lib/aurora/modbus/slave.rb
CHANGED
@@ -17,7 +17,7 @@ module Aurora
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def holding_registers
|
20
|
-
WFProxy.new(self, :holding_register)
|
20
|
+
@holding_registers ||= WFProxy.new(self, :holding_register)
|
21
21
|
end
|
22
22
|
end
|
23
23
|
|
@@ -33,7 +33,6 @@ module Aurora
|
|
33
33
|
def read_rtu_response(io)
|
34
34
|
# Read the slave_id and function code
|
35
35
|
msg = read(io, 2)
|
36
|
-
log logging_bytes(msg)
|
37
36
|
|
38
37
|
function_code = msg.getbyte(1)
|
39
38
|
case function_code
|
data/lib/aurora/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: waterfurnace_aurora
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Cody Cutrer
|
@@ -30,14 +30,14 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.4.
|
33
|
+
version: 1.4.4
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 1.4.
|
40
|
+
version: 1.4.4
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: net-telnet-rfc2217
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -58,14 +58,14 @@ dependencies:
|
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '2.
|
61
|
+
version: '2.1'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: '2.
|
68
|
+
version: '2.1'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: byebug
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|