tinkerforge 2.0.8 → 2.0.9

data/lib/tinkerforge/bricklet_linear_poti.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-07-04.      #
+# This file was automatically generated on 2013-08-23.      #
 #                                                           #
-# Bindings Version 2.0.8                                    #
+# Bindings Version 2.0.9                                    #
 #                                                           #
 # If you have a bugfix for this file and want to commit it, #
 # please fix the bug in the generator. You can find a link  #
@@ -201,11 +201,13 @@ module Tinkerforge
 
     # Sets the period in ms with which the threshold callbacks
     # 
-    #  CALLBACK_POSITION_REACHED, CALLBACK_ANALOG_VALUE_REACHED
+    # * CALLBACK_POSITION_REACHED,
+    # * CALLBACK_ANALOG_VALUE_REACHED
     # 
     # are triggered, if the thresholds
     # 
-    #  BrickletLinearPoti#set_position_callback_threshold, BrickletLinearPoti#set_analog_value_callback_threshold
+    # * BrickletLinearPoti#set_position_callback_threshold,
+    # * BrickletLinearPoti#set_analog_value_callback_threshold
     # 
     # keep being reached.
     # 

data/lib/tinkerforge/bricklet_piezo_buzzer.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-07-04.      #
+# This file was automatically generated on 2013-08-23.      #
 #                                                           #
-# Bindings Version 2.0.8                                    #
+# Bindings Version 2.0.9                                    #
 #                                                           #
 # If you have a bugfix for this file and want to commit it, #
 # please fix the bug in the generator. You can find a link  #

data/lib/tinkerforge/bricklet_ptc.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-07-04.      #
+# This file was automatically generated on 2013-08-23.      #
 #                                                           #
-# Bindings Version 2.0.8                                    #
+# Bindings Version 2.0.9                                    #
 #                                                           #
 # If you have a bugfix for this file and want to commit it, #
 # please fix the bug in the generator. You can find a link  #
@@ -215,11 +215,13 @@ module Tinkerforge
 
     # Sets the period in ms with which the threshold callback
     # 
-    #  CALLBACK_TEMPERATURE_REACHED, CALLBACK_RESISTANCE_REACHED
+    # * CALLBACK_TEMPERATURE_REACHED,
+    # * CALLBACK_RESISTANCE_REACHED
     # 
     # is triggered, if the threshold
     # 
-    #  BrickletPTC#set_temperature_callback_threshold, BrickletPTC#set_resistance_callback_threshold
+    # * BrickletPTC#set_temperature_callback_threshold,
+    # * BrickletPTC#set_resistance_callback_threshold
     # 
     # keeps being reached.
     # 
@@ -258,9 +260,9 @@ module Tinkerforge
       send_request(FUNCTION_IS_SENSOR_CONNECTED, [], '', 1, '?')
     end
 
-    # Sets the wire mode. Possible values are 2, 3 and 4.
-    # 
-    # The values correspond to 2-, 3- and 4-wire sensors.
+    # Sets the wire mode of the sensor. Possible values are 2, 3 and 4 which
+    # correspond to 2-, 3- and 4-wire sensors. The value has to match the jumper
+    # configuration on the Bricklet.
     # 
     # The default value is 2 = 2-wire.
     def set_wire_mode(mode)

data/lib/tinkerforge/bricklet_rotary_poti.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-07-04.      #
+# This file was automatically generated on 2013-08-23.      #
 #                                                           #
-# Bindings Version 2.0.8                                    #
+# Bindings Version 2.0.9                                    #
 #                                                           #
 # If you have a bugfix for this file and want to commit it, #
 # please fix the bug in the generator. You can find a link  #
@@ -201,11 +201,13 @@ module Tinkerforge
 
     # Sets the period in ms with which the threshold callbacks
     # 
-    #  CALLBACK_POSITION_REACHED, CALLBACK_ANALOG_VALUE_REACHED
+    # * CALLBACK_POSITION_REACHED,
+    # * CALLBACK_ANALOG_VALUE_REACHED
     # 
     # are triggered, if the thresholds
     # 
-    #  BrickletRotaryPoti#set_position_callback_threshold, BrickletRotaryPoti#set_analog_value_callback_threshold
+    # * BrickletRotaryPoti#set_position_callback_threshold,
+    # * BrickletRotaryPoti#set_analog_value_callback_threshold
     # 
     # keep being reached.
     # 

data/lib/tinkerforge/bricklet_temperature.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-07-04.      #
+# This file was automatically generated on 2013-08-23.      #
 #                                                           #
-# Bindings Version 2.0.8                                    #
+# Bindings Version 2.0.9                                    #
 #                                                           #
 # If you have a bugfix for this file and want to commit it, #
 # please fix the bug in the generator. You can find a link  #
@@ -124,11 +124,11 @@ module Tinkerforge
 
     # Sets the period in ms with which the threshold callback
     # 
-    #  CALLBACK_TEMPERATURE_REACHED
+    # * CALLBACK_TEMPERATURE_REACHED
     # 
     # is triggered, if the threshold
     # 
-    #  BrickletTemperature#set_temperature_callback_threshold
+    # * BrickletTemperature#set_temperature_callback_threshold
     # 
     # keeps being reached.
     # 

data/lib/tinkerforge/bricklet_temperature_ir.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-07-04.      #
+# This file was automatically generated on 2013-08-23.      #
 #                                                           #
-# Bindings Version 2.0.8                                    #
+# Bindings Version 2.0.9                                    #
 #                                                           #
 # If you have a bugfix for this file and want to commit it, #
 # please fix the bug in the generator. You can find a link  #
@@ -235,11 +235,13 @@ module Tinkerforge
 
     # Sets the period in ms with which the threshold callbacks
     # 
-    #  CALLBACK_AMBIENT_TEMPERATURE_REACHED, CALLBACK_OBJECT_TEMPERATURE_REACHED
+    # * CALLBACK_AMBIENT_TEMPERATURE_REACHED,
+    # * CALLBACK_OBJECT_TEMPERATURE_REACHED
     # 
     # are triggered, if the thresholds
     # 
-    #  BrickletTemperatureIR#set_ambient_temperature_callback_threshold, BrickletTemperatureIR#set_object_temperature_callback_threshold
+    # * BrickletTemperatureIR#set_ambient_temperature_callback_threshold,
+    # * BrickletTemperatureIR#set_object_temperature_callback_threshold
     # 
     # keep being reached.
     # 

data/lib/tinkerforge/bricklet_voltage.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-07-04.      #
+# This file was automatically generated on 2013-08-23.      #
 #                                                           #
-# Bindings Version 2.0.8                                    #
+# Bindings Version 2.0.9                                    #
 #                                                           #
 # If you have a bugfix for this file and want to commit it, #
 # please fix the bug in the generator. You can find a link  #
@@ -201,11 +201,13 @@ module Tinkerforge
 
     # Sets the period in ms with which the threshold callbacks
     # 
-    #  CALLBACK_VOLTAGE_REACHED, CALLBACK_ANALOG_VALUE_REACHED
+    # * CALLBACK_VOLTAGE_REACHED,
+    # * CALLBACK_ANALOG_VALUE_REACHED
     # 
     # are triggered, if the thresholds
     # 
-    #  BrickletVoltage#set_voltage_callback_threshold, BrickletVoltage#set_analog_value_callback_threshold
+    # * BrickletVoltage#set_voltage_callback_threshold,
+    # * BrickletVoltage#set_analog_value_callback_threshold
     # 
     # keep being reached.
     # 

data/lib/tinkerforge/bricklet_voltage_current.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-07-04.      #
+# This file was automatically generated on 2013-08-23.      #
 #                                                           #
-# Bindings Version 2.0.8                                    #
+# Bindings Version 2.0.9                                    #
 #                                                           #
 # If you have a bugfix for this file and want to commit it, #
 # please fix the bug in the generator. You can find a link  #
@@ -346,11 +346,15 @@ module Tinkerforge
 
     # Sets the period in ms with which the threshold callbacks
     # 
-    #  CALLBACK_CURRENT_REACHED, CALLBACK_VOLTAGE_REACHED, CALLBACK_POWER_REACHED
+    # * CALLBACK_CURRENT_REACHED,
+    # * CALLBACK_VOLTAGE_REACHED,
+    # * CALLBACK_POWER_REACHED
     # 
     # are triggered, if the thresholds
     # 
-    #  BrickletVoltageCurrent#set_current_callback_threshold, BrickletVoltageCurrent#set_voltage_callback_threshold, BrickletVoltageCurrent#set_power_callback_threshold
+    # * BrickletVoltageCurrent#set_current_callback_threshold,
+    # * BrickletVoltageCurrent#set_voltage_callback_threshold,
+    # * BrickletVoltageCurrent#set_power_callback_threshold
     # 
     # keep being reached.
     # 

data/lib/tinkerforge/ip_connection.rb

@@ -477,6 +477,7 @@ module Tinkerforge
       @registered_callbacks = {}
 
       @socket_mutex = Mutex.new
+      @socket_send_mutex = Mutex.new
       @socket = nil # protected by socket_mutex
       @socket_id = 0 # protected by socket_mutex
 
@@ -672,7 +673,9 @@ module Tinkerforge
         end
 
         begin
-          @socket.send request, 0
+          @socket_send_mutex.synchronize {
+            @socket.send request, 0
+          }
         rescue IOError
           handle_disconnect_by_peer DISCONNECT_REASON_ERROR, @socket_id, true
           raise NotConnectedException, 'Not connected'
@@ -820,7 +823,7 @@ module Tinkerforge
 
         pending_data += data
 
-        while true
+        while @receive_flag
           if pending_data.length < 8
             # Wait for complete header
             break
@@ -909,7 +912,6 @@ module Tinkerforge
     # internal
     def dispatch_packet(packet)
       uid = get_uid_from_data packet
-      length = get_length_from_data packet
       function_id = get_function_id_from_data packet
 
       if function_id == CALLBACK_ENUMERATE and \
@@ -954,6 +956,9 @@ module Tinkerforge
 
     # internal
     def disconnect_probe_loop(disconnect_probe_queue)
+      # NOTE: the disconnect probe thread is not allowed to hold the socket_mutex at any
+      #       time because it is created and joined while the socket_mutex is locked
+
       request, _, _ = create_packet_header nil, 8, FUNCTION_DISCONNECT_PROBE
 
       while true
@@ -963,17 +968,17 @@ module Tinkerforge
           }
         rescue Timeout::Error
           if @disconnect_probe_flag
-            @socket_mutex.synchronize {
-              begin
+            begin
+              @socket_send_mutex.synchronize {
                 @socket.send request, 0
-              rescue IOError
-                handle_disconnect_by_peer DISCONNECT_REASON_ERROR, @socket_id, false
-                break
-              rescue Errno::ECONNRESET
-                handle_disconnect_by_peer DISCONNECT_REASON_SHUTDOWN, @socket_id, false
-                break
-              end
-            }
+              }
+            rescue IOError
+              handle_disconnect_by_peer DISCONNECT_REASON_ERROR, @socket_id, false
+              break
+            rescue Errno::ECONNRESET
+              handle_disconnect_by_peer DISCONNECT_REASON_SHUTDOWN, @socket_id, false
+              break
+            end
           else
             @disconnect_probe_flag = true
           end

data/lib/tinkerforge/version.rb

@@ -1,4 +1,4 @@
 
 module Tinkerforge
-  VERSION = '2.0.8'
+  VERSION = '2.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinkerforge
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: matthias@tinkerforge.com
@@ -66,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: