tinderfridge 0.1.0 → 0.6.0

data/lib/tinderfridge/devices/bricklet_rgb_led_v2/bricklet_rgb_led_v2.json

@@ -0,0 +1,3 @@
+{
+  "documentation_en_url": "https://www.tinkerforge.com/en/doc/Hardware/Bricklets/RGB_LED_V2.html"
+}

data/lib/tinderfridge/devices/bricklet_rgb_led_v2/bricklet_rgb_led_v2.rb

@@ -0,0 +1,32 @@
+module Tinkerforge
+
+  class BrickletRGBLEDV2
+
+    # Returns the LED's current color as three values for red, green, and blue (integers in the range 0..255).
+    def rgb
+      get_rgb_value
+    end
+
+    # Sets the LED's color using three values for red, green, and blue (integers in the range 0..255).
+    #
+    # Values can be supplied as an array or as three separate values.
+    def rgb=(*rgb)
+      set_rgb_value *rgb.flatten
+    end
+
+    # Switches off the LED.
+    def blackout
+      self.rgb = 0, 0, 0
+      true
+    end
+
+    # Returns the device's state.
+    def state
+      super.merge(
+        'color_rgb' => get_rgb_value,
+      )
+    end
+
+  end
+
+end

data/lib/tinderfridge/devices/bricklet_rotary_encoder_v2/bricklet_rotary_encoder_v2.json

@@ -0,0 +1,3 @@
+{
+  "documentation_en_url": "https://www.tinkerforge.com/en/doc/Hardware/Bricklets/Rotary_Encoder_V2.html"
+}

data/lib/tinderfridge/devices/bricklet_rotary_encoder_v2/bricklet_rotary_encoder_v2.rb

@@ -0,0 +1,20 @@
+module Tinkerforge
+
+  class BrickletRotaryEncoderV2
+
+    # Returns the current count of the encoder.
+    def count
+      get_count(false)
+    end
+
+    # Returns the device's state.
+    def state
+      super.merge(
+        'count'   => count,
+        'pressed' => is_pressed,
+      )
+    end
+
+  end
+
+end

data/lib/tinderfridge/devices/bricklet_segment_display_4x7_v2/bricklet_segment_display_4x7_v2.json

@@ -0,0 +1,3 @@
+{
+  "documentation_en_url": "https://www.tinkerforge.com/en/doc/Hardware/Bricklets/Segment_Display_4x7_V2.html"
+}

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

@@ -0,0 +1,128 @@
+module Tinkerforge
+
+  class BrickletSegmentDisplay4x7V2
+
+    # Clears the display.
+    def clear
+      set_segments [false]*8, [false]*8, [false]*8, [false]*8, [false]*2, false
+      true
+    end
+
+    alias blackout clear
+
+    # Returns the state of all 35 segments.
+    def segments
+      send_request FUNCTION_GET_SEGMENTS, [], '', 14, '?35'
+    end
+
+    # Sets the state of all 35 segments.
+    def segments=(*segments)
+      segs = segments.flatten
+      set_segments segs[0,8], segs[8,8], segs[16,8], segs[24,8], segs[32,2], segs[34]
+    end
+
+    # Returns the state of all 35 segments as a string of 1s and 0s.
+    def segments_string
+      segments.map { |s| s ? '1' : '0' }.join
+    end
+
+    # Sets the state of all 35 segments using a string of 1s and 0s.
+    #
+    # For readability, the string may include spaces and underscores, which will be ignored.
+    # @example
+    #  my_bricklet.segments_string = '10000110 11000110 11000110 00000110 00 0'
+    def segments_string=(segments)
+      self.segments = segments.gsub(/[ _]/, '').ljust(35, '0').chars.map { |s| s == '1' }
+    end
+
+    # Returns the device's state.
+    def state
+      super.merge( 'brightness' => get_brightness )
+    end
+
+    # Displays a string.
+    def print(text='')
+      out   = ''
+      colon = false
+
+      text.to_s.chars.each do |c|
+        if glyphs.key? c
+          out << glyphs[c] << '0'
+        elsif c == '.' and out[-1] == '0'
+          out[-1] = '1'
+        elsif c == ':' and out.size == 16
+          colon = true
+        else
+          raise "Can not display '#{text}'"
+        end
+      end
+
+      self.segments_string = out[0,32].ljust(32,'0') + ( colon ? '110' : '000' )
+      nil
+    end
+
+    # Returns the definition of glyphs for Unicode chracters.
+    def glyphs
+      @@glyphs ||= {
+
+        '0' => '1111110',
+        '1' => '0110000',
+        '2' => '1101101',
+        '3' => '1111001',
+        '4' => '0110011',
+        '5' => '1011011',
+        '6' => '1011111',
+        '7' => '1110000',
+        '8' => '1111111',
+        '9' => '1111011',
+
+        'A' => '1110111',
+        'b' => '0011111',
+        'c' => '0001101',
+        'C' => '1001110',
+        'd' => '0111101',
+        'E' => '1001111',
+        'F' => '1000111',
+        'G' => '1011110',
+        'H' => '0110111',
+        'h' => '0010111',
+        'I' => '0110000',
+        'i' => '0010000',
+        'J' => '0111000',
+        'L' => '0001110',
+        'l' => '0001100',
+        'n' => '0010101',
+        'O' => '1111110',
+        'o' => '0011101',
+        'P' => '1100111',
+        'q' => '1110011',
+        'r' => '0000101',
+        'S' => '1011011',
+        't' => '0001111',
+        'U' => '0111110',
+        'u' => '0011100',
+        'V' => '0111110',
+        'v' => '0011100',
+        'y' => '0110011',
+
+        'ö' => '1011101',
+        'ü' => '1011100',
+
+        ' ' => '0000000',
+
+        '_' => '0001000',
+        '-' => '0000001',
+        '=' => '0001001',
+
+        '(' => '1001110',
+        ')' => '1111000',
+
+        '[' => '1001110',
+        ']' => '1111000',
+
+      }
+    end
+
+  end
+
+end

