atrea_control 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d02f9e12d50a1306027858699f71f71435f5f9bd393eb20e157b649ad7111ee
-  data.tar.gz: ef9a19f18361713356cd28d5a6ecd5ff634fd82e703bf9073fba9d2763703dcc
+  metadata.gz: 2a74f7162054ee182984e730f2d1459b911dfb8776300c2b568554be607a1add
+  data.tar.gz: 620367c6b128607aec63a52680bfd9b94376684ed0fa06f80b0f77032fc23e4b
 SHA512:
-  metadata.gz: 807dc186b9810f869df2f9c6ad40b9f15fbbb33a85bfcea73a634a396b15a12e9e7060da2d2e76380789158280ee95313303a5f8b6c2e811b58a242fa3d9f950
-  data.tar.gz: 55a2c020ad45023c840a5f1734146dc4159849fdc667f91d9dc6c16d16359554dcd374e76be95bfa8852fcf3e1435ed20ea838a507e15ff5b50fd811b7814fd2
+  metadata.gz: b2d690b2bdac464a3b37015c54a1b326fbd6b21c6f67eb68cfb0e708e25018eee5e24ed8168796e6b051604f7ca06dc74eae5b5d2561280b538a09020807b65a
+  data.tar.gz: ccb084a5a96f23ae536068782bde603e23222949f03780493f868fa3f260fa85cb32daab8d5cac8a61cdc00bd57deacb9405910fcde8fdfa9fc5dec900bf2ec1

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 ## [Unreleased]
+
+## [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/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

@@ -67,6 +67,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/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
@@ -29,10 +31,13 @@ module AtreaControl
     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
+        # 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
     end

data/lib/atrea_control/version.rb

@@ -2,6 +2,6 @@
 
 module AtreaControl
 
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 
 end

metadata

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