tinderfridge 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3c51a0740fb7714bbb9012543195df2539e310653510dfd6f6b4972aaf4b7dd
-  data.tar.gz: d02f24ea04041305ac5cc7b40c73e651451bca9caff08be1476bc592ac9fe56b
+  metadata.gz: 8269237b83fcfd5a052cdcc9cb9f702bbca2f8e093a918dca330418679cf0496
+  data.tar.gz: ff1e59646d0b04205e1f5151d6710c2f0834e2822dab3e842fd627c5a1878140
 SHA512:
-  metadata.gz: 8d8e2423d20924eb5bcb96083268c337d3dbbb571f395d1d6861ce39de4f2391784de84674b59875fea61a0dc9aca7085aa41c7a7274362394582a6453d5cf5a
-  data.tar.gz: 838806023856f1f566b4f49ce73b04ff6d1bae47b395e7b7d089ee288e1ed0ad85396fda76d7401866dea848b0288fd6be4a6cc1a8e306c0a11a192f09582445
+  metadata.gz: fb2db92d210948ce317538ef9826ec34e2171061f91f01ea4aa6964edd5379f8274e624cdfa5078618d7ebff4029f8c776c404324587c3344fb08ce9d58d9449
+  data.tar.gz: 2944c853d896630f99b2d305a8b76782fb67158199bfa108ca3ff7432e2c5381710bfdecca993d398bd60b26a0bf1eaefb81d8ef7afc1ba49c8574d255d37915

data/lib/tinderfridge/device/configuration.rb

@@ -0,0 +1,16 @@
+module Tinkerforge
+  class Device
+
+    # Returns configuration data for the device (a mutable Hash).
+    def config
+      @config ||= {}
+    end
+
+    # Sets configuration data (a Hash) for the device.
+    def config=(configuration)
+      raise(ArgumentError, 'Invalid configuration') unless configuration.class == Hash
+      @config = configuration
+    end
+
+  end
+end

data/lib/tinderfridge/device.rb

@@ -1,5 +1,6 @@
 require 'tinkerforge/ip_connection'
 require 'tinderfridge/shared/logger'
+require 'tinderfridge/device/configuration'
 
 module Tinkerforge
 
@@ -76,7 +77,7 @@ module Tinkerforge
     def initialize(uid, ipcon, device_identifier, device_display_name)
       original_initialize(uid, ipcon, device_identifier, device_display_name)
       if respond_to? 'get_identity'
-        logger_debug "Created %s '%s'" % [self.class, uid_string]
+        logger_debug "Created #{self.class}"
       end
     end
 
@@ -141,17 +142,6 @@ module Tinkerforge
       ].compact.to_h
     end
 
-    # Returns configuration data for the device (a mutable Hash).
-    def config
-      @config ||= {}
-    end
-
-    # Sets configuration data (a Hash) for the device.
-    def config=(configuration)
-      raise(ArgumentError, 'Invalid configuration') unless configuration.class == Hash
-      @config = configuration
-    end
-
     # Opens the online documentation for the device (Mac OS only).
     #
     # When the URL for the documentation is not known, does nothing.

data/lib/tinderfridge/device_info.txt

@@ -145,3 +145,4 @@
 2165	DC Bricklet 2.0	Tinkerforge::BrickletDCV2	bricklet_dc_v2
 2166	Silent Stepper Bricklet 2.0	Tinkerforge::BrickletSilentStepperV2	bricklet_silent_stepper_v2
 2171	GPS Bricklet 3.0	Tinkerforge::BrickletGPSV3	bricklet_gps_v3
+2174	Industrial Dual AC In Bricklet	Tinkerforge::BrickletIndustrialDualACIn	bricklet_industrial_dual_ac_in

data/lib/tinderfridge/devices/bricklet_industrial_dual_ac_in/bricklet_industrial_dual_ac_in.json

@@ -0,0 +1,11 @@
+{
+  "dimensions": [
+    40,
+    40,
+    16
+  ],
+  "weight": 29,
+  "documentation_en_url": "https://www.tinkerforge.com/en/doc/Hardware/Bricklets/Industrial_Dual_AC_In.html",
+  "versions_identifier": "bricklets:industrial_dual_ac_in",
+  "released": "2023-05-12"
+}

data/lib/tinderfridge/devices/bricklet_segment_display_4x7_v2/bricklet_segment_display_4x7_v2.rb

@@ -61,7 +61,7 @@ module Tinkerforge
           elsif c == ':' and out.size == 16
             colon = true
           else
-            raise "Can not display '#{text}'"
+            raise "Can not display character '#{c}'"
           end
         end
 

data/lib/tinderfridge/ip_connection.rb

@@ -20,9 +20,10 @@ module Tinkerforge
 
     # Creates a TCP/IP connection to the given host and port. Logs events if event logging is enabled.
     def connect(host, port)
-      logger_debug "Connecting to #{host}:#{port}"
+      logger_debug "Connecting to %s:%s"          % [host, port]
+      ts = Time.now.to_f
       original_connect(host, port)
-      logger_debug "Connected  to #{host}:#{port}"
+      logger_debug "Connected  to %s:%s (%5.3fs)" % [host, port, Time.now.to_f - ts]
     end
 
     alias original_disconnect disconnect
@@ -148,14 +149,14 @@ module Tinkerforge
         require "tinkerforge/#{dev_info[2][1]}"
         Tinkerforge.const_get(dev_info[2][0]).new enum_data[0], self
       else
-        logger_warn "Unknown Device Identifier: #{enum_data[5]} (UID: #{enum_data[0]})"
+        logger_warn "[ #{enum_data[0]} ] Unknown Device Identifier: #{enum_data[5]}"
         nil
       end
     end
 
     def logger_log_enum(enum_data)
       logger_debug(
-        "Device '#{enum_data[0]}' " +
+        "[ #{enum_data[0]} ] Device " +
         ['available', 'connected', 'disconnected'][enum_data[6]] +
         ( enum_data[6] == 2 ? '' : " (Device Identifier: #{enum_data[5]})" )
       )

data/lib/tinderfridge/shared/logger.rb

@@ -14,33 +14,48 @@ module Tinkerforge
         Tinkerforge.logger
       end
 
-      def logger_debug(msg)
-        if logger
-          logger.debug(msg)
-        end
+      def logger_debug(message='', &block)
+        logger_log(0, message, &block)
       end
 
-      def logger_info(msg)
-        if logger
-          logger.info(msg)
-        end
+      def logger_info(message='', &block)
+        logger_log(1, message, &block)
       end
 
-      def logger_warn(msg)
-        if logger
-          logger.warn(msg)
-        end
+      def logger_warn(message='', &block)
+        logger_log(2, message, &block)
       end
 
-      def logger_error(msg)
-        if logger
-          logger.error(msg)
-        end
+      def logger_error(message='', &block)
+        logger_log(3, message, &block)
+      end
+
+      def logger_fatal(message='', &block)
+        logger_log(4, message, &block)
       end
 
-      def logger_fatal(msg)
-        if logger
-          logger.fatal(msg)
+      def logger_log(level, message='', &block)
+        return unless logger
+
+        if message.empty? and block_given?
+          message = yield
+        end
+
+        if respond_to? 'uid_string'
+          message = "[ #{uid_string} ] #{message}"
+        end
+
+        case level
+          when 0
+            logger.debug(message)
+          when 1
+            logger.info(message)
+          when 2
+            logger.warn(message)
+          when 3
+            logger.error(message)
+          when 4
+            logger.fatal(message)
         end
       end
 

data/lib/tinderfridge/version.rb

@@ -3,7 +3,7 @@ require 'tinkerforge/version'
 module Tinkerforge
 
   # Tinderfridge version.
-  TINDERFRIDGE_VERSION = '0.15.0'
+  TINDERFRIDGE_VERSION = '0.16.0'
 
   # About Tinkerforge & Tinderfridge.
   def self.about

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinderfridge
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - lllist.eu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tinkerforge
@@ -38,6 +38,7 @@ extra_rdoc_files: []
 files:
 - lib/tinderfridge.rb
 - lib/tinderfridge/device.rb
+- lib/tinderfridge/device/configuration.rb
 - lib/tinderfridge/device_collection.rb
 - lib/tinderfridge/device_info.rb
 - lib/tinderfridge/device_info.txt
@@ -87,6 +88,7 @@ files:
 - lib/tinderfridge/devices/bricklet_industrial_digital_in_4_v2/bricklet_industrial_digital_in_4_v2.json
 - lib/tinderfridge/devices/bricklet_industrial_digital_out_4_v2/bricklet_industrial_digital_out_4_v2.json
 - lib/tinderfridge/devices/bricklet_industrial_dual_0_20ma_v2/bricklet_industrial_dual_0_20ma_v2.json
+- lib/tinderfridge/devices/bricklet_industrial_dual_ac_in/bricklet_industrial_dual_ac_in.json
 - lib/tinderfridge/devices/bricklet_industrial_dual_ac_relay/bricklet_industrial_dual_ac_relay.json
 - lib/tinderfridge/devices/bricklet_industrial_dual_analog_in_v2/bricklet_industrial_dual_analog_in_v2.json
 - lib/tinderfridge/devices/bricklet_industrial_dual_relay/bricklet_industrial_dual_relay.json