waterfurnace_aurora 1.2.3 → 1.4.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: db7465bb9821e07a0c33d5c63cb51318254f5cc9d2c384a99d9a4d95eab2b452
4
- data.tar.gz: 665eab16352134408779673b364abd1f36039619f7e4b34b8e6de1240c904d62
3
+ metadata.gz: a7e5ad408f03461611331d400d450b031c60303c5beab6bb66e9c31664254107
4
+ data.tar.gz: 5afceffbfdd8d1e260b7986a5ecb952e7e7eff5ef1e37e996bf7fdbc57eaaa5a
5
5
  SHA512:
6
- metadata.gz: c369b3c79e7bbb7d77f0f0683029530c66c9d92fc03b059800e48d521ab92201cbae113681d5b3eac2f5cd31fb325d4c7eb64b672eaf743dfc12caab04d73466
7
- data.tar.gz: 299bf75e7e0ae9cef453d2be3654d5a1983f2a4f7ac6ec3762b35b386f7bf60fb3bad3826b0ee91eeffb0f6f7acba8ec3f2e64ed49038e3306bc5fca75e6cc64
6
+ metadata.gz: 1ecbf5e487c96fc722d863a2c7f1ee49398acf1348b7241f94d51b86338c621d1168835e7d4004857eae7790b9fa5b37c5747ed27518f2b10854b060227d0fda
7
+ data.tar.gz: 4f974c805881669cc12cc25061f2f1c19c6710b5ca9ac0c56bad1acc34023a6fb0364bf98b76277af1b7289c0be14b782fb19b8497d45844983f1a2c7c60f21a
@@ -11,11 +11,13 @@ require "yaml"
11
11
  require "aurora/core_ext/string"
12
12
 
13
13
  debug_modbus = false
14
+ web_aid_tool = nil
14
15
 
15
16
  options = OptionParser.new do |opts|
16
17
  opts.banner = "Usage: aurora_mqtt_bridge /path/to/serial/port [options]"
17
18
 
18
19
  opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
20
+ opts.on("--web-aid-tool PORT", "Run web aid tool on given port", :integer) { |v| web_aid_tool = v}
19
21
  opts.on("-v", "--version", "Print version") do
20
22
  puts Aurora::VERSION
21
23
  exit
@@ -36,10 +38,12 @@ end
36
38
  mqtt_uri = ARGV[1]
37
39
 
38
40
  abc = Aurora::ABCClient.new(ARGV[0])
39
- abc.modbus_slave.logger = Logger.new($stdout)
40
- abc.modbus_slave.logger.level = debug_modbus ? :debug : :warn
41
+ Aurora.logger = abc.modbus_slave.logger = Logger.new($stdout)
42
+ Aurora.logger.level = debug_modbus ? :debug : :info
41
43
 
42
44
  class MQTTBridge
45
+ attr_reader :mutex
46
+
43
47
  def initialize(abc, homie)
44
48
  @abc = abc
45
49
  @homie = homie
@@ -86,7 +90,9 @@ class MQTTBridge
86
90
 
87
91
  @abc.refresh
88
92
  publish_basic_attributes
93
+ end
89
94
 
95
+ def join
90
96
  loop do
91
97
  begin
92
98
  @mutex.synchronize do
@@ -282,6 +288,19 @@ class MQTTBridge
282
288
  unit: "W",
283
289
  hass: { sensor: { device_class: :power,
284
290
  state_class: :measurement } })
291
+ node.property("heat-of-extraction",
292
+ "Heat of Extraction",
293
+ :integer,
294
+ @abc.compressor.heat_of_extraction,
295
+ unit: "Btuh",
296
+ hass: { sensor: { state_class: :measurement } })
297
+ node.property("heat-of-rejection",
298
+ "Heat of Rejection",
299
+ :integer,
300
+ @abc.compressor.heat_of_rejection,
301
+ unit: "Btuh",
302
+ hass: { sensor: { state_class: :measurement } })
303
+
285
304
  end
286
305
 
287
306
  next unless @abc.compressor.is_a?(Aurora::Compressor::VSDrive)
@@ -372,6 +391,14 @@ class MQTTBridge
372
391
  hass: { sensor: { device_class: :temperature,
373
392
  state_class: :measurement,
374
393
  entity_category: :diagnostic } })
394
+ node.property("subcool-temperature",
395
+ "SubCool Temperature",
396
+ :float,
397
+ @abc.compressor.subcool_temperature,
398
+ unit: "°F",
399
+ hass: { sensor: { device_class: :temperature,
400
+ state_class: :measurement,
401
+ entity_category: :diagnostic } })
375
402
  node.property("eev-open-percentage",
376
403
  "Electronic Expansion Valve Open Percentage",
377
404
  :integer,
@@ -437,8 +464,7 @@ class MQTTBridge
437
464
 
438
465
  next unless @abc.blower.is_a?(Aurora::Blower::ECM)
439
466
 
440
- presets = %w[blower-only aux-heat]
441
- presets.concat %w[low-compressor high-compressor] unless @abc.iz2?
467
+ presets = %w[blower-only aux-heat low-compressor high-compressor]
442
468
  presets.each do |setting|
443
469
  field = "#{setting.tr("-", "_")}_speed"
444
470
  node.property("#{setting}-speed",
@@ -783,13 +809,20 @@ class MQTTBridge
783
809
  end
784
810
  end
785
811
 
786
- log_level = ARGV.include?("--debug") ? :debug : :warn
787
- Aurora.logger = Logger.new($stdout)
788
- Aurora.logger.level = log_level
789
- abc.modbus_slave.logger = Aurora.logger
790
-
791
812
  device = "aurora-#{abc.serial_number}"
792
813
  homie = MQTT::Homie::Device.new(device, "WaterFurnace", mqtt: mqtt_uri)
793
814
  homie.logger = Aurora.logger
794
815
 
795
- MQTTBridge.new(abc, homie)
816
+ mqtt_bridge = MQTTBridge.new(abc, homie)
817
+
818
+ if web_aid_tool
819
+ Thread.new { mqtt_bridge.join }
820
+
821
+ require "aurora/web_aid_tool"
822
+ Aurora::WebAIDTool.modbus_slave = abc.modbus_slave
823
+ Aurora::WebAIDTool.port = web_aid_tool
824
+ Aurora::WebAIDTool.mutex = mqtt_bridge.mutex
825
+ Aurora::WebAIDTool.run!
826
+ else
827
+ mqtt_bridge.join
828
+ end
data/exe/web_aid_tool CHANGED
@@ -2,16 +2,17 @@
2
2
  # frozen_string_literal: true
3
3
 
4
4
  require "aurora"
5
- require "ccutrer-serialport"
5
+ require "aurora/web_aid_tool"
6
6
  require "logger"
7
7
  require "optparse"
8
- require "yaml"
9
8
 
10
9
  debug_modbus = monitor = ignore_missing_registers = false
10
+ port = 4567
11
11
 
12
12
  options = OptionParser.new do |opts|
13
13
  opts.banner = "Usage: web_aid_tool /path/to/serial/port [options]"
14
14
 
15
+ opts.on("--port PORT", "Which port to listen on (default 4567)", :integer) { |v| port = v }
15
16
  opts.on("--debug-modbus", "Print actual protocol bytes") { debug_modbus = true }
16
17
  opts.on("--monitor", "Print interpreted registers as they are requested, like aurora_monitor") { monitor = true }
17
18
  opts.on("--ignore-missing-registers",
@@ -39,92 +40,7 @@ slave = Aurora::ABCClient.open_modbus_slave(ARGV[0], ignore_missing_registers: i
39
40
  slave.logger = Logger.new($stdout)
40
41
  slave.logger.level = debug_modbus ? :debug : :warn
41
42
 
42
- def parse_query_string(query_string)
43
- query_string.split("&").map { |p| p.split("=") }.to_h
44
- end
45
-
46
- # _don't_ do URI escaping
47
- def encode_result(params)
48
- params.map { |p| p.join("=") }.join("&")
49
- end
50
-
51
- require "sinatra"
52
-
53
- set :public_folder, "html"
54
- set :logging, false
55
-
56
- get "/" do
57
- send_file "html/index.htm"
58
- end
59
-
60
- units = 0
61
-
62
- get "/getunits.cgi" do
63
- encode_result(units: units)
64
- end
65
-
66
- get "/setunits.cgi" do
67
- units = params["units"].to_i
68
- encode_result(error: 0)
69
- end
70
-
71
- get "/config.cgi" do
72
- encode_result(
73
- "AWL Version" => Aurora::VERSION,
74
- "Local Web Version" => 1.08,
75
- "SSID" => nil,
76
- "Units" => units,
77
- "AWL ID" => ARGV[0],
78
- "AWL ID CRC" => nil
79
- )
80
- end
81
-
82
- get "/request.cgi" do
83
- params = parse_query_string(request.query_string)
84
- result = params.slice("cmd", "id", "set", "addr")
85
- result["err"] = nil
86
-
87
- # these are just aliases to get a certain set of registers
88
- case params["cmd"]
89
- when "abcinfo"
90
- params["regs"] = "2;8;88,4"
91
- when "devices"
92
- params["regs"] = "800;803;806,3;812;815;818;824"
93
- end
94
-
95
- case params["cmd"]
96
- when "getregs", "abcinfo", "devices"
97
- queries = params["regs"].split(";").map do |range|
98
- start, length = range.split(",").map(&:to_i)
99
- next start if length.nil?
100
-
101
- start...(start + length)
102
- end
103
- registers = slave.read_multiple_holding_registers(*queries)
104
- if monitor
105
- puts "READING"
106
- puts Aurora.print_registers(registers)
107
- end
108
- result["values"] = registers.values.join(",")
109
- when "putregs"
110
- writes = params["regs"].split(";").map do |write|
111
- write.split(",").map(&:to_i)
112
- end.compact.to_h
113
- if monitor
114
- puts "WRITING"
115
- puts Aurora.print_registers(writes)
116
- end
117
-
118
- writes.each do |(addr, value)|
119
- slave.write_holding_register(addr, value)
120
- end
121
- else
122
- return ""
123
- end
124
-
125
- encode_result(result)
126
- end
127
-
128
- # can't rely on this running automatically when we're installed as a gem,
129
- # because the wrapper script will confuse it
130
- Sinatra::Application.run!
43
+ Aurora::WebAIDTool.modbus_slave = slave
44
+ Aurora::WebAIDTool.monitor = monitor
45
+ Aurora::WebAIDTool.port = port
46
+ Aurora::WebAIDTool.run!
@@ -5,7 +5,12 @@ require "aurora/component"
5
5
  module Aurora
6
6
  module Compressor
7
7
  class GenericCompressor < Component
8
- attr_reader :speed, :watts, :cooling_liquid_line_temperature, :saturated_condensor_discharge_temperature
8
+ attr_reader :speed,
9
+ :watts,
10
+ :cooling_liquid_line_temperature,
11
+ :saturated_condensor_discharge_temperature,
12
+ :heat_of_extraction,
13
+ :heat_of_rejection
9
14
 
10
15
  def initialize(abc, stages)
11
16
  super(abc)
@@ -22,7 +27,7 @@ module Aurora
22
27
 
23
28
  def registers_to_read
24
29
  result = [19, 1134]
25
- result << (1146..1147) if abc.energy_monitoring?
30
+ result.concat([1146..1147, 1154..1157]) if abc.energy_monitoring?
26
31
  result
27
32
  end
28
33
 
@@ -37,7 +42,12 @@ module Aurora
37
42
  end
38
43
  @cooling_liquid_line_temperature = registers[19]
39
44
  @saturated_condensor_discharge_temperature = registers[1134]
40
- @watts = registers[1146] if abc.energy_monitoring?
45
+
46
+ return unless abc.energy_monitoring?
47
+
48
+ @watts = registers[1146]
49
+ @heat_of_extraction = registers[1154]
50
+ @heat_of_rejection = registers[1156]
41
51
  end
42
52
  end
43
53
 
@@ -54,6 +64,7 @@ module Aurora
54
64
  :suction_temperature,
55
65
  :saturated_evaporator_discharge_temperature,
56
66
  :superheat_temperature,
67
+ :subcool_temperature,
57
68
  :eev_open_percentage
58
69
 
59
70
  def initialize(abc)
@@ -65,7 +76,7 @@ module Aurora
65
76
  end
66
77
 
67
78
  def registers_to_read
68
- result = super + [209, 3000..3001, 3322..3327, 3522, 3524, 3808, 3903..3906]
79
+ result = super + [209, 1135..1136, 3000..3001, 3322..3327, 3522, 3524, 3808, 3903..3906]
69
80
  result << 564 if abc.iz2?
70
81
  result
71
82
  end
@@ -86,6 +97,7 @@ module Aurora
86
97
  @suction_temperature = registers[3903]
87
98
  @saturated_evaporator_discharge_temperature = registers[3905]
88
99
  @superheat_temperature = registers[3906]
100
+ @subcool_temperature = registers[registers[30].include?(:rv) ? 1136 : 1135]
89
101
 
90
102
  @iz2_desired_speed = registers[564] if abc.iz2?
91
103
  end
@@ -19,7 +19,7 @@ module Aurora
19
19
  query_id = SecureRandom.uuid
20
20
  mqtt_query = queries.map { |m| m.is_a?(Range) ? "#{m.begin},#{m.count}" : m }.join(";")
21
21
  @mqtt.publish("#{@base_topic}/getregs", "#{query_id}:#{mqtt_query}", qos: 1)
22
- Timeout.timeout(15) do
22
+ Timeout.timeout(5) do
23
23
  result = {}
24
24
  loop do
25
25
  packet = @mqtt.get
@@ -44,10 +44,11 @@ module Aurora
44
44
  totals
45
45
  end
46
46
 
47
+ NEGATABLE = ->(v) { v & 0x8000 == 0x8000 ? v - 0x10000 : v }
47
48
  TO_HUNDREDTHS = ->(v) { v.to_f / 100 }
48
49
  TO_TENTHS = ->(v) { v.to_f / 10 }
50
+ TO_SIGNED_TENTHS = ->(v) { NEGATABLE.call(v).to_f / 10 }
49
51
  TO_LAST_LOCKOUT = ->(v) { v & 0x8000 == 0x8000 ? v & 0x7fff : nil }
50
- NEGATABLE = ->(v) { v & 0x8000 == 0x8000 ? v - 0x10000 : v }
51
52
 
52
53
  def from_bitmask(value, flags)
53
54
  result = []
@@ -59,11 +60,16 @@ module Aurora
59
60
  result
60
61
  end
61
62
 
62
- def to_int32(registers, idx)
63
+ def to_uint32(registers, idx)
63
64
  Aurora&.logger&.warn("Missing register #{idx + 1}") unless registers[idx + 1]
64
65
  (registers[idx] << 16) + registers[idx + 1]
65
66
  end
66
67
 
68
+ def to_int32(registers, idx)
69
+ v = to_uint32(registers, idx)
70
+ v & 0x80000000 == 0x80000000 ? v - 0x100000000 : v
71
+ end
72
+
67
73
  def to_string(registers, idx, length)
68
74
  (idx...(idx + length)).map do |i|
69
75
  next "\ufffd" unless registers[i] # missing data? add unicode invalid character
@@ -488,18 +494,20 @@ module Aurora
488
494
  REGISTER_CONVERTERS = {
489
495
  TO_HUNDREDTHS => [2, 3, 417, 418, 801, 804, 807, 813, 816, 817, 819, 820, 825, 828],
490
496
  method(:dipswitch_settings) => [4, 33],
491
- TO_TENTHS => [19, 20, 401, 419, 501, 502, 567, 740, 745, 746, 747, 900, 901, 903,
492
- 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1119, 1124, 1125, 1134,
493
- 3322, 3323, 3325, 3326, 3327, 3330, 3522, 3903, 3905, 3906,
497
+ TO_TENTHS => [401, 419, 745, 746, 901,
498
+ 1105, 1106, 1107, 1108, 1115, 1116, 1117, 1119,
499
+ 3322, 3323,
494
500
  12_619, 12_620,
495
501
  21_203, 21_204,
496
502
  21_212, 21_213,
497
503
  21_221, 21_222,
498
504
  21_230, 22_131,
499
505
  21_239, 21_240,
500
- 21_248, 21_249,
501
- 31_003,
502
- 31_007, 31_010, 31_013, 31_016, 31_019, 31_022],
506
+ 21_248, 21_249],
507
+ TO_SIGNED_TENTHS => [19, 20, 501, 502, 567, 740, 747, 900, 903,
508
+ 1109, 1110, 1111, 1112, 1113, 1114, 1124, 1125, 1134, 1135, 1136,
509
+ 3325, 3326, 3327, 3330, 3522, 3903, 3905, 3906,
510
+ 31_003, 31_007, 31_010, 31_013, 31_016, 31_019, 31_022],
503
511
  TO_LAST_LOCKOUT => [26],
504
512
  ->(v) { from_bitmask(v, SYSTEM_OUTPUTS) } => [27, 30],
505
513
  ->(v) { from_bitmask(v, SYSTEM_INPUTS) } => [28],
@@ -530,8 +538,8 @@ module Aurora
530
538
  ->(v) { COMPONENT_STATUS[v] } => [800, 803, 806, 812, 815, 818, 824, 827],
531
539
  method(:axb_inputs) => [1103],
532
540
  ->(v) { from_bitmask(v, AXB_OUTPUTS) } => [1104],
533
- ->(v) { TO_TENTHS.call(NEGATABLE.call(v)) } => [1135, 1136],
534
- method(:to_int32) => [1146, 1148, 1150, 1152, 1154, 1156, 1164, 3422, 3424],
541
+ method(:to_uint32) => [1146, 1148, 1150, 1152, 1164, 3422, 3424],
542
+ method(:to_int32) => [1154, 1156],
535
543
  method(:manual_operation) => [3002],
536
544
  method(:thermostat_configuration2) => [12_006],
537
545
  ->(v) { HEATING_MODE[v] } => [12_606, 21_202, 21_211, 21_220, 21_229, 21_238, 21_247],
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Aurora
4
- VERSION = "1.2.3"
4
+ VERSION = "1.4.0"
5
5
  end
@@ -0,0 +1,103 @@
1
+ # frozen_string_literal: true
2
+
3
+ require "sinatra/base"
4
+
5
+ module Aurora
6
+ class WebAIDTool < Sinatra::Base
7
+ class << self
8
+ attr_accessor :modbus_slave, :monitor, :units, :mutex
9
+ end
10
+
11
+ extend Forwardable
12
+ delegate %i[modbus_slave monitor units units= mutex] => "self.class"
13
+
14
+ self.mutex = Mutex.new
15
+ self.units = 0
16
+
17
+ set :public_folder, "html"
18
+ set :logging, false
19
+
20
+ get "/" do
21
+ send_file "html/index.htm"
22
+ end
23
+
24
+ get "/getunits.cgi" do
25
+ encode_result(units: units)
26
+ end
27
+
28
+ get "/setunits.cgi" do
29
+ units = params["units"].to_i
30
+ encode_result(error: 0)
31
+ end
32
+
33
+ get "/config.cgi" do
34
+ encode_result(
35
+ "AWL Version" => Aurora::VERSION,
36
+ "Local Web Version" => 1.08,
37
+ "SSID" => nil,
38
+ "Units" => units,
39
+ "AWL ID" => ARGV[0],
40
+ "AWL ID CRC" => nil
41
+ )
42
+ end
43
+
44
+ get "/request.cgi" do
45
+ params = parse_query_string(request.query_string)
46
+ result = params.slice("cmd", "id", "set", "addr")
47
+ result["err"] = nil
48
+
49
+ # these are just aliases to get a certain set of registers
50
+ case params["cmd"]
51
+ when "abcinfo"
52
+ params["regs"] = "2;8;88,4"
53
+ when "devices"
54
+ params["regs"] = "800;803;806,3;812;815;818;824"
55
+ end
56
+
57
+ case params["cmd"]
58
+ when "getregs", "abcinfo", "devices"
59
+ queries = params["regs"].split(";").map do |range|
60
+ start, length = range.split(",").map(&:to_i)
61
+ next start if length.nil?
62
+
63
+ start...(start + length)
64
+ end
65
+ registers = mutex.synchronize { modbus_slave.read_multiple_holding_registers(*queries) }
66
+ if monitor
67
+ puts "READING"
68
+ puts Aurora.print_registers(registers)
69
+ end
70
+ result["values"] = registers.values.join(",")
71
+ when "putregs"
72
+ writes = params["regs"].split(";").map do |write|
73
+ write.split(",").map(&:to_i)
74
+ end.compact.to_h
75
+ if monitor
76
+ puts "WRITING"
77
+ puts Aurora.print_registers(writes)
78
+ end
79
+
80
+ mutex.synchronize do
81
+ writes.each do |(addr, value)|
82
+ modbus_slave.write_holding_register(addr, value)
83
+ end
84
+ end
85
+ else
86
+ return ""
87
+ end
88
+
89
+ encode_result(result)
90
+ end
91
+
92
+ private
93
+
94
+ def parse_query_string(query_string)
95
+ query_string.split("&").map { |p| p.split("=") }.to_h
96
+ end
97
+
98
+ # _don't_ do URI escaping
99
+ def encode_result(params)
100
+ params.map { |p| p.join("=") }.join("&")
101
+ end
102
+ end
103
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: waterfurnace_aurora
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.3
4
+ version: 1.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Cody Cutrer
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-02-03 00:00:00.000000000 Z
11
+ date: 2022-02-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ccutrer-serialport
@@ -92,6 +92,20 @@ dependencies:
92
92
  - - "~>"
93
93
  - !ruby/object:Gem::Version
94
94
  version: '2.1'
95
+ - !ruby/object:Gem::Dependency
96
+ name: thin
97
+ requirement: !ruby/object:Gem::Requirement
98
+ requirements:
99
+ - - "~>"
100
+ - !ruby/object:Gem::Version
101
+ version: '1.8'
102
+ type: :runtime
103
+ prerelease: false
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ requirements:
106
+ - - "~>"
107
+ - !ruby/object:Gem::Version
108
+ version: '1.8'
95
109
  - !ruby/object:Gem::Dependency
96
110
  name: byebug
97
111
  requirement: !ruby/object:Gem::Requirement
@@ -182,6 +196,7 @@ files:
182
196
  - lib/aurora/registers.rb
183
197
  - lib/aurora/thermostat.rb
184
198
  - lib/aurora/version.rb
199
+ - lib/aurora/web_aid_tool.rb
185
200
  - lib/waterfurnace_aurora.rb
186
201
  homepage: https://github.com/ccutrer/waterfurnace_aurora
187
202
  licenses: