tinderfridge 0.15.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3c51a0740fb7714bbb9012543195df2539e310653510dfd6f6b4972aaf4b7dd
-  data.tar.gz: d02f24ea04041305ac5cc7b40c73e651451bca9caff08be1476bc592ac9fe56b
+  metadata.gz: d72a23621805a4527cf80a4e35d0ad49fff4cb362a94fe1e916a36130f5fe844
+  data.tar.gz: 8e5422de11c1e78dcedfe354fbd35829bf2f09254c33363040091e83d595cc6c
 SHA512:
-  metadata.gz: 8d8e2423d20924eb5bcb96083268c337d3dbbb571f395d1d6861ce39de4f2391784de84674b59875fea61a0dc9aca7085aa41c7a7274362394582a6453d5cf5a
-  data.tar.gz: 838806023856f1f566b4f49ce73b04ff6d1bae47b395e7b7d089ee288e1ed0ad85396fda76d7401866dea848b0288fd6be4a6cc1a8e306c0a11a192f09582445
+  metadata.gz: 576e9b5d51bc93fee968f6a0788dd5bb71c451b0b5e4860f789e1603b1d2ce98cf48e0e8d7825ede45ae4510b3b15c54920f18eb153d21fc1d3424e6f5f1f06a
+  data.tar.gz: 908a10df2b8722fad35b5caf3e243c4d202658f2fe9a53575a59b905cb6e61962dcf1a46b8b5a6b0995f9decb7ad7606fff5ab1b7442ad747d46010500a72189

data/lib/tinderfridge/device/configuration.rb

@@ -0,0 +1,44 @@
+module Tinkerforge
+  class Device
+
+    # Returns settings for the device (a mutable Hash).
+    def settings
+      @settings ||= {}
+    end
+
+    alias config settings
+
+    # Defines settings for the device (a Hash).
+    def settings=(settings_hash)
+      raise(ArgumentError, 'Invalid settings') unless settings_hash.class == Hash
+      @settings = settings_hash
+    end
+
+    alias config= settings=
+
+    # Configures the device by applying settings.
+    def configure
+      if settings.any?
+        logger_debug "Configuring #{settings.keys.map(&:to_s).join(', ')}"
+        case status_led_api_variety
+          when 2
+            if settings.has_key? 'status_led_config'
+              set_status_led_config settings['status_led_config'].to_i
+            end
+          when 1
+            if settings.has_key? 'status_led_enabled'
+              if !!settings['status_led_enabled']
+                enable_status_led
+              else
+                disable_status_led
+              end
+            end
+        end
+        if respond_to?(:custom_configure, true)
+          custom_configure
+        end
+      end
+    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_collection.rb

@@ -79,21 +79,30 @@ module Tinkerforge
       smap 'state'
     end
 
-    # Returns configuration data of devices in the collection.
-    def config
-      smap 'config'
+    # Returns settings for the devices in the collection.
+    def settings
+      smap 'settings'
     end
 
-    # Sets configuration data of devices in the collection.
-    def config=(configuration)
-      raise ArgumentError, 'invalid configuration' unless (configuration.class == Hash)
+    alias config settings
+
+    # Defines settings for the devices in the collection.
+    def settings=(settings_hash)
+      raise ArgumentError, 'invalid settings' unless (settings_hash.class == Hash)
       each do |k,v|
-        if configuration[k]
-          v.config = configuration[k]
+        if settings_hash[k]
+          v.settings = settings_hash[k]
         end
       end
     end
 
+    alias config= settings=
+
+    # Configures the devices in the collection by applying settings.
+    def configure
+      smap 'configure'
+    end
+
     # Opens the online documentation for the devices in the collection (Mac OS only).
     #
     # When the URL for a device's 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_ambient_light_v3/bricklet_ambient_light_v3.rb

@@ -16,6 +16,12 @@ module Tinkerforge
 
     private
 
+    def custom_configure
+      if settings.has_key? 'configuration'
+        set_configuration *settings['configuration']
+      end
+    end
+
     def _view_21x8
       s = state
       "AmbiLightV3  #{uid_string.rjust 8}\n\n\n" +

