waterfurnace_aurora 0.6.0 → 0.6.1
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 +2 -3
- data/lib/aurora/blower.rb +7 -14
- data/lib/aurora/humidistat.rb +6 -5
- 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: cc02021d49b86596b6f1d40c244b3e3671280c578cc9cd869fc936f2c219a0bf
|
4
|
+
data.tar.gz: 795aa42ff626534a4750eb181e5299f82d0603f677a6b9d1fb2d8418046643c6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 978a3a910d919a85a79f1d272ecec65b68908472492e25dcc8f7bc8f1ddc414f82ef1c22268e092ce026c0dbb90f48c73e9ede9f30144df3f2978fb5abf70b6b
|
7
|
+
data.tar.gz: 93336e684ab033ca48539738634e8835deffaac4fb5c7275269086e21a134f1f5ad2793c4ae859a806c385dec88811ed720ec837dda0c5f7cd4a068e24cb3338
|
data/exe/aurora_mqtt_bridge
CHANGED
@@ -162,9 +162,8 @@ class MQTTBridge
|
|
162
162
|
end
|
163
163
|
|
164
164
|
@blower = @homie.node("blower", "Blower", @abc.blower.type) do |node|
|
165
|
-
|
166
|
-
|
167
|
-
else
|
165
|
+
node.property("running", "Blower is running", :boolean, @abc.blower.running?)
|
166
|
+
if @abc.blower.respond_to?(:speed)
|
168
167
|
node.property("speed", "Current blower speed", :integer, @abc.blower.speed, format: @abc.blower.speed_range)
|
169
168
|
end
|
170
169
|
node.property("watts", "Energy Usage", :integer, @abc.blower.watts, unit: "W") if @abc.energy_monitoring?
|
data/lib/aurora/blower.rb
CHANGED
@@ -4,8 +4,9 @@ require "aurora/component"
|
|
4
4
|
|
5
5
|
module Aurora
|
6
6
|
module Blower
|
7
|
-
class
|
8
|
-
attr_reader :type, :watts
|
7
|
+
class PSC < Component
|
8
|
+
attr_reader :type, :watts, :running
|
9
|
+
alias running? running
|
9
10
|
|
10
11
|
def initialize(abc, type)
|
11
12
|
super(abc)
|
@@ -22,19 +23,11 @@ module Aurora
|
|
22
23
|
|
23
24
|
def refresh(registers)
|
24
25
|
@watts = registers[1148] if abc.energy_monitoring?
|
26
|
+
@running = registers[30].include?(:blower)
|
25
27
|
end
|
26
28
|
end
|
27
29
|
|
28
|
-
class
|
29
|
-
attr_reader :running
|
30
|
-
alias running? running
|
31
|
-
|
32
|
-
def refresh(registers)
|
33
|
-
@running = registers[30].include?(:g)
|
34
|
-
end
|
35
|
-
end
|
36
|
-
|
37
|
-
class FiveSpeed < GenericBlower
|
30
|
+
class FiveSpeed < PSC
|
38
31
|
attr_reader :speed
|
39
32
|
|
40
33
|
def speed_range
|
@@ -49,7 +42,7 @@ module Aurora
|
|
49
42
|
3
|
50
43
|
elsif outputs.include?(:cc)
|
51
44
|
2
|
52
|
-
elsif outputs.include?(:
|
45
|
+
elsif outputs.include?(:blower)
|
53
46
|
1
|
54
47
|
else
|
55
48
|
0
|
@@ -57,7 +50,7 @@ module Aurora
|
|
57
50
|
end
|
58
51
|
end
|
59
52
|
|
60
|
-
class ECM <
|
53
|
+
class ECM < PSC
|
61
54
|
attr_reader :speed, :blower_only_speed, :low_compressor_speed, :high_compressor_speed, :aux_heat_speed,
|
62
55
|
:iz2_desired_speed
|
63
56
|
|
data/lib/aurora/humidistat.rb
CHANGED
@@ -42,9 +42,10 @@ module Aurora
|
|
42
42
|
@dehumidifer_running = dehumidifier? && outputs.include?(:accessory2)
|
43
43
|
|
44
44
|
base = abc.iz2? ? 31_109 : 12_309
|
45
|
-
|
46
|
-
@
|
47
|
-
@
|
45
|
+
humidifier_settings_register = abc.iz2? ? 21_114 : 12_309
|
46
|
+
@humidifier_settings = registers[humidifier_settings_register]&.last&.[](2..)&.to_i(16)
|
47
|
+
@humidifier_mode = registers[humidifier_settings_register]&.include?(:auto_humidification) ? :auto : :manual
|
48
|
+
@dehumidifier_mode = registers[humidifier_settings_register]&.include?(:auto_dehumidification) ? :auto : :manual
|
48
49
|
|
49
50
|
@humidification_target = registers[base + 1]&.[](:humidification_target)
|
50
51
|
@dehumidification_target = registers[base + 1]&.[](:dehumidification_target)
|
@@ -64,7 +65,7 @@ module Aurora
|
|
64
65
|
|
65
66
|
# start with the prior value of the register, since I'm not sure what
|
66
67
|
# else is stuffed in there
|
67
|
-
raw_value = @humidifier_settings
|
68
|
+
raw_value = @humidifier_settings
|
68
69
|
raw_value |= 0x4000 if humidifier_mode == :auto
|
69
70
|
raw_value |= 0x8000 if dehumidifier_mode == :auto
|
70
71
|
holding_registers[abc.iz2? ? 21_114 : 12_309] = raw_value
|
@@ -84,7 +85,7 @@ module Aurora
|
|
84
85
|
raise ArgumentError unless (15..50).include?(humidification_target)
|
85
86
|
raise ArgumentError unless (35..65).include?(dehumidification_target)
|
86
87
|
|
87
|
-
holding_registers[iz2? ? 21_115 : 12_310] = (humidification_target << 8) + dehumidification_target
|
88
|
+
holding_registers[abc.iz2? ? 21_115 : 12_310] = (humidification_target << 8) + dehumidification_target
|
88
89
|
@humidification_target = humidification_target
|
89
90
|
@dehumidification_target = dehumidification_target
|
90
91
|
end
|
data/lib/aurora/version.rb
CHANGED