tinkerforge 2.0.13 → 2.1.0

data/lib/tinkerforge/brick_dc.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-12-19.      #
+# This file was automatically generated on 2014-04-08.      #
 #                                                           #
-# Bindings Version 2.0.13                                    #
+# Bindings Version 2.1.0                                    #
 #                                                           #
 # 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  #
@@ -309,8 +309,6 @@ module Tinkerforge
     # 
     # This functions sole purpose is to allow automatic flashing of v1.x.y Bricklet
     # plugins.
-    # 
-    # .. versionadded:: 2.0.0~(Firmware)
     def get_protocol1_bricklet_name(port)
       send_request(FUNCTION_GET_PROTOCOL1_BRICKLET_NAME, [port], 'k', 44, 'C C3 Z40')
     end
@@ -321,8 +319,6 @@ module Tinkerforge
     # The temperature is only proportional to the real temperature and it has an
     # accuracy of +-15%. Practically it is only useful as an indicator for
     # temperature changes.
-    # 
-    # .. versionadded:: 1.1.3~(Firmware)
     def get_chip_temperature
       send_request(FUNCTION_GET_CHIP_TEMPERATURE, [], '', 2, 's')
     end
@@ -333,8 +329,6 @@ module Tinkerforge
     # After a reset you have to create new device objects,
     # calling functions on the existing ones will result in
     # undefined behavior!
-    # 
-    # .. versionadded:: 1.1.3~(Firmware)
     def reset
       send_request(FUNCTION_RESET, [], '', 0, '')
     end
@@ -345,9 +339,8 @@ module Tinkerforge
     # 
     # The position can be '0'-'8' (stack position).
     # 
-    # The device identifiers can be found :ref:`here <device_identifier>`.
-    # 
-    # .. versionadded:: 2.0.0~(Firmware)
+    # The device identifier numbers can be found :ref:`here <device_identifier>`.
+    # |device_identifier_constant|
     def get_identity
       send_request(FUNCTION_GET_IDENTITY, [], '', 25, 'Z8 Z8 k C3 C3 S')
     end

data/lib/tinkerforge/brick_imu.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-12-19.      #
+# This file was automatically generated on 2014-04-08.      #
 #                                                           #
-# Bindings Version 2.0.13                                    #
+# Bindings Version 2.1.0                                    #
 #                                                           #
 # 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  #
@@ -172,7 +172,7 @@ module Tinkerforge
     end
 
     # Returns the calibrated angular velocity from the gyroscope for the 
-    # x, y and z axis in °/17.5s (you have to divide by 17.5 to
+    # x, y and z axis in °/14.375s (you have to divide by 14.375 to
     # get the value in °/s).
     # 
     # If you want to get the angular velocity periodically, it is recommended 
@@ -215,13 +215,21 @@ module Tinkerforge
     # 
     # You can go from quaternions to Euler angles with the following formula::
     # 
-    #  roll  = atan2(2*y*w - 2*x*z, 1 - 2*y*y - 2*z*z)
-    #  pitch = atan2(2*x*w - 2*y*z, 1 - 2*x*x - 2*z*z)
-    #  yaw   =  asin(2*x*y + 2*z*w)
+    #  xAngle = atan2(2*y*w - 2*x*z, 1 - 2*y*y - 2*z*z)
+    #  yAngle = atan2(2*x*w - 2*y*z, 1 - 2*x*x - 2*z*z)
+    #  zAngle =  asin(2*x*y + 2*z*w)
     # 
     # This process is not reversible, because of the 
     # `gimbal lock <http://en.wikipedia.org/wiki/Gimbal_lock>`__.
     # 
+    # It is also possible to calculate independent angles. You can calculate 
+    # yaw, pitch and roll in a right-handed vehicle coordinate system according to DIN70000
+    # with::
+    # 
+    #  yaw   =  atan2(2*x*y + 2*w*z, w*w + x*x - y*y - z*z)
+    #  pitch = -asin(2*w*y - 2*x*z)
+    #  roll  = -atan2(2*y*z + 2*w*x, -w*w + x*x + y*y - z*z))
+    # 
     # Converting the quaternions to an OpenGL transformation matrix is
     # possible with the following formula::
     # 
@@ -337,7 +345,7 @@ module Tinkerforge
     # 
     # The gyroscope bias is highly dependent on the temperature, so you have to
     # calibrate the bias two times with different temperatures. The values ``xl``,
-    # ``yl``, ``zl `` and ``temp l`` are the bias for ``x``, ``y``, ``z`` and the
+    # ``yl``, ``zl`` and ``temp l`` are the bias for ``x``, ``y``, ``z`` and the
     # corresponding temperature for a low temperature. The values ``xh``, ``yh``,
     # ``zh`` and ``temp h`` are the same for a high temperatures. The temperature
     # difference should be at least 5°C. If you have a temperature where the
@@ -463,8 +471,6 @@ module Tinkerforge
     # 
     # This functions sole purpose is to allow automatic flashing of v1.x.y Bricklet
     # plugins.
-    # 
-    # .. versionadded:: 2.0.0~(Firmware)
     def get_protocol1_bricklet_name(port)
       send_request(FUNCTION_GET_PROTOCOL1_BRICKLET_NAME, [port], 'k', 44, 'C C3 Z40')
     end
@@ -475,8 +481,6 @@ module Tinkerforge
     # The temperature is only proportional to the real temperature and it has an
     # accuracy of +-15%. Practically it is only useful as an indicator for
     # temperature changes.
-    # 
-    # .. versionadded:: 1.0.7~(Firmware)
     def get_chip_temperature
       send_request(FUNCTION_GET_CHIP_TEMPERATURE, [], '', 2, 's')
     end
@@ -487,8 +491,6 @@ module Tinkerforge
     # After a reset you have to create new device objects,
     # calling functions on the existing ones will result in
     # undefined behavior!
-    # 
-    # .. versionadded:: 1.0.7~(Firmware)
     def reset
       send_request(FUNCTION_RESET, [], '', 0, '')
     end
@@ -499,9 +501,8 @@ module Tinkerforge
     # 
     # The position can be '0'-'8' (stack position).
     # 
-    # The device identifiers can be found :ref:`here <device_identifier>`.
-    # 
-    # .. versionadded:: 2.0.0~(Firmware)
+    # The device identifier numbers can be found :ref:`here <device_identifier>`.
+    # |device_identifier_constant|
     def get_identity
       send_request(FUNCTION_GET_IDENTITY, [], '', 25, 'Z8 Z8 k C3 C3 S')
     end

data/lib/tinkerforge/brick_master.rb

@@ -1,8 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 #############################################################
-# This file was automatically generated on 2013-12-19.      #
+# This file was automatically generated on 2014-04-08.      #
 #                                                           #
-# Bindings Version 2.0.13                                    #
+# Bindings Version 2.1.0                                    #
 #                                                           #
 # 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  #
@@ -138,6 +138,12 @@ module Tinkerforge
     FUNCTION_GET_ETHERNET_STATUS = 68 # :nodoc:
     FUNCTION_SET_ETHERNET_HOSTNAME = 69 # :nodoc:
     FUNCTION_SET_ETHERNET_MAC_ADDRESS = 70 # :nodoc:
+    FUNCTION_SET_ETHERNET_WEBSOCKET_CONFIGURATION = 71 # :nodoc:
+    FUNCTION_GET_ETHERNET_WEBSOCKET_CONFIGURATION = 72 # :nodoc:
+    FUNCTION_SET_ETHERNET_AUTHENTICATION_SECRET = 73 # :nodoc:
+    FUNCTION_GET_ETHERNET_AUTHENTICATION_SECRET = 74 # :nodoc:
+    FUNCTION_SET_WIFI_AUTHENTICATION_SECRET = 75 # :nodoc:
+    FUNCTION_GET_WIFI_AUTHENTICATION_SECRET = 76 # :nodoc:
     FUNCTION_GET_PROTOCOL1_BRICKLET_NAME = 241 # :nodoc:
     FUNCTION_GET_CHIP_TEMPERATURE = 242 # :nodoc:
     FUNCTION_RESET = 243 # :nodoc:
@@ -196,7 +202,7 @@ module Tinkerforge
     def initialize(uid, ipcon)
       super uid, ipcon
 
-      @api_version = [2, 0, 2]
+      @api_version = [2, 0, 3]
 
       @response_expected[FUNCTION_GET_STACK_VOLTAGE] = RESPONSE_EXPECTED_ALWAYS_TRUE
       @response_expected[FUNCTION_GET_STACK_CURRENT] = RESPONSE_EXPECTED_ALWAYS_TRUE
@@ -268,6 +274,12 @@ module Tinkerforge
       @response_expected[FUNCTION_GET_ETHERNET_STATUS] = RESPONSE_EXPECTED_ALWAYS_TRUE
       @response_expected[FUNCTION_SET_ETHERNET_HOSTNAME] = RESPONSE_EXPECTED_FALSE
       @response_expected[FUNCTION_SET_ETHERNET_MAC_ADDRESS] = RESPONSE_EXPECTED_FALSE
+      @response_expected[FUNCTION_SET_ETHERNET_WEBSOCKET_CONFIGURATION] = RESPONSE_EXPECTED_FALSE
+      @response_expected[FUNCTION_GET_ETHERNET_WEBSOCKET_CONFIGURATION] = RESPONSE_EXPECTED_ALWAYS_TRUE
+      @response_expected[FUNCTION_SET_ETHERNET_AUTHENTICATION_SECRET] = RESPONSE_EXPECTED_FALSE
+      @response_expected[FUNCTION_GET_ETHERNET_AUTHENTICATION_SECRET] = RESPONSE_EXPECTED_ALWAYS_TRUE
+      @response_expected[FUNCTION_SET_WIFI_AUTHENTICATION_SECRET] = RESPONSE_EXPECTED_FALSE
+      @response_expected[FUNCTION_GET_WIFI_AUTHENTICATION_SECRET] = RESPONSE_EXPECTED_ALWAYS_TRUE
       @response_expected[FUNCTION_GET_PROTOCOL1_BRICKLET_NAME] = RESPONSE_EXPECTED_ALWAYS_TRUE
       @response_expected[FUNCTION_GET_CHIP_TEMPERATURE] = RESPONSE_EXPECTED_ALWAYS_TRUE
       @response_expected[FUNCTION_RESET] = RESPONSE_EXPECTED_FALSE
@@ -320,8 +332,6 @@ module Tinkerforge
     end
 
     # Returns *true* if a Chibi Extension is available to be used by the Master Brick.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def is_chibi_present
       send_request(FUNCTION_IS_CHIBI_PRESENT, [], '', 1, '?')
     end
@@ -331,15 +341,11 @@ module Tinkerforge
     # It is possible to set the address with the Brick Viewer and it will be 
     # saved in the EEPROM of the Chibi Extension, it does not
     # have to be set on every startup.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def set_chibi_address(address)
       send_request(FUNCTION_SET_CHIBI_ADDRESS, [address], 'C', 0, '')
     end
 
     # Returns the address as set by BrickMaster#set_chibi_address.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def get_chibi_address
       send_request(FUNCTION_GET_CHIBI_ADDRESS, [], '', 1, 'C')
     end
@@ -350,22 +356,18 @@ module Tinkerforge
     # It is possible to set the address with the Brick Viewer and it will be 
     # saved in the EEPROM of the Chibi Extension, it does not
     # have to be set on every startup.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def set_chibi_master_address(address)
       send_request(FUNCTION_SET_CHIBI_MASTER_ADDRESS, [address], 'C', 0, '')
     end
 
     # Returns the address as set by BrickMaster#set_chibi_master_address.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def get_chibi_master_address
       send_request(FUNCTION_GET_CHIBI_MASTER_ADDRESS, [], '', 1, 'C')
     end
 
     # Sets up to 254 slave addresses. Valid addresses are in range 1-255. 0 has a
     # special meaning, it is used as list terminator and not allowed as normal slave
-    # address. The address numeration (via ``num`` parameter) has to be used
+    # address. The address numeration (via num parameter) has to be used
     # ascending from 0. For example: If you use the Chibi Extension in Master mode
     # (i.e. the stack has an USB connection) and you want to talk to three other
     # Chibi stacks with the slave addresses 17, 23, and 42, you should call with
@@ -378,24 +380,18 @@ module Tinkerforge
     # 
     # The slave addresses will be saved in the EEPROM of the Chibi Extension, they
     # don't have to be set on every startup.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def set_chibi_slave_address(num, address)
       send_request(FUNCTION_SET_CHIBI_SLAVE_ADDRESS, [num, address], 'C C', 0, '')
     end
 
-    # Returns the slave address for a given ``num`` as set by
+    # Returns the slave address for a given num as set by
     # BrickMaster#set_chibi_slave_address.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def get_chibi_slave_address(num)
       send_request(FUNCTION_GET_CHIBI_SLAVE_ADDRESS, [num], 'C', 1, 'C')
     end
 
     # Returns the signal strength in dBm. The signal strength updates every time a
     # packet is received.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def get_chibi_signal_strength
       send_request(FUNCTION_GET_CHIBI_SIGNAL_STRENGTH, [], '', 1, 'C')
     end
@@ -404,8 +400,6 @@ module Tinkerforge
     # communication. If these errors start rising, it is likely that either the
     # distance between two Chibi stacks is becoming too big or there are
     # interferences.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def get_chibi_error_log
       send_request(FUNCTION_GET_CHIBI_ERROR_LOG, [], '', 8, 'S S S S')
     end
@@ -422,15 +416,11 @@ module Tinkerforge
     # It is possible to set the frequency with the Brick Viewer and it will be 
     # saved in the EEPROM of the Chibi Extension, it does not
     # have to be set on every startup.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def set_chibi_frequency(frequency)
       send_request(FUNCTION_SET_CHIBI_FREQUENCY, [frequency], 'C', 0, '')
     end
 
     # Returns the frequency value as set by BrickMaster#set_chibi_frequency.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def get_chibi_frequency
       send_request(FUNCTION_GET_CHIBI_FREQUENCY, [], '', 1, 'C')
     end
@@ -448,22 +438,16 @@ module Tinkerforge
     # It is possible to set the channel with the Brick Viewer and it will be 
     # saved in the EEPROM of the Chibi Extension, it does not
     # have to be set on every startup.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def set_chibi_channel(channel)
       send_request(FUNCTION_SET_CHIBI_CHANNEL, [channel], 'C', 0, '')
     end
 
     # Returns the channel as set by BrickMaster#set_chibi_channel.
-    # 
-    # .. versionadded:: 1.1.0~(Firmware)
     def get_chibi_channel
       send_request(FUNCTION_GET_CHIBI_CHANNEL, [], '', 1, 'C')
     end
 
     # Returns *true* if a RS485 Extension is available to be used by the Master Brick.
-    # 
-    # .. versionadded:: 1.2.0~(Firmware)
     def is_rs485_present
       send_request(FUNCTION_IS_RS485_PRESENT, [], '', 1, '?')
     end
@@ -476,15 +460,11 @@ module Tinkerforge
     # It is possible to set the address with the Brick Viewer and it will be 
     # saved in the EEPROM of the RS485 Extension, it does not
     # have to be set on every startup.
-    # 
-    # .. versionadded:: 1.2.0~(Firmware)
     def set_rs485_address(address)
       send_request(FUNCTION_SET_RS485_ADDRESS, [address], 'C', 0, '')
     end
 
     # Returns the address as set by BrickMaster#set_rs485_address.
-    # 
-    # .. versionadded:: 1.2.0~(Firmware)
     def get_rs485_address
       send_request(FUNCTION_GET_RS485_ADDRESS, [], '', 1, 'C')
     end
@@ -504,16 +484,12 @@ module Tinkerforge
     # 
     # The slave addresses will be saved in the EEPROM of the Chibi Extension, they
     # don't have to be set on every startup.
-    # 
-    # .. versionadded:: 1.2.0~(Firmware)
     def set_rs485_slave_address(num, address)
       send_request(FUNCTION_SET_RS485_SLAVE_ADDRESS, [num, address], 'C C', 0, '')
     end
 
     # Returns the slave address for a given ``num`` as set by
     # BrickMaster#set_rs485_slave_address.
-    # 
-    # .. versionadded:: 1.2.0~(Firmware)
     def get_rs485_slave_address(num)
       send_request(FUNCTION_GET_RS485_SLAVE_ADDRESS, [num], 'C', 1, 'C')
     end
@@ -522,8 +498,6 @@ module Tinkerforge
     # If this counter starts rising, it is likely that the distance
     # between the RS485 nodes is too big or there is some kind of
     # interference.
-    # 
-    # .. versionadded:: 1.2.0~(Firmware)
     def get_rs485_error_log
       send_request(FUNCTION_GET_RS485_ERROR_LOG, [], '', 2, 'S')
     end
@@ -540,22 +514,16 @@ module Tinkerforge
     # 
     # The values are stored in the EEPROM and only applied on startup. That means
     # you have to restart the Master Brick after configuration.
-    # 
-    # .. versionadded:: 1.2.0~(Firmware)
     def set_rs485_configuration(speed, parity, stopbits)
       send_request(FUNCTION_SET_RS485_CONFIGURATION, [speed, parity, stopbits], 'L k C', 0, '')
     end
 
     # Returns the configuration as set by BrickMaster#set_rs485_configuration.
-    # 
-    # .. versionadded:: 1.2.0~(Firmware)
     def get_rs485_configuration
       send_request(FUNCTION_GET_RS485_CONFIGURATION, [], '', 6, 'L k C')
     end
 
     # Returns *true* if a WIFI Extension is available to be used by the Master Brick.
-    # 
-    # .. versionadded:: 1.2.0~(Firmware)
     def is_wifi_present
       send_request(FUNCTION_IS_WIFI_PRESENT, [], '', 1, '?')
     end
@@ -585,15 +553,11 @@ module Tinkerforge
     # you have to restart the Master Brick after configuration.
     # 
     # It is recommended to use the Brick Viewer to set the WIFI configuration.
-    # 
-    # .. versionadded:: 1.3.0~(Firmware)
     def set_wifi_configuration(ssid, connection, ip, subnet_mask, gateway, port)
       send_request(FUNCTION_SET_WIFI_CONFIGURATION, [ssid, connection, ip, subnet_mask, gateway, port], 'Z32 C C4 C4 C4 S', 0, '')
     end
 
     # Returns the configuration as set by BrickMaster#set_wifi_configuration.
-    # 
-    # .. versionadded:: 1.3.0~(Firmware)
     def get_wifi_configuration
       send_request(FUNCTION_GET_WIFI_CONFIGURATION, [], '', 47, 'Z32 C C4 C4 C4 S')
     end
@@ -637,15 +601,11 @@ module Tinkerforge
     # you have to restart the Master Brick after configuration.
     # 
     # It is recommended to use the Brick Viewer to set the WIFI encryption.
-    # 
-    # .. versionadded:: 1.3.0~(Firmware)
     def set_wifi_encryption(encryption, key, key_index, eap_options, ca_certificate_length, client_certificate_length, private_key_length)
       send_request(FUNCTION_SET_WIFI_ENCRYPTION, [encryption, key, key_index, eap_options, ca_certificate_length, client_certificate_length, private_key_length], 'C Z50 C C S S S', 0, '')
     end
 
     # Returns the encryption as set by BrickMaster#set_wifi_encryption.
-    # 
-    # .. versionadded:: 1.3.0~(Firmware)
     def get_wifi_encryption
       send_request(FUNCTION_GET_WIFI_ENCRYPTION, [], '', 59, 'C Z50 C C S S S')
     end
@@ -663,8 +623,6 @@ module Tinkerforge
     #  "2", "Associating"
     #  "3", "Error"
     #  "255", "Not initialized yet"
-    # 
-    # .. versionadded:: 1.3.0~(Firmware)
     def get_wifi_status
       send_request(FUNCTION_GET_WIFI_STATUS, [], '', 36, 'C6 C6 C s C4 C4 C4 L L C')
     end
@@ -675,8 +633,6 @@ module Tinkerforge
     # unfortunately time consuming. This means, that it might take some ms
     # until the stack with attached WIFI Extension reacts again after this
     # function is called.
-    # 
-    # .. versionadded:: 1.3.0~(Firmware)
     def refresh_wifi_status
       send_request(FUNCTION_REFRESH_WIFI_STATUS, [], '', 0, '')
     end
@@ -699,15 +655,11 @@ module Tinkerforge
     # 
     # It is recommended to use the Brick Viewer to set the certificate, username
     # and password.
-    # 
-    # .. versionadded:: 1.3.0~(Firmware)
     def set_wifi_certificate(index, data, data_length)
       send_request(FUNCTION_SET_WIFI_CERTIFICATE, [index, data, data_length], 'S C32 C', 0, '')
     end
 
     # Returns the certificate for a given index as set by BrickMaster#set_wifi_certificate.
-    # 
-    # .. versionadded:: 1.3.0~(Firmware)
     def get_wifi_certificate(index)
       send_request(FUNCTION_GET_WIFI_CERTIFICATE, [index], 'S', 33, 'C32 C')
     end
@@ -720,15 +672,11 @@ module Tinkerforge
     #  "1", "Low Power (low power consumption, low throughput)"
     # 
     # The default value is 0 (Full Speed).
-    # 
-    # .. versionadded:: 1.3.0~(Firmware)
     def set_wifi_power_mode(mode)
       send_request(FUNCTION_SET_WIFI_POWER_MODE, [mode], 'C', 0, '')
     end
 
     # Returns the power mode as set by BrickMaster#set_wifi_power_mode.
-    # 
-    # .. versionadded:: 1.3.0~(Firmware)
     def get_wifi_power_mode
       send_request(FUNCTION_GET_WIFI_POWER_MODE, [], '', 1, 'C')
     end
@@ -747,8 +695,6 @@ module Tinkerforge
     # 
     # Try to not send more then 50 messages at a time without any kind of
     # break between them.
-    # 
-    # .. versionadded:: 1.3.2~(Firmware)
     def get_wifi_buffer_info
       send_request(FUNCTION_GET_WIFI_BUFFER_INFO, [], '', 8, 'L S S')
     end
@@ -762,22 +708,16 @@ module Tinkerforge
     #  "2", "TELEC: Channel 1-14 (Japan)"
     # 
     # The default value is 1 (ETSI).
-    # 
-    # .. versionadded:: 1.3.4~(Firmware)
     def set_wifi_regulatory_domain(domain)
       send_request(FUNCTION_SET_WIFI_REGULATORY_DOMAIN, [domain], 'C', 0, '')
     end
 
     # Returns the regulatory domain as set by BrickMaster#set_wifi_regulatory_domain.
-    # 
-    # .. versionadded:: 1.3.4~(Firmware)
     def get_wifi_regulatory_domain
       send_request(FUNCTION_GET_WIFI_REGULATORY_DOMAIN, [], '', 1, 'C')
     end
 
     # Returns the USB voltage in mV.
-    # 
-    # .. versionadded:: 1.3.5~(Firmware)
     def get_usb_voltage
       send_request(FUNCTION_GET_USB_VOLTAGE, [], '', 2, 'S')
     end
@@ -1067,13 +1007,88 @@ module Tinkerforge
       send_request(FUNCTION_SET_ETHERNET_MAC_ADDRESS, [mac_address], 'C6', 0, '')
     end
 
+    # Sets the Ethernet WebSocket configuration. The first parameter sets the number of socket
+    # connections that are reserved for WebSockets. The range is 0-7. The connections
+    # are shared with the plain sockets. Example: If you set the connections to 3,
+    # there will be 3 WebSocket and 4 plain socket connections available.
+    # 
+    # The second parameter is the port for the WebSocket connections. The port can
+    # not be the same as the port for the plain socket connections.
+    # 
+    # The values are stored in the EEPROM and only applied on startup. That means
+    # you have to restart the Master Brick after configuration.
+    # 
+    # It is recommended to use the Brick Viewer to set the Ethernet configuration.
+    # 
+    # The default values are 3 for the socket connections and 4280 for the port.
+    # 
+    # .. versionadded:: 2.2.0~(Firmware)
+    def set_ethernet_websocket_configuration(sockets, port)
+      send_request(FUNCTION_SET_ETHERNET_WEBSOCKET_CONFIGURATION, [sockets, port], 'C S', 0, '')
+    end
+
+    # Returns the configuration as set by BrickMaster#set_ethernet_configuration.
+    # 
+    # .. versionadded:: 2.2.0~(Firmware)
+    def get_ethernet_websocket_configuration
+      send_request(FUNCTION_GET_ETHERNET_WEBSOCKET_CONFIGURATION, [], '', 3, 'C S')
+    end
+
+    # Sets the Ethernet authentication secret. The secret can be a string of up to 64
+    # characters. An empty string disables the authentication.
+    # 
+    # See the :ref:`authentication tutorial <tutorial_authentication>` for more
+    # information.
+    # 
+    # The secret is stored in the EEPROM and only applied on startup. That means
+    # you have to restart the Master Brick after configuration.
+    # 
+    # It is recommended to use the Brick Viewer to set the Ethernet authentication secret.
+    # 
+    # The default value is an empty string (authentication disabled).
+    # 
+    # .. versionadded:: 2.2.0~(Firmware)
+    def set_ethernet_authentication_secret(secret)
+      send_request(FUNCTION_SET_ETHERNET_AUTHENTICATION_SECRET, [secret], 'Z64', 0, '')
+    end
+
+    # Returns the authentication secret as set by BrickMaster#set_ethernet_authentication_secret.
+    # 
+    # .. versionadded:: 2.2.0~(Firmware)
+    def get_ethernet_authentication_secret
+      send_request(FUNCTION_GET_ETHERNET_AUTHENTICATION_SECRET, [], '', 64, 'Z64')
+    end
+
+    # Sets the WIFI authentication secret. The secret can be a string of up to 64
+    # characters. An empty string disables the authentication.
+    # 
+    # See the :ref:`authentication tutorial <tutorial_authentication>` for more
+    # information.
+    # 
+    # The secret is stored in the EEPROM and only applied on startup. That means
+    # you have to restart the Master Brick after configuration.
+    # 
+    # It is recommended to use the Brick Viewer to set the WIFI authentication secret.
+    # 
+    # The default value is an empty string (authentication disabled).
+    # 
+    # .. versionadded:: 2.2.0~(Firmware)
+    def set_wifi_authentication_secret(secret)
+      send_request(FUNCTION_SET_WIFI_AUTHENTICATION_SECRET, [secret], 'Z64', 0, '')
+    end
+
+    # Returns the authentication secret as set by BrickMaster#set_wifi_authentication_secret.
+    # 
+    # .. versionadded:: 2.2.0~(Firmware)
+    def get_wifi_authentication_secret
+      send_request(FUNCTION_GET_WIFI_AUTHENTICATION_SECRET, [], '', 64, 'Z64')
+    end
+
     # Returns the firmware and protocol version and the name of the Bricklet for a
     # given port.
     # 
     # This functions sole purpose is to allow automatic flashing of v1.x.y Bricklet
     # plugins.
-    # 
-    # .. versionadded:: 2.0.0~(Firmware)
     def get_protocol1_bricklet_name(port)
       send_request(FUNCTION_GET_PROTOCOL1_BRICKLET_NAME, [port], 'k', 44, 'C C3 Z40')
     end
@@ -1084,8 +1099,6 @@ module Tinkerforge
     # The temperature is only proportional to the real temperature and it has an
     # accuracy of +-15%. Practically it is only useful as an indicator for
     # temperature changes.
-    # 
-    # .. versionadded:: 1.2.1~(Firmware)
     def get_chip_temperature
       send_request(FUNCTION_GET_CHIP_TEMPERATURE, [], '', 2, 's')
     end
@@ -1096,8 +1109,6 @@ module Tinkerforge
     # After a reset you have to create new device objects,
     # calling functions on the existing ones will result in
     # undefined behavior!
-    # 
-    # .. versionadded:: 1.2.1~(Firmware)
     def reset
       send_request(FUNCTION_RESET, [], '', 0, '')
     end
@@ -1108,9 +1119,8 @@ module Tinkerforge
     # 
     # The position can be '0'-'8' (stack position).
     # 
-    # The device identifiers can be found :ref:`here <device_identifier>`.
-    # 
-    # .. versionadded:: 2.0.0~(Firmware)
+    # The device identifier numbers can be found :ref:`here <device_identifier>`.
+    # |device_identifier_constant|
     def get_identity
       send_request(FUNCTION_GET_IDENTITY, [], '', 25, 'Z8 Z8 k C3 C3 S')
     end