data/lib/tinderfridge/devices/bricklet_barometer_v2/bricklet_barometer_v2.rb

@@ -17,6 +17,12 @@ module Tinkerforge
 
     private
 
+    def custom_configure
+      if settings.has_key? 'sensor_configuration'
+        set_sensor_configuration *settings['sensor_configuration']
+      end
+    end
+
     def _view_21x8
       "BaroV2       #{uid_string.rjust 8}\n\n\n" +
       ('%.2f hPa' % [get_air_pressure*0.001]).center(21)

data/lib/tinderfridge/devices/bricklet_gps_v2/bricklet_gps_v2.rb

@@ -1,58 +1,9 @@
-module Tinkerforge
+require 'tinderfridge/shared/gps'
 
+module Tinkerforge
   class BrickletGPSV2
 
-    # Returns the device's state.
-    def state
-      super.merge(
-        'fix_led_config' => get_fix_led_config,
-        'fix'            => fix?,
-      )
-    end
-
-    # Returns true if a fix is available.
-    def fix?
-      get_status[0]
-    end
-
-    # Returns latitude and longitude as reported by the GPS Bricklet.
-    #
-    # Nil when there is no fix (position not determined).
-    def coordinates
-      if fix?
-        c = get_coordinates
-        [
-          c[0] / (c[1] == 'N' ? 1000000.0 : -1000000.0),
-          c[2] / (c[3] == 'E' ? 1000000.0 : -1000000.0)
-        ]
-      else
-        nil
-      end
-    end
-
-    # Returns a Time object representing the time as reported by the GPS Bricklet.
-    def time
-      # FIXME: This will not work after 31-Dec-2099.
-      dt = get_date_time.map &:to_s
-      dt = dt[0].rjust(6,'0').unpack('a2a2a2').reverse + dt[1].rjust(9,'0').concat('000').unpack('a2a2a2a6')
-      dt[0].prepend '20'
-      Time.gm *dt.map(&:to_i)
-    end
-
-    # Returns a URL for viewing the current coordinates on OpenStreetMap.
-    def openstreetmap_marker_url(zoom=12)
-      if c = coordinates
-        "https://www.openstreetmap.org/?mlat=%f&mlon=%f&zoom=%d" % [c, zoom].flatten
-      end
-    end
-
-    private
-
-    def _view_21x8
-      "GPSV2        #{uid_string.rjust 8}\n\n" +
-      ((c = coordinates) ? ("   Lat %10.5f\n   Lon %10.5f" % c) : '       no fix')
-    end
+    include Tinkerforge::Shared::GPS
 
   end
-
 end

data/lib/tinderfridge/devices/bricklet_gps_v3/bricklet_gps_v3.rb

@@ -1,58 +1,9 @@
-module Tinkerforge
+require 'tinderfridge/shared/gps'
 
+module Tinkerforge
   class BrickletGPSV3
 
-    # Returns the device's state.
-    def state
-      super.merge(
-        'fix_led_config' => get_fix_led_config,
-        'fix'            => fix?,
-      )
-    end
-
-    # Returns true if a fix is available.
-    def fix?
-      get_status[0]
-    end
-
-    # Returns latitude and longitude as reported by the GPS Bricklet.
-    #
-    # Nil when there is no fix (position not determined).
-    def coordinates
-      if fix?
-        c = get_coordinates
-        [
-          c[0] / (c[1] == 'N' ? 1000000.0 : -1000000.0),
-          c[2] / (c[3] == 'E' ? 1000000.0 : -1000000.0)
-        ]
-      else
-        nil
-      end
-    end
-
-    # Returns a Time object representing the time as reported by the GPS Bricklet.
-    def time
-      # FIXME: This will not work after 31-Dec-2099.
-      dt = get_date_time.map &:to_s
-      dt = dt[0].rjust(6,'0').unpack('a2a2a2').reverse + dt[1].rjust(9,'0').concat('000').unpack('a2a2a2a6')
-      dt[0].prepend '20'
-      Time.gm *dt.map(&:to_i)
-    end
-
-    # Returns a URL for viewing the current coordinates on OpenStreetMap.
-    def openstreetmap_marker_url(zoom=12)
-      if c = coordinates
-        "https://www.openstreetmap.org/?mlat=%f&mlon=%f&zoom=%d" % [c, zoom].flatten
-      end
-    end
-
-    private
-
-    def _view_21x8
-      "GPSV3        #{uid_string.rjust 8}\n\n" +
-      ((c = coordinates) ? ("   Lat %10.5f\n   Lon %10.5f" % c) : '       no fix')
-    end
+    include Tinkerforge::Shared::GPS
 
   end
-
 end

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_industrial_dual_relay/bricklet_industrial_dual_relay.rb

@@ -15,6 +15,14 @@ module Tinkerforge
       )
     end
 
+    private
+
+    def custom_configure
+      if settings.has_key? 'value'
+        set_value *settings['value']
+      end
+    end
+
   end
 
 end

data/lib/tinderfridge/devices/bricklet_led_strip_v2/bricklet_led_strip_v2.rb

@@ -34,6 +34,28 @@ module Tinkerforge
 
     private
 
+    def custom_configure
+      if settings.has_key? 'chip_type'
+        if settings['chip_type'].to_i != get_chip_type
+          set_chip_type settings['chip_type'].to_i
+        end
+      end
+
+      if settings.has_key? 'channel_mapping'
+        set_channel_mapping settings['channel_mapping'].to_i
+      end
+
+      if settings.has_key? 'frame_duration'
+        set_frame_duration settings['frame_duration'].to_i
+      end
+
+      if settings.has_key? 'clock_frequency'
+        if settings['clock_frequency'].to_i != get_clock_frequency
+          set_clock_frequency settings['clock_frequency'].to_i
+        end
+      end
+    end
+
     def lookup_channel_mapping(selector=nil)
       @@channel_mapping_table ||= self.class.constants.map do |c|
         (c.to_s =~ /^CHANNEL_MAPPING_(\w{3,4})$/ ) ? [self.class.const_get(c), $1] : nil

data/lib/tinderfridge/devices/bricklet_motion_detector_v2/bricklet_motion_detector_v2.rb

@@ -17,6 +17,14 @@ module Tinkerforge
       )
     end
 
+    private
+
+    def custom_configure
+      if settings.has_key? 'sensitivity'
+        set_sensitivity settings['sensitivity'].to_i
+      end
+    end
+
   end
 
 end

data/lib/tinderfridge/devices/bricklet_outdoor_weather/bricklet_outdoor_weather.rb

@@ -18,9 +18,9 @@ module Tinkerforge
     #
     # Sensor identifiers can be mapped to descriptive strings or other values:
     # @example
-    #  my_weather_bricklet.config['sensormap'] = { 202 => 'outdoors' }
+    #  my_weather_bricklet.settings['sensormap'] = { 202 => 'outdoors' }
     def sensors
-      sensormap = (config['sensormap'].class == Hash) ? config['sensormap'] : {}
+      sensormap = (settings['sensormap'].class == Hash) ? settings['sensormap'] : {}
       get_sensor_identifiers.map do |id|
         [ (sensormap[id] || id), get_sensor_data(id).each_with_index.map { |v,i| i == 0 ? v/10.0 : v } ]
       end.to_h

data/lib/tinderfridge/devices/bricklet_particulate_matter/bricklet_particulate_matter.rb

@@ -24,6 +24,12 @@ module Tinkerforge
 
     private
 
+    def custom_configure
+      if settings.has_key? 'enable'
+        set_enable( !! settings['enable'] )
+      end
+    end
+
     def _view_21x8
       "PM           #{uid_string.rjust 8}\n\n" +
       if get_enable

data/lib/tinderfridge/devices/bricklet_rgb_led_button/bricklet_rgb_led_button.rb

@@ -29,6 +29,14 @@ module Tinkerforge
       )
     end
 
+    private
+
+    def custom_configure
+      if settings.has_key? 'color'
+        set_color *settings['color']
+      end
+    end
+
   end
 
 end

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
 
@@ -190,6 +190,14 @@ module Tinkerforge
       end
     end
 
+    private
+
+    def custom_configure
+      if settings.has_key? 'brightness'
+        set_brightness settings['brightness'].to_i
+      end
+    end
+
   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/gps.rb

