Index: /trunk/papywizard/common/config.py
===================================================================
--- /trunk/papywizard/common/config.py	(revision 2226)
+++ /trunk/papywizard/common/config.py	(revision 2227)
@@ -53,5 +53,5 @@
 VERSION_MAJOR = 2
 VERSION_MINOR = 1  # Odd means dev. release
-VERSION_UPDATE = 14
+VERSION_UPDATE = 15
 VERSION = "%d.%d.%d" % (VERSION_MAJOR, VERSION_MINOR, VERSION_UPDATE)
 VERSION_XML = "b"
@@ -160,5 +160,4 @@
 BLUETOOTH_DRIVER_CONNECT_DELAY = 8.
 SERIAL_BAUDRATE = 9600
-DRIVER_TIMEOUT = 1.  # s
 
 # Spy
Index: /trunk/papywizard/common/papywizard.conf
===================================================================
--- /trunk/papywizard/common/papywizard.conf	(revision 2226)
+++ /trunk/papywizard/common/papywizard.conf	(revision 2227)
@@ -126,2 +126,8 @@
 HARDWARE_ETHERNET_HOST = 169.254.1.1
 HARDWARE_ETHERNET_PORT = 2000
+
+# Communication timeout (s)
+HARDWARE_COM_TIMEOUT = 1.
+
+# Communication retry
+HARDWARE_COM_RETRY = 3
Index: /trunk/papywizard/controller/pluginsController.py
===================================================================
--- /trunk/papywizard/controller/pluginsController.py	(revision 2226)
+++ /trunk/papywizard/controller/pluginsController.py	(revision 2227)
@@ -147,4 +147,9 @@
         ConfigManager().set('Plugins/HARDWARE_ETHERNET_HOST', unicode(self._view.ethernetHostLineEdit.text()))
         ConfigManager().setInt('Plugins/HARDWARE_ETHERNET_PORT', self._view.ethernetPortSpinBox.value())
+
+        # Communication tab
+        ConfigManager().setFloat('Plugins/HARDWARE_COM_TIMEOUT', self._view.comTimeoutDoubleSpinBox.value(), 1)
+        ConfigManager().setInt('Plugins/HARDWARE_COM_RETRY', self._view.comRetrySpinBox.value())
+
         ConfigManager().save()
 
@@ -282,4 +287,8 @@
         self._view.ethernetPortSpinBox.setValue(ConfigManager().getInt('Plugins/HARDWARE_ETHERNET_PORT'))
 
+        # Communication tab
+        self._view.comTimeoutDoubleSpinBox.setValue(ConfigManager().getFloat('Plugins/HARDWARE_COM_TIMEOUT'))
+        self._view.comRetrySpinBox.setValue(ConfigManager().getInt('Plugins/HARDWARE_COM_RETRY'))
+
     def getSelectedTab(self):
         """ Return the selected tab.