atrea_control 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01f3c707897b8cd1626855caaa5cd4758ebeae0497881dd5164c2fb67a610327
-  data.tar.gz: f567bde666512960777679842366f249b0eff130e5a3fd1c487d5d652ef11687
+  metadata.gz: 47dfda0eb6906708f68c4d43dae4a9ed7249492e32150fb40e244302158a2f10
+  data.tar.gz: dd16ffa80d5b61380a14814690058165d3fc8b2e8ab79f3ca17d4ccf8f218e7e
 SHA512:
-  metadata.gz: 6f4a7ef12bbfde071d91b350e6b100d4528c3275a2642680cf26117ace31ef9ca9ed3072aaad9cb38189f336ec563d4b764db13238248295fc84ecbfe6977f65
-  data.tar.gz: d933b73a8afe23d567aba8f56d1d58060f53699fc5fadaa2eb897e9ff1a6f2e9aa1ed314b2f805a4923d08038c8db8924b7dfc2e5e155c6219a376e2fe05f84e
+  metadata.gz: 109c78b115fc8652a5f2b113c5ac14972ae8e7a469ca4453365edf01a3c8898f3e25c78bf39a7da02947440868ddcdcfa8f9a2b5a3f0be997ece7f6bc3598319
+  data.tar.gz: 696a0c42c1fe2b4881247753f318290e52450299cebeab73c2faffee8e7b151f5f4000e8896fe42ef227184ae881a0a324306f02d49d1aba416061a3620f8e0b

data/CHANGELOG.md

@@ -1,4 +1,23 @@
 ## [Unreleased]
+
+## [2.1.0] - 2022-02-28
+### Added
+- preheating  is ON ?
+- heat temperature
+- current input temperature
+### Removed
+- debug
+
+## [2.0.2] - 2022-01-20
+### Added
+- debug unit values
+- try token-based login (without success)
+
+## [2.0.1] - 2021-12-26
+### Fixed
+- write correct arguments
+
+## [2.0.0] - 2021-12-26
 ### Changed
 - refactored codebase to more readable classes
 - selenium used only for login and then close => obtain SID (and user with unit)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atrea_control (2.0.0)
+    atrea_control (2.1.0)
       i18n (~> 1.8)
       nokogiri (~> 1.12)
       rest-client (~> 2.1)
@@ -26,59 +26,59 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mime-types-data (3.2022.0105)
     netrc (0.11.0)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.3-x86_64-linux)
       racc (~> 1.4)
     parallel (1.21.0)
-    parser (3.0.3.2)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
     racc (1.6.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.2.1)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.24.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.25.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.0)
-      parser (>= 3.0.1.1)
-    rubocop-rspec (2.6.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-rspec (2.9.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     rubyzip (2.3.2)
@@ -91,7 +91,7 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8)

data/lib/atrea_control/duplex/login.rb

@@ -1,3 +1,5 @@
+require "digest"
+require "rest-client"
 require "selenium-webdriver"
 
 module AtreaControl
@@ -23,6 +25,17 @@ module AtreaControl
         @login = login
         @password = password
       end
+      #
+      # def crypto_password
+      #   md5 = Digest::MD5.new
+      #   md5 << "\r\n"
+      #   md5 << @password
+      #   md5.hexdigest
+      # end
+      #
+      # def token
+      #   RestClient.get "#{AtreaControl::Duplex::CONTROL_URI}/config/login.cgi", params: { magic: crypto_password }
+      # end
 
       def user
         raise AtreaControl::Error, "Must be logged in" unless login

data/lib/atrea_control/duplex/request.rb

@@ -4,6 +4,7 @@ module AtreaControl
   module Duplex
     # Process request with duplex unit itself. Handle response
     class Request
+      include AtreaControl::Logger
 
       # @param [String, Integer] user_id
       # @param [String, Integer] unit_id

data/lib/atrea_control/duplex/unit.rb

@@ -6,7 +6,9 @@ module AtreaControl
     class Unit
       include AtreaControl::Logger
 
-      attr_reader :current_mode, :current_power, :outdoor_temperature
+      attr_reader :current_mode, :current_power, :outdoor_temperature, :preheat_temperature, :input_temperature
+      # @return [Boolean] preheating air is ON ?
+      attr_reader :preheating
       # @return [DateTime] store time of last update
       attr_reader :valid_for
       # @return [UserCtrl]
@@ -35,20 +37,28 @@ module AtreaControl
         current_power || values[:current_power]
       end
 
+      def preheating?
+        preheating || values[:preheating]
+      end
+
       # @param [String] value 0 - power-off; 1 - automat
       def mode=(value)
-        v = parser.input(@user_ctrl.sensors["mode_input"], value.to_s)
-        write(v)
+        v = [parser.input(@user_ctrl.sensors["mode_input"], value.to_s)]
+        v << parser.input(@user_ctrl.sensors["mode_switch"], "2")
+        write(*v)
       end
 
       def power=(value)
-        v = [parser.input(@user_ctrl.sensors["power_input"], value.to_s)]
-        v << parser.input(@user_ctrl.sensors["mode_switch"], "2")
+        v = parser.input(@user_ctrl.sensors["power_input"], value.to_s)
         write(v)
       end
 
+      def parsed
+        parser.values(read.body)
+      end
+
       def values
-        parser.values(read.body).each do |name, value|
+        parsed.each do |name, value|
           instance_variable_set :"@#{name}", value
         end
         as_json
@@ -59,6 +69,9 @@ module AtreaControl
           current_mode: current_mode,
           current_power: current_power,
           outdoor_temperature: outdoor_temperature,
+          preheat_temperature: preheat_temperature,
+          input_temperature: input_temperature,
+          preheating: preheating,
           valid_for: valid_for,
         }
       end
@@ -67,6 +80,13 @@ module AtreaControl
         values.to_json(*args)
       end
 
+      # Additional "parameters" for each sensors
+      # @note its changed in time ?
+      def params
+        response = request.call(_t: "user/params.xml")
+        Nokogiri::XML response.body
+      end
+
       private
 
       def parser
@@ -85,7 +105,7 @@ module AtreaControl
       # @param [Array<String>] values in format SENSOR0000VALUE
       def write(*values)
         inputs = values.to_h { |i| [i, nil] }
-        logger.debug("set RD5 #{inputs.keys}")
+        logger.debug("set RD5 #{inputs}")
         request.call({ _t: "config/xml.cgi", _w: 1 }.merge(inputs))
       end
     end

data/lib/atrea_control/duplex/user_ctrl.rb

@@ -54,8 +54,14 @@ module AtreaControl
         power_input = power.xpath("onchange").text[/getUrlPar\('(\w+)',val\)/, 1]
         m = mode.xpath("onchange").text.match(/getUrlPar\('(\w+)',val\).*getUrlPar\(.(\w+).,2\)/)
 
+        preheat_temperature = user_ctrl.xpath("//body/content/i[@title='$requiredTemp']")
+
+        input_temp = user_ctrl.xpath("//body/content/i[@title='$inletTemp']") # "I10200"
+        input_temperature = input_temp.xpath("displayval").text[/val=values\.(\w\d+);/, 1]
         @sensors = {
           "outdoor_temperature" => outdoor_temp.attribute("id").value, # "I10208"
+          "preheat_temperature" => preheat_temperature.attribute("id").value, # "H10706"
+          "input_temperature" => input_temperature,
           "current_power" => power.attribute("id").value, # "H10704"
           "current_mode" => mode.attribute("id").value, # "H10705"
           "current_mode_switch" => switch_mode, # "H10712"

data/lib/atrea_control/sensor_parser.rb

@@ -6,6 +6,8 @@ module AtreaControl
   # Call RD5 unit ang get current sensors values
   #   parse it and return Hash
   class SensorParser
+    include AtreaControl::Logger
+
     # @param [AtreaControl::Duplex::UserCtrl] user_ctrl
     def initialize(user_ctrl)
       @user_ctrl = user_ctrl
@@ -28,13 +30,21 @@ module AtreaControl
     # 				values[key]=values[key]/params[key].coef;
     def parse(xml)
       xml = Nokogiri::XML xml
-      @user_ctrl.sensors.transform_values do |id|
-        value = xml.xpath("//O[@I=\"#{id}\"]/@V").last&.value.to_i
+      parsed = @user_ctrl.sensors.transform_values do |id|
+        # node = xml.xpath("//O[@I=\"#{id}\"]/@V").last
+        node = xml.xpath("//O[@I=\"#{id}\"]").last
+        # logger.debug node.to_s
+        value = node.attribute("V").value.to_i
         value -= 65_536 if value > 32_767
         # value -= 0 if "offset"
-        # value -= 0 if "coef"
+        # value = value / coef if "coef"
         value
       end
+      preheating = %w[C10200 C10202 C10215 C10217].any? do |i|
+        xml.xpath("//O[@I=\"#{i}\"]/@V").last&.value == "1"
+      end
+      parsed["preheating"] = preheating
+      parsed
     end
 
     # @param [Hash] values
@@ -44,6 +54,9 @@ module AtreaControl
         "current_mode" => parse_current_mode(values),
         "current_power" => values["current_power"].to_f,
         "outdoor_temperature" => values["outdoor_temperature"].to_f / 10.0,
+        "preheat_temperature" => values["preheat_temperature"].to_f / 10.0,
+        "input_temperature" => values["input_temperature"].to_f / 10.0,
+        "preheating" => !!values["preheating"],
         "valid_for" => Time.now,
       }
     end
@@ -53,10 +66,10 @@ module AtreaControl
     # `current_mode_switch` = mode trigger by wall switch or something similar
     # `current_mode` = is common "builtin" mode
     def parse_current_mode(values)
-      if values['current_mode_switch'].positive?
-        @user_ctrl.user_modes[values['current_mode_switch'].to_s]
+      if values["current_mode_switch"].positive?
+        @user_ctrl.user_modes[values["current_mode_switch"].to_s]
       else
-        @user_ctrl.modes[values['current_mode'].to_s]
+        @user_ctrl.modes[values["current_mode"].to_s]
       end
     end
   end

data/lib/atrea_control/version.rb

@@ -2,6 +2,6 @@
 
 module AtreaControl
 
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atrea_control
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-25 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n