atrea_control 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d02f9e12d50a1306027858699f71f71435f5f9bd393eb20e157b649ad7111ee
-  data.tar.gz: ef9a19f18361713356cd28d5a6ecd5ff634fd82e703bf9073fba9d2763703dcc
+  metadata.gz: de4b8916b41e5f8089e213a57af22064c85e4cfd21b169b4cbb8a31bf0959006
+  data.tar.gz: e90ea88c74d8602e8add47e0284fa3313b2e11ca085e0bedba8efe010c26e9ff
 SHA512:
-  metadata.gz: 807dc186b9810f869df2f9c6ad40b9f15fbbb33a85bfcea73a634a396b15a12e9e7060da2d2e76380789158280ee95313303a5f8b6c2e811b58a242fa3d9f950
-  data.tar.gz: 55a2c020ad45023c840a5f1734146dc4159849fdc667f91d9dc6c16d16359554dcd374e76be95bfa8852fcf3e1435ed20ea838a507e15ff5b50fd811b7814fd2
+  metadata.gz: 17b48f07d42c1d90d3ccca8f2d4de0080d50a7528dc194ecd5ca41affcb0e15b6c1aeefed3e85930119bd5f33e7315d23bae1ff73b19086f671cad7eadc60bcc
+  data.tar.gz: 933ded9e14e5f8a6e1e67ad1621bea251b37c2c27c7f1a6b9ca063c4f0544b5db088821651096eb0050bb51cdb9b49c6a675b603e91340ed38e6f44d6edd3c4d

data/CHANGELOG.md

@@ -1,4 +1,24 @@
 ## [Unreleased]
+
+## [2.1.1] - 2022-08-21
+### Fixed
+- override "schedule program" by "temporary"
+### Changed
+- dependencies update
+
+## [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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atrea_control (2.0.1)
+    atrea_control (2.1.0)
       i18n (~> 1.8)
       nokogiri (~> 1.12)
       rest-client (~> 2.1)
@@ -10,12 +10,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     childprocess (4.1.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
@@ -24,85 +24,90 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     hashdiff (1.0.1)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.2)
     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.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.0.3.2)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (5.0.0)
     racc (1.6.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.5.0)
     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.1)
       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.35.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.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 (~> 1.19)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
     rubyzip (2.3.2)
-    selenium-webdriver (4.1.0)
+    selenium-webdriver (4.4.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       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)
-    unicode-display_width (2.1.0)
-    webmock (3.14.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.2.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    websocket (1.2.9)
 
 PLATFORMS
   x86_64-darwin-19
+  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
@@ -116,4 +121,4 @@ DEPENDENCIES
   webmock (~> 3.14)
 
 BUNDLED WITH
-   2.2.17
+   2.3.11

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/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,6 +37,10 @@ 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)]
@@ -43,12 +49,18 @@ module AtreaControl
       end
 
       def power=(value)
-        v = parser.input(@user_ctrl.sensors["power_input"], value.to_s)
-        write(v)
+        v = [parser.input(@user_ctrl.sensors["power_input"], value.to_s)]
+        # overtake schedule control
+        v << "H1070000002" if value.to_i.positive?
+        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 +71,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 +82,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

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.1"
+  VERSION = "2.1.1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atrea_control
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-25 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Get data control.atrea.eu