@@ -0,0 +1,68 @@
+module Tinkerforge
+  module Shared
+
+    # Mixin for GPS Bricklet versions 2 & 3.
+    module GPS
+
+      # Returns the device's state.
+      def state
+        super.merge(
+          'fix_led_config' => get_fix_led_config,
+          'fix'            => fix?,
+        )
+      end
+
+      # Returns true if a fix is available.
+      def fix?
+        get_status[0]
+      end
+
+      # Returns latitude and longitude as reported by the GPS Bricklet.
+      #
+      # Nil when there is no fix (position not determined).
+      def coordinates
+        if fix?
+          c = get_coordinates
+          [
+            c[0] / (c[1] == 'N' ? 1000000.0 : -1000000.0),
+            c[2] / (c[3] == 'E' ? 1000000.0 : -1000000.0)
+          ]
+        else
+          nil
+        end
+      end
+
+      # Returns a Time object representing the time as reported by the GPS Bricklet.
+      def time
+        # FIXME: This will not work after 31-Dec-2099.
+        dt = get_date_time.map &:to_s
+        dt = dt[0].rjust(6,'0').unpack('a2a2a2').reverse + dt[1].rjust(9,'0').concat('000').unpack('a2a2a2a6')
+        dt[0].prepend '20'
+        Time.gm *dt.map(&:to_i)
+      end
+
+      # Returns a URL for viewing the current coordinates on OpenStreetMap.
+      def openstreetmap_marker_url(zoom=12)
+        if c = coordinates
+          "https://www.openstreetmap.org/?mlat=%f&mlon=%f&zoom=%d" % [c, zoom].flatten
+        end
+      end
+
+      private
+
+      def custom_configure
+        if settings.has_key? 'fix_led_config'
+          set_fix_led_config settings['fix_led_config'].to_i
+        end
+      end
+
+      def _view_21x8
+        @label21x8 ||= self.class.to_s[-5,5]
+        "#{@label21x8}        #{uid_string.rjust 8}\n\n" +
+        ((c = coordinates) ? ("   Lat %10.5f\n   Lon %10.5f" % c) : '       no fix')
+      end
+
+    end
+
+  end
+end

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.17.0'
 
   # About Tinkerforge & Tinderfridge.
   def self.about

data/lib/tinderfridge.rb

@@ -2,18 +2,9 @@ if defined? Tinkerforge
   raise 'Tinkerforge was already loaded, so Tinderfridge can not reliably extend it!'
 end
 
-%w(
-
-  version
-
-  ip_connection
-
-  device
-
-  tinkerforge
-
-  device_info
-
-  device_collection
-
-).each { |m| require "tinderfridge/#{m}" }
+require 'tinderfridge/version'
+require 'tinderfridge/ip_connection'
+require 'tinderfridge/device'
+require 'tinderfridge/tinkerforge'
+require 'tinderfridge/device_info'
+require 'tinderfridge/device_collection'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinderfridge
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.17.0
 platform: ruby
 authors:
 - lllist.eu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2026-01-29 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
@@ -157,15 +159,16 @@ files:
 - lib/tinderfridge/devices/bricklet_xmc1400_breakout/bricklet_xmc1400_breakout.json
 - lib/tinderfridge/ip_connection.rb
 - lib/tinderfridge/shared/display_ibm437_encoding.rb
+- lib/tinderfridge/shared/gps.rb
 - lib/tinderfridge/shared/logger.rb
 - lib/tinderfridge/tinkerforge.rb
 - lib/tinderfridge/version.rb
-homepage: https://github.com/lllisteu/tinderfridge
+homepage: https://codeberg.org/lllisteu/tinderfridge
 licenses:
 - CC0-1.0
 metadata:
-  homepage_uri: https://github.com/lllisteu/tinderfridge
-  changelog_uri: https://github.com/lllisteu/tinderfridge/blob/master/History.md
+  homepage_uri: https://codeberg.org/lllisteu/tinderfridge
+  changelog_uri: https://codeberg.org/lllisteu/tinderfridge/src/branch/master/History.md
   documentation_uri: https://www.rubydoc.info/gems/tinderfridge
 post_install_message:
 rdoc_options: []