data/lib/tinderfridge/devices/bricklet_servo_v2/bricklet_servo_v2.json

@@ -0,0 +1,3 @@
+{
+  "documentation_en_url": "https://www.tinkerforge.com/en/doc/Hardware/Bricklets/Servo_V2.html"
+}

data/lib/tinderfridge/devices/bricklet_voltage_current_v2/bricklet_voltage_current_v2.json

@@ -0,0 +1,3 @@
+{
+  "documentation_en_url": "https://www.tinkerforge.com/en/doc/Hardware/Bricklets/Voltage_Current_V2.html"
+}

data/lib/tinderfridge/devices/bricklet_voltage_current_v2/bricklet_voltage_current_v2.rb

@@ -0,0 +1,18 @@
+module Tinkerforge
+
+  class BrickletVoltageCurrentV2
+
+    # Returns the device's state.
+    def state
+      super.merge(
+        'voltage'       => get_voltage,
+        'current'       => get_current,
+        'power'         => get_power,
+        'configuration' => get_configuration,
+        'calibration'   => get_calibration,
+      )
+    end
+
+  end
+
+end

data/lib/tinderfridge/ip_connection.rb

@@ -4,10 +4,10 @@ module Tinkerforge
 
   class IPConnection
 
-    # Returns the host for the IP Connection object.
+    # Returns the host for the IP Connection.
     attr_reader :host
 
-    # Returns the port for the IP Connection object.
+    # Returns the port for the IP Connection.
     attr_reader :port
 
     # Returns a programmer-friendly representation of the object.
@@ -15,46 +15,101 @@ module Tinkerforge
       "%s (%s:%s)" % [self.class, host, port]
     end
 
-    # Returns a Tinkerforge::DeviceCollection with devices discovered for this IP Connection.
-    #
-    # Discovery may take a few seconds, but will return a Tinkerforge::DeviceCollection immediately.
+    # Returns the state of the IP Connection.
+    def state
+      {
+        'host'             => host,
+        'port'             => port,
+        'connection_state' => get_connection_state,
+        'auto_reconnect'   => get_auto_reconnect,
+        'timeout'          => get_timeout,
+        'log_size'         => log_size,
+      }
+    end
+
+    # Returns true if connected to localhost, false if connected via the network.
+    def localhost?
+      @localhost ||= %w(localhost 127.0.0.1 ::1).include? host
+    end
+
+    # Returns the size (in bytes) of the Brick Daemon log file, if connected to localhost. Nil if connected via the network.
+    def log_size
+      if local_log_path
+        if File.exist? local_log_path
+          File.size local_log_path
+        else
+          0
+        end
+      else
+        nil
+      end
+    end
+
+    # Returns a Tinkerforge::DeviceCollection with devices discovered for this IP Connection. Discovery may take a few moments.
     #
-    # It is therefore a good idea to store the result in a variable.
-    # This variable will be filled with devices as they are found. See examples.
+    # Accepts an optional argument for the number of seconds to wait, otherwise returns immediately.
     #
+    # A good idea is to store the result in a variable, which will then be filled with devices as they are found.
     # @example Using Tinkerforge.connect
     #  my_devices = Tinkerforge.connect.discover
     #
+    # @example Wait 1 second
+    #  Tinkerforge.connect.discover(1).ls
+    #
     # @example Classic
     #  ipcon = Tinkerforge::IPConnection.new
     #  ipcon.connect 'localhost', 4223
     #  my_devices = ipcon.discover
-    def discover
+    def discover(seconds=nil)
       list = Tinkerforge::DeviceCollection.new
+
       self.register_callback(CALLBACK_ENUMERATE) do |*args|
         case args[6]
-
-          when 0, 1  # Available or Connected
-            info = Tinkerforge.device_info args[5]
-            if info
-              require File.join('tinkerforge', info[2][1] )
-              list[args.first] = Tinkerforge.const_get( info[2][0] ).new args.first, self
-            else     # Device not in device_info
-              list[args.first] = nil
+          when 0, 1
+            unless list.key?(args[0])
+              if dev = device_instance_from_enum_data(args)
+                list[args[0]] = dev
+              end
             end
-
-          when 2     # Disconnected
-            list[args.first] = nil
-
+          when 2
+            list.delete args[0]
           else
             raise "Unknown Enumeration Type: #{args[6]}"
-
         end
       end
+
       self.enumerate
+      sleep(seconds.to_f) if seconds
       list
     end
 
+    private
+
+    # The path for the Brick Daemon log file, if connected to Brickd on the same computer.
+    def local_log_path
+      @local_log_path ||=
+        if localhost?
+          if Gem.win_platform?
+            'C:\ProgramData\Tinkerforge\Brickd\brickd.log'
+          else
+            '/var/log/brickd.log'
+          end
+        else
+          nil
+        end
+    end
+
+    # Takes the args supplied by an enumeration callback, and returns a device instance.
+    def device_instance_from_enum_data(enum_data)
+      if dev_info = Tinkerforge.device_info(enum_data[5])
+        require "tinkerforge/#{dev_info[2][1]}"
+        Tinkerforge.const_get(dev_info[2][0]).new enum_data[0], self
+      else
+        warn "Unknown Device Identifier: #{enum_data[5]} (UID: #{enum_data[0]})"
+        nil
+      end
+    end
+
   end
 
   # Creates an IP Connection object connected to the given host and port.

data/lib/tinderfridge/tinkerforge.rb

@@ -2,6 +2,9 @@ require 'tinkerforge/ip_connection'
 
 module Tinkerforge
 
+  ALL_VERSIONS_URL    = 'https://download.tinkerforge.com/all_versions.txt'
+  LATEST_VERSIONS_URL = 'https://download.tinkerforge.com/latest_versions.txt'
+
   # Returns the directory where Tinkerforge bindings appear to be installed.
   def self.lib_dir
     File.dirname File.dirname Device.instance_method('uid').source_location.first

data/lib/tinderfridge/version.rb

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

metadata

@@ -1,27 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: tinderfridge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.6.0
 platform: ruby
 authors:
 - lllist.eu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tinkerforge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.27
 description: 
@@ -35,6 +41,55 @@ files:
 - lib/tinderfridge/device_collection.rb
 - lib/tinderfridge/device_info.rb
 - lib/tinderfridge/device_info.txt
+- lib/tinderfridge/devices/brick_hat/brick_hat.json
+- lib/tinderfridge/devices/brick_hat/brick_hat.rb
+- lib/tinderfridge/devices/brick_hat_zero/brick_hat_zero.json
+- lib/tinderfridge/devices/brick_hat_zero/brick_hat_zero.rb
+- lib/tinderfridge/devices/bricklet_air_quality/bricklet_air_quality.json
+- lib/tinderfridge/devices/bricklet_air_quality/bricklet_air_quality.rb
+- lib/tinderfridge/devices/bricklet_ambient_light_v3/bricklet_ambient_light_v3.json
+- lib/tinderfridge/devices/bricklet_ambient_light_v3/bricklet_ambient_light_v3.rb
+- lib/tinderfridge/devices/bricklet_color_v2/bricklet_color_v2.json
+- lib/tinderfridge/devices/bricklet_color_v2/bricklet_color_v2.rb
+- lib/tinderfridge/devices/bricklet_dmx/bricklet_dmx.json
+- lib/tinderfridge/devices/bricklet_dmx/bricklet_dmx.rb
+- lib/tinderfridge/devices/bricklet_gps_v2/bricklet_gps_v2.json
+- lib/tinderfridge/devices/bricklet_gps_v2/bricklet_gps_v2.rb
+- lib/tinderfridge/devices/bricklet_imu_v3/bricklet_imu_v3.json
+- lib/tinderfridge/devices/bricklet_industrial_dual_relay/bricklet_industrial_dual_relay.json
+- lib/tinderfridge/devices/bricklet_industrial_dual_relay/bricklet_industrial_dual_relay.rb
+- lib/tinderfridge/devices/bricklet_isolator/bricklet_isolator.json
+- lib/tinderfridge/devices/bricklet_isolator/bricklet_isolator.rb
+- lib/tinderfridge/devices/bricklet_joystick_v2/bricklet_joystick_v2.json
+- lib/tinderfridge/devices/bricklet_joystick_v2/bricklet_joystick_v2.rb
+- lib/tinderfridge/devices/bricklet_lcd_128x64/bricklet_lcd_128x64.json
+- lib/tinderfridge/devices/bricklet_lcd_128x64/bricklet_lcd_128x64.rb
+- lib/tinderfridge/devices/bricklet_led_strip_v2/bricklet_led_strip_v2.json
+- lib/tinderfridge/devices/bricklet_led_strip_v2/bricklet_led_strip_v2.rb
+- lib/tinderfridge/devices/bricklet_motion_detector_v2/bricklet_motion_detector_v2.json
+- lib/tinderfridge/devices/bricklet_motion_detector_v2/bricklet_motion_detector_v2.rb
+- lib/tinderfridge/devices/bricklet_motorized_linear_poti/bricklet_motorized_linear_poti.json
+- lib/tinderfridge/devices/bricklet_motorized_linear_poti/bricklet_motorized_linear_poti.rb
+- lib/tinderfridge/devices/bricklet_multi_touch_v2/bricklet_multi_touch_v2.json
+- lib/tinderfridge/devices/bricklet_multi_touch_v2/bricklet_multi_touch_v2.rb
+- lib/tinderfridge/devices/bricklet_nfc/bricklet_nfc.json
+- lib/tinderfridge/devices/bricklet_nfc/bricklet_nfc.rb
+- lib/tinderfridge/devices/bricklet_outdoor_weather/bricklet_outdoor_weather.json
+- lib/tinderfridge/devices/bricklet_outdoor_weather/bricklet_outdoor_weather.rb
+- lib/tinderfridge/devices/bricklet_performance_dc/bricklet_performance_dc.json
+- lib/tinderfridge/devices/bricklet_remote_switch_v2/bricklet_remote_switch_v2.json
+- lib/tinderfridge/devices/bricklet_remote_switch_v2/bricklet_remote_switch_v2.rb
+- lib/tinderfridge/devices/bricklet_rgb_led_button/bricklet_rgb_led_button.json
+- lib/tinderfridge/devices/bricklet_rgb_led_button/bricklet_rgb_led_button.rb
+- lib/tinderfridge/devices/bricklet_rgb_led_v2/bricklet_rgb_led_v2.json
+- lib/tinderfridge/devices/bricklet_rgb_led_v2/bricklet_rgb_led_v2.rb
+- lib/tinderfridge/devices/bricklet_rotary_encoder_v2/bricklet_rotary_encoder_v2.json
+- lib/tinderfridge/devices/bricklet_rotary_encoder_v2/bricklet_rotary_encoder_v2.rb
+- lib/tinderfridge/devices/bricklet_segment_display_4x7_v2/bricklet_segment_display_4x7_v2.json
+- lib/tinderfridge/devices/bricklet_segment_display_4x7_v2/bricklet_segment_display_4x7_v2.rb
+- lib/tinderfridge/devices/bricklet_servo_v2/bricklet_servo_v2.json
+- lib/tinderfridge/devices/bricklet_voltage_current_v2/bricklet_voltage_current_v2.json
+- lib/tinderfridge/devices/bricklet_voltage_current_v2/bricklet_voltage_current_v2.rb
 - lib/tinderfridge/ip_connection.rb
 - lib/tinderfridge/tinkerforge.rb
 - lib/tinderfridge/version.rb