waterfurnace_aurora 1.3.0 → 1.4.1

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: b47f532c4646441ceefb753b5de6bd9b18e335d25c4e48219509f778e7ddebb7
4
- data.tar.gz: 11988da61f95ac76957ca31e829ca521635431871b7c0f1bf800c78a66118362
3
+ metadata.gz: a4ef5fcf0d051051e1d2b07a2523a7bdedeea3cfaab48de2e19b83390e5c8ed0
4
+ data.tar.gz: '0878a54174573799ced9e84c33b5eea9681a5f0b17267910e811d8ea2ee782d2'
5
5
  SHA512:
6
- metadata.gz: b6c42b8fd67cb1440a7253cd5454d74702d84430ced9a005b6c7a8424be979da57718e08a8e2a9e92dbba8c8b14ab705eb9442676e01e6f428d00d16a5d0493c
7
- data.tar.gz: b0c40faa87893b6a2d2468d7c0ad3573fe11412ee715be9a89367c084ac21907db5c72eb546a4727d9c8fa163bf714d8f19b3f42040684a34f66116c82c3916a
6
+ metadata.gz: c0ed9e08f56e21efa081885f0545db7312e252f8f6779161ed40f004b1f50d7f571548089b9c8bbbfb3f968fbf8c16402b46cb735c52128e219088c32a330da4
7
+ data.tar.gz: 84585586ae2f09560f31bbdd2c165fe2fdef6345774faf078ab3fc2426ca1fad8622d33bc80612c6fd3f726d9fc9cead08dbde58da812a8217da8472b3ee16ef
@@ -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
@@ -803,13 +809,20 @@ class MQTTBridge
803
809
  end
804
810
  end
805
811
 
806
- log_level = ARGV.include?("--debug") ? :debug : :warn
807
- Aurora.logger = Logger.new($stdout)
808
- Aurora.logger.level = log_level
809
- abc.modbus_slave.logger = Aurora.logger
810
-
811
812
  device = "aurora-#{abc.serial_number}"
812
813
  homie = MQTT::Homie::Device.new(device, "WaterFurnace", mqtt: mqtt_uri)
813
814
  homie.logger = Aurora.logger
814
815
 
815
- 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!
@@ -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.3.0"
4
+ VERSION = "1.4.1"
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
+ self.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.3.0
4
+ version: 1.4.1
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-07 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: