diff --git a/hbw_el_io6.xml b/hbw_el_io6.xml
index e035235..43820d3 100644
--- a/hbw_el_io6.xml
+++ b/hbw_el_io6.xml
@@ -1,152 +1,223 @@
-<?xml version="1.0"?>
-<device eep_size="512" version="01">
-<supported_types>
-	<type priority="2" id="HBW-EBIO6" name="Elektor EBus I/O6 Board">
-		<parameter const_value="0xE2" size="1" index="0"/>
-		<parameter const_value="0" size="1" index="1"/>
-	</type>
-</supported_types>
-
-<paramset id="HBW-EBIO6_dev_master" type="MASTER">
-	<parameter id="LOGGING_TIME">
-		<logical type="float" unit="s" default="5.0" max="25.5" min="0.1"/>
-		<physical size="1.0" type="integer" interface="eeprom">
-			<address index="0x0001"/>
-		</physical>
-		<conversion type="float_integer_scale" offset="0.0" factor="10"/>
-	</parameter>
-	<parameter id="CENTRAL_ADDRESS" hidden="true">
-		<logical type="integer"/>
-		<physical size="4" type="integer" interface="eeprom">
-			<address index="0x0002"/>
-		</physical>
-	</parameter>
-	<enforce id="CENTRAL_ADDRESS" value="1"/>
-</paramset>
-
-<frames>
-	<frame id="LEVEL_SET" type="#x" channel_field="10" direction="to_device">
-		<parameter size="1.0" index="11.0" type="integer" param="LEVEL"/>
-	</frame>
-	<frame id="LEVEL_GET" type="#S" channel_field="10" direction="to_device"/>
-	<frame id="INFO_LEVEL" type="#i" channel_field="10" direction="from_device" event="true">
-		<parameter size="1.0" index="11.0" type="integer" param="LEVEL"/>
-	</frame>
-</frames>
+<?xml version="1.0" encoding="utf-8"?>
 
-
-<channels>
-	<channel index="0" type="MAINTENANCE" count="1" class="maintenance" ui_flags="internal">
-	</channel>
-	<channel index="1" type="SWITCH" count="4" physical_index_offset="-1">
-		<paramset id="hmw_switch_ch_master" type="MASTER" address_step="2" address_start="0x06">
-			<parameter id="LOGGING">
-				<logical type="option">
-					<option id="OFF"/>
-					<option id="ON" default="true"/>
-				</logical>
-				<physical size="0.1" type="integer" interface="eeprom">
-					<address index="+0"/>
-				</physical>
-			</parameter>
-		</paramset>
-		<paramset id="hmw_switch_ch_link" type="LINK" count="16" address_start="0x1a" address_step="7" peer_param="SENSOR" channel_param="CHANNEL">
-                        <parameter id="SENSOR" hidden="true" operations="none">
-                                <logical type="address"/>
-                                <physical type="array">
-                                        <physical size="4.0" type="integer" interface="eeprom">
-                                                <address index="+0"/>
-                                        </physical>
-                                        <physical size="1.0" type="integer" interface="eeprom">
-                                                <address index="+4"/>
-                                        </physical>
-                                </physical>
-                        </parameter>
-                        <parameter id="CHANNEL" hidden="true" operations="none">
-                                <logical type="integer" min="0" max="255" default="255"/>
-                                <physical size="1.0" type="integer" interface="eeprom">
-                                        <address index="+5"/>
-                                </physical>
-                        </parameter>
-                        <parameter id="SHORT_ACTION_TYPE">
-                                <logical type="option">
-                                        <option id="ON"/>
-                                        <option id="OFF"/>
-                                        <option id="INACTIVE"/>
-                                        <option id="TOGGLE" default="true"/>
-                                </logical>
-                                <physical size="0.2" type="integer" interface="eeprom">
-                                        <address index="+6"/>
-                                </physical>
-                        </parameter>
-                        <parameter id="LONG_ACTION_TYPE">
-                                <logical type="option">
-                                        <option id="ON"/>
-                                        <option id="OFF"/>
-                                        <option id="INACTIVE"/>
-                                        <option id="TOGGLE" default="true"/>
-                                </logical>
-                                <physical size="0.2" type="integer" interface="eeprom">
-                                        <address index="+6.2"/>
-                                </physical>
-                        </parameter>
-                        <parameter id="LONGRELEASE_ACTION_TYPE">
-                                <logical type="option">
-                                        <option id="ON"/>
-                                        <option id="OFF"/>
-                                        <option id="INACTIVE" default="true"/>
-                                        <option id="TOGGLE"/>
-                                </logical>
-                                <physical size="0.2" type="integer" interface="eeprom">
-                                        <address index="+6.4"/>
-                                </physical>
-                        </parameter>
-                        <parameter id="DOUBLE_ACTION_TYPE">
-                                <logical type="option">
-                                        <option id="ON"/>
-                                        <option id="OFF"/>
-                                        <option id="INACTIVE" default="true"/>
-                                        <option id="TOGGLE"/>
-                                </logical>
-                                <physical size="0.2" type="integer" interface="eeprom">
-                                        <address index="+6.6"/>
-                                </physical>
-                        </parameter>
-                </paramset>
-		<paramset id="hmw_switch_ch_values" type="VALUES">
-			<parameter id="STATE" operations="read,write,event" control="SWITCH.STATE">
-				<logical type="boolean" default="false"/>
-				<physical type="integer" interface="command" value_id="LEVEL">
-					<set request="LEVEL_SET"/>
-					<get request="LEVEL_GET" response="INFO_LEVEL"/>
-					<event frame="INFO_LEVEL"/>
-				</physical>
-				<conversion type="boolean_integer" true="200" false="0" threshold="1"/>
-			</parameter>
-		</paramset>
-	</channel>
-	<channel index="5" type="SENSOR" count="6" physical_index_offset="-1">
-		<paramset id="hmw_sensor_ch_master" type="MASTER" address_step="2" address_start="0x0e">
-			<parameter id="LOGGING">
-				<logical type="option">
-					<option id="OFF"/>
-					<option id="ON" default="true"/>
-				</logical>
-				<physical size="0.1" type="integer" interface="eeprom">
-					<address index="+0"/>
-				</physical>
-			</parameter>
-		</paramset>
-		<paramset id="hmw_sensor_ch_values" type="VALUES">
-			<parameter id="STATE" operations="read,event" control="SWITCH.STATE">
-				<logical type="boolean" default="false"/>
-				<physical type="integer" interface="command" value_id="LEVEL">
-					<get request="LEVEL_GET" response="INFO_LEVEL"/>
-					<event frame="INFO_LEVEL"/>
-				</physical>
-				<conversion type="boolean_integer" true="200" false="0" threshold="1"/>
-			</parameter>
-		</paramset>
-	</channel>
-</channels>
+<device eep_size="512" version="01">
+  <supported_types>
+    <type priority="2" id="HBW-EBIO6" name="Elektor EBus I/O6 Board">
+      <parameter const_value="0xE2" size="1" index="0" />
+      <parameter const_value="0" size="1" index="1" />
+    </type>
+  </supported_types>
+  <paramset id="HBW-EBIO6_dev_master" type="MASTER">
+    <parameter id="LOGGING_TIME">
+      <logical type="float" unit="s" default="5.0" max="25.5" min="0.1" />
+      <physical size="1.0" type="integer" interface="eeprom">
+        <address index="0x0001" />
+      </physical>
+      <conversion type="float_integer_scale" offset="0.0" factor="10" />
+    </parameter>
+    <parameter id="CENTRAL_ADDRESS" hidden="true">
+      <logical type="integer" />
+      <physical size="4" type="integer" interface="eeprom">
+        <address index="0x0002" />
+      </physical>
+    </parameter>
+    <enforce id="CENTRAL_ADDRESS" value="1" />
+  </paramset>
+  <frames>
+    <frame id="LEVEL_SET" type="#x" channel_field="10" direction="to_device">
+      <parameter size="1.0" index="11.0" type="integer" param="LEVEL" />
+    </frame>
+    <frame id="LEVEL_GET" type="#S" channel_field="10" direction="to_device" />
+    <frame id="INFO_LEVEL" type="#i" channel_field="10" direction="from_device" event="true">
+      <parameter size="2.0" index="11.0" type="integer" param="LEVEL" />
+    </frame>
+  </frames>
+  <channels>
+    <channel index="0" type="MAINTENANCE" ui_flags="internal" class="maintenance" count="1">
+      <paramset type="MASTER" id="maint_ch_master" />
+      <paramset type="VALUES" id="maint_ch_values">
+        <parameter id="UNREACH" operations="read,event" ui_flags="service">
+          <logical type="boolean" />
+          <physical type="integer" interface="internal" value_id="UNREACH" />
+        </parameter>
+        <parameter id="STICKY_UNREACH" operations="read,write,event" ui_flags="service">
+          <logical type="boolean" />
+          <physical type="integer" interface="internal" value_id="STICKY_UNREACH" />
+        </parameter>
+        <parameter id="CONFIG_PENDING" operations="read,event" ui_flags="service">
+          <logical type="boolean" />
+          <physical type="integer" interface="internal" value_id="CONFIG_PENDING" />
+        </parameter>
+      </paramset>
+    </channel>
+    <channel index="1" type="SWITCH" count="4" physical_index_offset="-1">
+      <paramset id="hmw_switch_ch_master" type="MASTER" address_step="1" address_start="0x06">
+        <parameter id="LOGGING">
+          <logical type="option">
+            <option id="OFF" />
+            <option id="ON" default="true" />
+          </logical>
+          <physical size="0.1" type="integer" interface="eeprom">
+            <address index="+0" />
+          </physical>
+        </parameter>
+      </paramset>
+      <paramset id="hmw_switch_ch_link" type="LINK" count="16" address_start="0x38" address_step="7" peer_param="SENSOR" channel_param="CHANNEL">
+        <parameter id="SENSOR" hidden="true" operations="none">
+          <logical type="address" />
+          <physical type="array">
+            <physical size="4.0" type="integer" interface="eeprom">
+              <address index="+0" />
+            </physical>
+            <physical size="1.0" type="integer" interface="eeprom">
+              <address index="+4" />
+            </physical>
+          </physical>
+        </parameter>
+        <parameter id="CHANNEL" hidden="true" operations="none">
+          <logical type="integer" min="0" max="255" default="255" />
+          <physical size="1.0" type="integer" interface="eeprom">
+            <address index="+5" />
+          </physical>
+        </parameter>
+        <parameter id="SHORT_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" />
+            <option id="TOGGLE" default="true" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6" />
+          </physical>
+        </parameter>
+        <parameter id="LONG_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" />
+            <option id="TOGGLE" default="true" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6.2" />
+          </physical>
+        </parameter>
+        <parameter id="LONGRELEASE_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" default="true" />
+            <option id="TOGGLE" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6.4" />
+          </physical>
+        </parameter>
+        <parameter id="DOUBLE_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" default="true" />
+            <option id="TOGGLE" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6.6" />
+          </physical>
+        </parameter>
+      </paramset>
+      <paramset id="hmw_switch_ch_values" type="VALUES">
+        <parameter id="STATE" operations="read,write,event" control="SWITCH.STATE">
+          <logical type="boolean" default="false" />
+          <physical type="integer" interface="command" value_id="LEVEL">
+            <set request="LEVEL_SET" />
+            <get request="LEVEL_GET" response="INFO_LEVEL" />
+            <event frame="INFO_LEVEL" />
+          </physical>
+          <conversion type="boolean_integer" true="200" false="0" threshold="1" />
+        </parameter>
+      </paramset>
+    </channel>
+    <channel index="5" type="INPUT" count="6" physical_index_offset="-1">
+      <special_parameter id="BEHAVIOUR">
+        <logical type="integer" />
+        <physical interface="eeprom" size="0.1" type="integer">
+          <address index="0x0a" step="0.1" />
+        </physical>
+      </special_parameter>
+      <paramset address_start="0x0b" address_step="0" id="hmw_io_ch_master" type="MASTER">
+        <parameter id="BEHAVIOUR" ui_flags="transform">
+          <logical type="option">
+            <option default="true" id="DIGITAL_INPUT" />
+            <option id="ANALOG_INPUT" />
+          </logical>
+          <physical interface="internal" type="integer" value_id="BEHAVIOUR" />
+        </parameter>
+      </paramset>
+      <paramset id="hmw_switch_ch_values" type="VALUES">
+        <parameter id="STATE" operations="read,event" control="SWITCH.STATE">
+          <logical type="boolean" default="false" />
+          <physical type="integer" interface="command" value_id="LEVEL">
+            <get request="LEVEL_GET" response="INFO_LEVEL" />
+            <event frame="INFO_LEVEL" />
+          </physical>
+          <conversion type="boolean_integer" true="200" false="0" threshold="1" />
+        </parameter>
+      </paramset>
+      <subconfig>
+        <paramset address_start="0x0b" address_step="7" id="hmw_io_ch_master" type="MASTER">
+          <parameter id="SEND_DELTA_VOLT">
+            <logical type="float" unit="V" default="0.5" min="0.1" max="25.0">
+              <special_value id="NOT_USED" value="0" />
+            </logical>
+            <physical size="1.0" type="integer" interface="eeprom">
+              <address index="+0.0" />
+            </physical>
+            <conversion type="float_integer_scale" factor="10" />
+            <conversion type="integer_integer_map">
+              <value_map to_device="false" from_device="true" parameter_value="5" device_value="0xff" />
+            </conversion>
+          </parameter>
+          <parameter id="SEND_MIN_INTERVAL">
+            <logical type="integer" unit="s" default="10" min="5" max="3600">
+              <special_value id="NOT_USED" value="0" />
+            </logical>
+            <physical size="2.0" type="integer" interface="eeprom" endian="little">
+              <address index="+2.0" />
+            </physical>
+            <conversion type="integer_integer_map">
+              <value_map to_device="false" from_device="true" parameter_value="10" device_value="0xffff" />
+            </conversion>
+          </parameter>
+          <parameter id="SEND_MAX_INTERVAL">
+            <logical type="integer" unit="s" default="150" min="5" max="3600">
+              <special_value id="NOT_USED" value="0" />
+            </logical>
+            <physical size="2.0" type="integer" interface="eeprom" endian="little">
+              <address index="+4.0" />
+            </physical>
+            <conversion type="integer_integer_map">
+              <value_map to_device="false" from_device="true" parameter_value="150" device_value="0xffff" />
+            </conversion>
+          </parameter>
+          <parameter id="BEHAVIOUR" ui_flags="transform">
+            <logical type="option">
+              <option default="true" id="DIGITAL_INPUT" />
+              <option id="ANALOG_INPUT" />
+            </logical>
+            <physical interface="internal" type="integer" value_id="BEHAVIOUR" />
+          </parameter>
+        </paramset>
+        <paramset type="VALUES" id="hmw_digital_input_values">
+          <parameter id="LEVEL" operations="read,event">
+            <logical type="float" min="0" max="20.47" unit="V" />
+            <physical type="integer" interface="command" value_id="VOLTAGE">
+              <get request="LEVEL_GET" response="INFO_LEVEL" />
+              <event frame="INFO_LEVEL" />
+            </physical>
+            <conversion type="float_integer_scale" factor="100" />
+          </parameter>
+        </paramset>
+      </subconfig>
+    </channel>
+  </channels>
 </device>
diff --git a/hbw_el_relais.xml b/hbw_el_relais.xml
index 5fe1d01..32819f2 100644
--- a/hbw_el_relais.xml
+++ b/hbw_el_relais.xml
@@ -1,152 +1,164 @@
-<?xml version="1.0"?>
-<device eep_size="512" version="01">
-<supported_types>
-	<type priority="2" id="HBW-EBRELAIS" name="Elektor EBus Relais Board">
-		<parameter const_value="0xE1" size="1" index="0"/>
-		<parameter const_value="0" size="1" index="1"/>
-	</type>
-</supported_types>
-
-<paramset id="HBW-EBRELAIS_dev_master" type="MASTER">
-	<parameter id="LOGGING_TIME">
-		<logical type="float" unit="s" default="5.0" max="25.5" min="0.1"/>
-		<physical size="1.0" type="integer" interface="eeprom">
-			<address index="0x0001"/>
-		</physical>
-		<conversion type="float_integer_scale" offset="0.0" factor="10"/>
-	</parameter>
-	<parameter id="CENTRAL_ADDRESS" hidden="true">
-		<logical type="integer"/>
-		<physical size="4" type="integer" interface="eeprom">
-			<address index="0x0002"/>
-		</physical>
-	</parameter>
-	<enforce id="CENTRAL_ADDRESS" value="1"/>
-</paramset>
-
-<frames>
-	<frame id="LEVEL_SET" type="#x" channel_field="10" direction="to_device">
-		<parameter size="1.0" index="11.0" type="integer" param="LEVEL"/>
-	</frame>
-	<frame id="LEVEL_GET" type="#S" channel_field="10" direction="to_device"/>
-	<frame id="INFO_LEVEL" type="#i" channel_field="10" direction="from_device" event="true">
-		<parameter size="1.0" index="11.0" type="integer" param="LEVEL"/>
-	</frame>
-</frames>
+<?xml version="1.0" encoding="utf-8"?>
 
-
-<channels>
-	<channel index="0" type="MAINTENANCE" count="1" class="maintenance" ui_flags="internal">
-	</channel>
-	<channel index="1" type="SWITCH" count="2" physical_index_offset="-1">
-		<paramset id="hmw_switch_ch_master" type="MASTER" address_step="2" address_start="0x06">
-			<parameter id="LOGGING">
-				<logical type="option">
-					<option id="OFF"/>
-					<option id="ON" default="true"/>
-				</logical>
-				<physical size="0.1" type="integer" interface="eeprom">
-					<address index="+0"/>
-				</physical>
-			</parameter>
-		</paramset>
-		<paramset id="hmw_switch_ch_link" type="LINK" count="16" address_start="0x12" address_step="7" peer_param="SENSOR" channel_param="CHANNEL">
-                        <parameter id="SENSOR" hidden="true" operations="none">
-                                <logical type="address"/>
-                                <physical type="array">
-                                        <physical size="4.0" type="integer" interface="eeprom">
-                                                <address index="+0"/>
-                                        </physical>
-                                        <physical size="1.0" type="integer" interface="eeprom">
-                                                <address index="+4"/>
-                                        </physical>
-                                </physical>
-                        </parameter>
-                        <parameter id="CHANNEL" hidden="true" operations="none">
-                                <logical type="integer" min="0" max="255" default="255"/>
-                                <physical size="1.0" type="integer" interface="eeprom">
-                                        <address index="+5"/>
-                                </physical>
-                        </parameter>
-                        <parameter id="SHORT_ACTION_TYPE">
-                                <logical type="option">
-                                        <option id="ON"/>
-                                        <option id="OFF"/>
-                                        <option id="INACTIVE"/>
-                                        <option id="TOGGLE" default="true"/>
-                                </logical>
-                                <physical size="0.2" type="integer" interface="eeprom">
-                                        <address index="+6"/>
-                                </physical>
-                        </parameter>
-                        <parameter id="LONG_ACTION_TYPE">
-                                <logical type="option">
-                                        <option id="ON"/>
-                                        <option id="OFF"/>
-                                        <option id="INACTIVE"/>
-                                        <option id="TOGGLE" default="true"/>
-                                </logical>
-                                <physical size="0.2" type="integer" interface="eeprom">
-                                        <address index="+6.2"/>
-                                </physical>
-                        </parameter>
-                        <parameter id="LONGRELEASE_ACTION_TYPE">
-                                <logical type="option">
-                                        <option id="ON"/>
-                                        <option id="OFF"/>
-                                        <option id="INACTIVE" default="true"/>
-                                        <option id="TOGGLE"/>
-                                </logical>
-                                <physical size="0.2" type="integer" interface="eeprom">
-                                        <address index="+6.4"/>
-                                </physical>
-                        </parameter>
-                        <parameter id="DOUBLE_ACTION_TYPE">
-                                <logical type="option">
-                                        <option id="ON"/>
-                                        <option id="OFF"/>
-                                        <option id="INACTIVE" default="true"/>
-                                        <option id="TOGGLE"/>
-                                </logical>
-                                <physical size="0.2" type="integer" interface="eeprom">
-                                        <address index="+6.6"/>
-                                </physical>
-                        </parameter>
-                </paramset>
-		<paramset id="hmw_switch_ch_values" type="VALUES">
-			<parameter id="STATE" operations="read,write,event" control="SWITCH.STATE">
-				<logical type="boolean" default="false"/>
-				<physical type="integer" interface="command" value_id="LEVEL">
-					<set request="LEVEL_SET"/>
-					<get request="LEVEL_GET" response="INFO_LEVEL"/>
-					<event frame="INFO_LEVEL"/>
-				</physical>
-				<conversion type="boolean_integer" true="200" false="0" threshold="1"/>
-			</parameter>
-		</paramset>
-	</channel>
-	<channel index="3" type="SENSOR" count="4" physical_index_offset="-1">
-		<paramset id="hmw_sensor_ch_master" type="MASTER" address_step="2" address_start="0x0a">
-			<parameter id="LOGGING">
-				<logical type="option">
-					<option id="OFF"/>
-					<option id="ON" default="true"/>
-				</logical>
-				<physical size="0.1" type="integer" interface="eeprom">
-					<address index="+0"/>
-				</physical>
-			</parameter>
-		</paramset>
-		<paramset id="hmw_sensor_ch_values" type="VALUES">
-			<parameter id="STATE" operations="read,event" control="SWITCH.STATE">
-				<logical type="boolean" default="false"/>
-				<physical type="integer" interface="command" value_id="LEVEL">
-					<get request="LEVEL_GET" response="INFO_LEVEL"/>
-					<event frame="INFO_LEVEL"/>
-				</physical>
-				<conversion type="boolean_integer" true="200" false="0" threshold="1"/>
-			</parameter>
-		</paramset>
-	</channel>
-</channels>
+<device eep_size="512" version="01">
+  <supported_types>
+    <type priority="2" id="HBW-EBRELAIS" name="Elektor EBus Relais Board">
+      <parameter const_value="0xE1" size="1" index="0" />
+      <parameter const_value="0" size="1" index="1" />
+    </type>
+  </supported_types>
+  <paramset id="HBW-EBRELAIS_dev_master" type="MASTER">
+    <parameter id="LOGGING_TIME">
+      <logical type="float" unit="s" default="5.0" max="25.5" min="0.1" />
+      <physical size="1.0" type="integer" interface="eeprom">
+        <address index="0x0001" />
+      </physical>
+      <conversion type="float_integer_scale" offset="0.0" factor="10" />
+    </parameter>
+    <parameter id="CENTRAL_ADDRESS" hidden="true">
+      <logical type="integer" />
+      <physical size="4" type="integer" interface="eeprom">
+        <address index="0x0002" />
+      </physical>
+    </parameter>
+    <enforce id="CENTRAL_ADDRESS" value="1" />
+  </paramset>
+  <frames>
+    <frame id="LEVEL_SET" type="#x" channel_field="10" direction="to_device">
+      <parameter size="1.0" index="11.0" type="integer" param="LEVEL" />
+    </frame>
+    <frame id="LEVEL_GET" type="#S" channel_field="10" direction="to_device" />
+    <frame id="INFO_LEVEL" type="#i" channel_field="10" direction="from_device" event="true">
+      <parameter size="1.0" index="11.0" type="integer" param="LEVEL" />
+    </frame>
+  </frames>
+  <channels>
+    <channel index="0" type="MAINTENANCE" ui_flags="internal" class="maintenance" count="1">
+      <paramset type="MASTER" id="maint_ch_master" />
+      <paramset type="VALUES" id="maint_ch_values">
+        <parameter id="UNREACH" operations="read,event" ui_flags="service">
+          <logical type="boolean" />
+          <physical type="integer" interface="internal" value_id="UNREACH" />
+        </parameter>
+        <parameter id="STICKY_UNREACH" operations="read,write,event" ui_flags="service">
+          <logical type="boolean" />
+          <physical type="integer" interface="internal" value_id="STICKY_UNREACH" />
+        </parameter>
+        <parameter id="CONFIG_PENDING" operations="read,event" ui_flags="service">
+          <logical type="boolean" />
+          <physical type="integer" interface="internal" value_id="CONFIG_PENDING" />
+        </parameter>
+      </paramset>
+    </channel>
+    <channel index="1" type="SWITCH" count="2" physical_index_offset="-1">
+      <paramset id="hmw_switch_ch_master" type="MASTER" address_step="1" address_start="0x06">
+        <parameter id="LOGGING">
+          <logical type="option">
+            <option id="OFF" />
+            <option id="ON" default="true" />
+          </logical>
+          <physical size="0.1" type="integer" interface="eeprom">
+            <address index="+0" />
+          </physical>
+        </parameter>
+      </paramset>
+      <paramset id="hmw_switch_ch_link" type="LINK" count="16" address_start="0x0C" address_step="7" peer_param="SENSOR" channel_param="CHANNEL">
+        <parameter id="SENSOR" hidden="true" operations="none">
+          <logical type="address" />
+          <physical type="array">
+            <physical size="4.0" type="integer" interface="eeprom">
+              <address index="+0" />
+            </physical>
+            <physical size="1.0" type="integer" interface="eeprom">
+              <address index="+4" />
+            </physical>
+          </physical>
+        </parameter>
+        <parameter id="CHANNEL" hidden="true" operations="none">
+          <logical type="integer" min="0" max="255" default="255" />
+          <physical size="1.0" type="integer" interface="eeprom">
+            <address index="+5" />
+          </physical>
+        </parameter>
+        <parameter id="SHORT_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" />
+            <option id="TOGGLE" default="true" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6" />
+          </physical>
+        </parameter>
+        <parameter id="LONG_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" />
+            <option id="TOGGLE" default="true" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6.2" />
+          </physical>
+        </parameter>
+        <parameter id="LONGRELEASE_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" default="true" />
+            <option id="TOGGLE" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6.4" />
+          </physical>
+        </parameter>
+        <parameter id="DOUBLE_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" default="true" />
+            <option id="TOGGLE" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6.6" />
+          </physical>
+        </parameter>
+      </paramset>
+      <paramset id="hmw_switch_ch_values" type="VALUES">
+        <parameter id="STATE" operations="read,write,event" control="SWITCH.STATE">
+          <logical type="boolean" default="false" />
+          <physical type="integer" interface="command" value_id="LEVEL">
+            <set request="LEVEL_SET" />
+            <get request="LEVEL_GET" response="INFO_LEVEL" />
+            <event frame="INFO_LEVEL" />
+          </physical>
+          <conversion type="boolean_integer" true="200" false="0" threshold="1" />
+        </parameter>
+      </paramset>
+    </channel>
+    <channel index="3" type="SENSOR" count="4" physical_index_offset="-1">
+      <paramset id="hmw_sensor_ch_master" type="MASTER" address_step="1" address_start="0x08">
+        <parameter id="LOGGING">
+          <logical type="option">
+            <option id="OFF" />
+            <option id="ON" default="true" />
+          </logical>
+          <physical size="0.1" type="integer" interface="eeprom">
+            <address index="+0" />
+          </physical>
+        </parameter>
+      </paramset>
+      <paramset id="hmw_sensor_ch_values" type="VALUES">
+        <parameter id="STATE" operations="read,event" control="SWITCH.STATE">
+          <logical type="boolean" default="false" />
+          <physical type="integer" interface="command" value_id="LEVEL">
+            <get request="LEVEL_GET" response="INFO_LEVEL" />
+            <event frame="INFO_LEVEL" />
+          </physical>
+          <conversion type="boolean_integer" true="200" false="0" threshold="1" />
+        </parameter>
+      </paramset>
+    </channel>
+  </channels>
 </device>
diff --git a/hbw_el_test.xml b/hbw_el_test.xml
index 72b566d..1c0312e 100644
--- a/hbw_el_test.xml
+++ b/hbw_el_test.xml
@@ -1,210 +1,223 @@
-<?xml version="1.0"?>
-<device eep_size="512" version="01">
-<supported_types>
-	<type priority="2" id="HBW-EBTEST" name="Elektor EBus Test Board">
-		<parameter const_value="0xE0" size="1" index="0"/>
-		<parameter const_value="0" size="1" index="1"/>
-	</type>
-</supported_types>
-
-<paramset id="HBW-EBTEST_dev_master" type="MASTER">
-	<parameter id="LOGGING_TIME">
-		<logical type="float" unit="s" default="5.0" max="25.5" min="0.1"/>
-		<physical size="1.0" type="integer" interface="eeprom">
-			<address index="0x0001"/>
-		</physical>
-		<conversion type="float_integer_scale" offset="0.0" factor="10"/>
-	</parameter>
-	<parameter id="CENTRAL_ADDRESS" hidden="true">
-		<logical type="integer"/>
-		<physical size="4" type="integer" interface="eeprom">
-			<address index="0x0002"/>
-		</physical>
-	</parameter>
-	<enforce id="CENTRAL_ADDRESS" value="1"/>
-</paramset>
+<?xml version="1.0" encoding="utf-8"?>
 
-<frames>
-	<frame id="LEVEL_SET" type="#x" channel_field="10" direction="to_device">
-		<parameter size="1.0" index="11.0" type="integer" param="LEVEL"/>
-	</frame>
-	<frame id="LEVEL_GET" type="#S" channel_field="10" direction="to_device"/>
-	<frame id="INFO_LEVEL" type="#i" channel_field="10" direction="from_device" event="true">
-		<parameter size="1.0" index="11.0" type="integer" param="LEVEL"/>
-	</frame>
-	<frame id="KEY_EVENT_SHORT" type="#K" channel_field="10" direction="from_device" event="true">
-		<parameter const_value="2" size="0.2" index="12.0" type="integer"/>
-		<parameter size="0.6" index="12.2" type="integer" param="COUNTER"/>
-	</frame>
-	<frame id="KEY_EVENT_LONG" type="#K" channel_field="10" direction="from_device" event="true">
-		<parameter const_value="3" size="0.2" index="12.0" type="integer"/>
-		<parameter size="0.6" index="12.2" type="integer" param="COUNTER"/>
-	</frame>
-	<frame id="KEY_EVENT_LONGRELEASE" type="#K" channel_field="10" direction="from_device" event="true">
-		<parameter const_value="0" size="0.2" index="12.0" type="integer"/>
-		<parameter size="0.6" index="12.2" type="integer" param="COUNTER"/>
-	</frame>
-	<frame id="KEY_EVENT_DOUBLE" type="#K" channel_field="10" direction="from_device" event="true">
-		<parameter const_value="1" size="0.2" index="12.0" type="integer"/>
-		<parameter size="0.6" index="12.2" type="integer" param="COUNTER"/>
-	</frame>
-</frames>
-
-<channels>
-	<channel index="0" type="MAINTENANCE" count="1" class="maintenance" ui_flags="internal">
-	</channel>
-	<channel index="1" type="SWITCH" count="1" physical_index_offset="-1">
-		<paramset id="hmw_switch_ch_master" type="MASTER" address_step="1" address_start="0x06">
-			<parameter id="LOGGING">
-				<logical type="option">
-					<option id="OFF"/>
-					<option id="ON" default="true"/>
-				</logical>
-				<physical size="0.1" type="integer" interface="eeprom">
-					<address index="+0"/>
-				</physical>
-			</parameter>
-		</paramset>
-		<paramset id="hmw_switch_ch_link" type="LINK" count="16" address_start="0x10" address_step="7" peer_param="SENSOR" channel_param="CHANNEL">
-			<parameter id="SENSOR" hidden="true" operations="none">
-				<logical type="address"/>
-				<physical type="array">
-					<physical size="4.0" type="integer" interface="eeprom">
-						<address index="+0"/>
-					</physical>
-					<physical size="1.0" type="integer" interface="eeprom">
-						<address index="+4"/>
-					</physical>
-				</physical>
-			</parameter>
-			<parameter id="CHANNEL" hidden="true" operations="none">
-				<logical type="integer" min="0" max="255" default="255"/>
-				<physical size="1.0" type="integer" interface="eeprom">
-					<address index="+5"/>
-				</physical>
-			</parameter>
-			<parameter id="SHORT_ACTION_TYPE">
-	                	<logical type="option">
-					<option id="ON"/>
-					<option id="OFF"/>
-					<option id="INACTIVE"/>
-					<option id="TOGGLE" default="true"/>
-				</logical>
-				<physical size="0.2" type="integer" interface="eeprom">
-					<address index="+6"/>
-				</physical>
-			</parameter>
-			<parameter id="LONG_ACTION_TYPE">
-	                	<logical type="option">
-					<option id="ON"/>
-					<option id="OFF"/>
-					<option id="INACTIVE"/>
-					<option id="TOGGLE" default="true"/>
-				</logical>
-				<physical size="0.2" type="integer" interface="eeprom">
-					<address index="+6.2"/>
-				</physical>
-			</parameter>
-			<parameter id="LONGRELEASE_ACTION_TYPE">
-	                	<logical type="option">
-					<option id="ON"/>
-					<option id="OFF"/>
-					<option id="INACTIVE" default="true"/>
-					<option id="TOGGLE"/>
-				</logical>
-				<physical size="0.2" type="integer" interface="eeprom">
-					<address index="+6.4"/>
-				</physical>
-			</parameter>
-			<parameter id="DOUBLE_ACTION_TYPE">
-	                	<logical type="option">
-					<option id="ON"/>
-					<option id="OFF"/>
-					<option id="INACTIVE" default="true"/>
-					<option id="TOGGLE"/>
-				</logical>
-				<physical size="0.2" type="integer" interface="eeprom">
-					<address index="+6.6"/>
-				</physical>
-			</parameter>
-		</paramset>
-		<paramset id="hmw_switch_ch_values" type="VALUES">
-			<parameter id="STATE" operations="read,write,event" control="SWITCH.STATE">
-				<logical type="boolean" default="false"/>
-				<physical type="integer" interface="command" value_id="LEVEL">
-					<set request="LEVEL_SET"/>
-					<get request="LEVEL_GET" response="INFO_LEVEL"/>
-					<event frame="INFO_LEVEL"/>
-				</physical>
-				<conversion type="boolean_integer" true="200" false="0" threshold="1"/>
-			</parameter>
-		</paramset>
-	</channel>
-	<channel index="2" type="KEY" count="1" physical_index_offset="-1">
-		<link_roles>
-			<source name="SWITCH"/>
-		</link_roles>
-		<paramset id="hmw_input_ch_master" type="MASTER" address_step="1" address_start="0x07">
-			<parameter id="LONG_PRESS_TIME">
-				<logical type="float" unit="s" default="1.0" max="5.0" min="0.4"/>
-				<physical size="1.0" type="integer" interface="eeprom">
-					<address index="+1"/>
-				</physical>
-				<conversion type="float_integer_scale" factor="10"/>
-				<conversion type="integer_integer_map">
-					<value_map to_device="false" from_device="true" parameter_value="10" device_value="0xff"/>
-				</conversion>
-			</parameter>
-		</paramset>
-		<paramset id="hmw_input_ch_link" type="LINK" count="16" address_step="6" address_start="0x80" channel_param="CHANNEL" peer_param="ACTUATOR">
-			<parameter hidden="true" id="CHANNEL" operations="none">
-				<logical type="integer" default="255" max="255" min="0"/>
-				<physical size="1.0" type="integer" interface="eeprom">
-					<address index="+0"/>
-				</physical>
-			</parameter>
-			<parameter hidden="true" id="ACTUATOR" operations="none">
-				<logical type="address"/>
-				<physical type="array">
-					<physical size="4.0" type="integer" interface="eeprom">
-						<address index="+1"/>
-					</physical>
-					<physical size="1.0" type="integer" interface="eeprom">
-						<address index="+5"/>
-					</physical>
-				</physical>
-			</parameter>
-		</paramset>
-		<paramset id="hmw_input_ch_values" type="VALUES">
-			<parameter id="PRESS_SHORT" operations="event,write" loopback="true" control="BUTTON.SHORT">
-				<logical type="action"/>
-				<physical type="integer" interface="command" value_id="COUNTER">
-					<event frame="KEY_EVENT_SHORT"/>
-				</physical>
-				<conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER"/>
-			</parameter>
-			<parameter id="PRESS_LONG" operations="event,write" loopback="true" control="BUTTON.LONG">
-				<logical type="action"/>
-				<physical type="integer" interface="command" value_id="COUNTER">
-					<event frame="KEY_EVENT_LONG"/>
-				</physical>
-				<conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER"/>
-			</parameter>
-			<parameter id="RELEASE_LONG" operations="event" loopback="true" control="BUTTON.RELEASE">
-				<logical type="action"/>
-				<physical type="integer" interface="command" value_id="COUNTER">
-					<event frame="KEY_EVENT_LONGRELEASE"/>
-				</physical>
-				<conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER"/>
-			</parameter>
-			<parameter id="DOUBLECLICK" operations="event" loopback="true" control="BUTTON.DOUBLE">
-				<logical type="action"/>
-				<physical type="integer" interface="command" value_id="COUNTER">
-					<event frame="KEY_EVENT_DOUBLE"/>
-				</physical>
-				<conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER"/>
-			</parameter>
-		</paramset>
-	</channel>	
-</channels>
+<device eep_size="512" version="01">
+  <supported_types>
+    <type priority="2" id="HBW-EBTEST" name="Elektor EBus Test Board">
+      <parameter const_value="0xE0" size="1" index="0" />
+      <parameter const_value="0" size="1" index="1" />
+    </type>
+  </supported_types>
+  <paramset id="HBW-EBTEST_dev_master" type="MASTER">
+    <parameter id="LOGGING_TIME">
+      <logical type="float" unit="s" default="5.0" max="25.5" min="0.1" />
+      <physical size="1.0" type="integer" interface="eeprom">
+        <address index="0x0001" />
+      </physical>
+      <conversion type="float_integer_scale" offset="0.0" factor="10" />
+    </parameter>
+    <parameter id="CENTRAL_ADDRESS" hidden="true">
+      <logical type="integer" />
+      <physical size="4" type="integer" interface="eeprom">
+        <address index="0x0002" />
+      </physical>
+    </parameter>
+    <enforce id="CENTRAL_ADDRESS" value="1" />
+  </paramset>
+  <frames>
+    <frame id="LEVEL_SET" type="#x" channel_field="10" direction="to_device">
+      <parameter size="1.0" index="11.0" type="integer" param="LEVEL" />
+    </frame>
+    <frame id="LEVEL_GET" type="#S" channel_field="10" direction="to_device" />
+    <frame id="INFO_LEVEL" type="#i" channel_field="10" direction="from_device" event="true">
+      <parameter size="1.0" index="11.0" type="integer" param="LEVEL" />
+    </frame>
+    <frame id="KEY_EVENT_SHORT" type="#K" channel_field="10" direction="from_device" event="true">
+      <parameter const_value="2" size="0.2" index="12.0" type="integer" />
+      <parameter size="0.6" index="12.2" type="integer" param="COUNTER" />
+    </frame>
+    <frame id="KEY_EVENT_LONG" type="#K" channel_field="10" direction="from_device" event="true">
+      <parameter const_value="3" size="0.2" index="12.0" type="integer" />
+      <parameter size="0.6" index="12.2" type="integer" param="COUNTER" />
+    </frame>
+    <frame id="KEY_EVENT_LONGRELEASE" type="#K" channel_field="10" direction="from_device" event="true">
+      <parameter const_value="0" size="0.2" index="12.0" type="integer" />
+      <parameter size="0.6" index="12.2" type="integer" param="COUNTER" />
+    </frame>
+    <frame id="KEY_EVENT_DOUBLE" type="#K" channel_field="10" direction="from_device" event="true">
+      <parameter const_value="1" size="0.2" index="12.0" type="integer" />
+      <parameter size="0.6" index="12.2" type="integer" param="COUNTER" />
+    </frame>
+  </frames>
+  <channels>
+    <channel index="0" type="MAINTENANCE" ui_flags="internal" class="maintenance" count="1">
+      <paramset type="MASTER" id="maint_ch_master" />
+      <paramset type="VALUES" id="maint_ch_values">
+        <parameter id="UNREACH" operations="read,event" ui_flags="service">
+          <logical type="boolean" />
+          <physical type="integer" interface="internal" value_id="UNREACH" />
+        </parameter>
+        <parameter id="STICKY_UNREACH" operations="read,write,event" ui_flags="service">
+          <logical type="boolean" />
+          <physical type="integer" interface="internal" value_id="STICKY_UNREACH" />
+        </parameter>
+        <parameter id="CONFIG_PENDING" operations="read,event" ui_flags="service">
+          <logical type="boolean" />
+          <physical type="integer" interface="internal" value_id="CONFIG_PENDING" />
+        </parameter>
+      </paramset>
+    </channel>
+    <channel index="1" type="SWITCH" count="1" physical_index_offset="-1">
+      <paramset id="hmw_switch_ch_master" type="MASTER" address_step="1" address_start="0x06">
+        <parameter id="LOGGING">
+          <logical type="option">
+            <option id="OFF" />
+            <option id="ON" default="true" />
+          </logical>
+          <physical size="0.1" type="integer" interface="eeprom">
+            <address index="+0" />
+          </physical>
+        </parameter>
+      </paramset>
+      <paramset id="hmw_switch_ch_link" type="LINK" count="16" address_start="0x68" address_step="7" peer_param="SENSOR" channel_param="CHANNEL">
+        <parameter id="SENSOR" hidden="true" operations="none">
+          <logical type="address" />
+          <physical type="array">
+            <physical size="4.0" type="integer" interface="eeprom">
+              <address index="+0" />
+            </physical>
+            <physical size="1.0" type="integer" interface="eeprom">
+              <address index="+4" />
+            </physical>
+          </physical>
+        </parameter>
+        <parameter id="CHANNEL" hidden="true" operations="none">
+          <logical type="integer" min="0" max="255" default="255" />
+          <physical size="1.0" type="integer" interface="eeprom">
+            <address index="+5" />
+          </physical>
+        </parameter>
+        <parameter id="SHORT_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" />
+            <option id="TOGGLE" default="true" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6" />
+          </physical>
+        </parameter>
+        <parameter id="LONG_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" />
+            <option id="TOGGLE" default="true" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6.2" />
+          </physical>
+        </parameter>
+        <parameter id="LONGRELEASE_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" default="true" />
+            <option id="TOGGLE" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6.4" />
+          </physical>
+        </parameter>
+        <parameter id="DOUBLE_ACTION_TYPE">
+          <logical type="option">
+            <option id="ON" />
+            <option id="OFF" />
+            <option id="INACTIVE" default="true" />
+            <option id="TOGGLE" />
+          </logical>
+          <physical size="0.2" type="integer" interface="eeprom">
+            <address index="+6.6" />
+          </physical>
+        </parameter>
+      </paramset>
+      <paramset id="hmw_switch_ch_values" type="VALUES">
+        <parameter id="STATE" operations="read,write,event" control="SWITCH.STATE">
+          <logical type="boolean" default="false" />
+          <physical type="integer" interface="command" value_id="LEVEL">
+            <set request="LEVEL_SET" />
+            <get request="LEVEL_GET" response="INFO_LEVEL" />
+            <event frame="INFO_LEVEL" />
+          </physical>
+          <conversion type="boolean_integer" true="200" false="0" threshold="1" />
+        </parameter>
+      </paramset>
+    </channel>
+    <channel index="2" type="KEY" count="1" physical_index_offset="-1">
+      <link_roles>
+        <source name="SWITCH" />
+      </link_roles>
+      <paramset id="hmw_input_ch_master" type="MASTER" address_step="1" address_start="0x07">
+        <parameter id="LONG_PRESS_TIME">
+          <logical type="float" unit="s" default="1.0" max="5.0" min="0.4" />
+          <physical size="1.0" type="integer" interface="eeprom">
+            <address index="+1" />
+          </physical>
+          <conversion type="float_integer_scale" factor="10" />
+          <conversion type="integer_integer_map">
+            <value_map to_device="false" from_device="true" parameter_value="10" device_value="0xff" />
+          </conversion>
+        </parameter>
+      </paramset>
+      <paramset id="hmw_input_ch_link" type="LINK" count="16" address_step="6" address_start="0x08" channel_param="CHANNEL" peer_param="ACTUATOR">
+        <parameter hidden="true" id="CHANNEL" operations="none">
+          <logical type="integer" default="255" max="255" min="0" />
+          <physical size="1.0" type="integer" interface="eeprom">
+            <address index="+0" />
+          </physical>
+        </parameter>
+        <parameter hidden="true" id="ACTUATOR" operations="none">
+          <logical type="address" />
+          <physical type="array">
+            <physical size="4.0" type="integer" interface="eeprom">
+              <address index="+1" />
+            </physical>
+            <physical size="1.0" type="integer" interface="eeprom">
+              <address index="+5" />
+            </physical>
+          </physical>
+        </parameter>
+      </paramset>
+      <paramset id="hmw_input_ch_values" type="VALUES">
+        <parameter id="PRESS_SHORT" operations="event,write" loopback="true" control="BUTTON.SHORT">
+          <logical type="action" />
+          <physical type="integer" interface="command" value_id="COUNTER">
+            <event frame="KEY_EVENT_SHORT" />
+          </physical>
+          <conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER" />
+        </parameter>
+        <parameter id="PRESS_LONG" operations="event,write" loopback="true" control="BUTTON.LONG">
+          <logical type="action" />
+          <physical type="integer" interface="command" value_id="COUNTER">
+            <event frame="KEY_EVENT_LONG" />
+          </physical>
+          <conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER" />
+        </parameter>
+        <parameter id="RELEASE_LONG" operations="event" loopback="true" control="BUTTON.RELEASE">
+          <logical type="action" />
+          <physical type="integer" interface="command" value_id="COUNTER">
+            <event frame="KEY_EVENT_LONGRELEASE" />
+          </physical>
+          <conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER" />
+        </parameter>
+        <parameter id="DOUBLECLICK" operations="event" loopback="true" control="BUTTON.DOUBLE">
+          <logical type="action" />
+          <physical type="integer" interface="command" value_id="COUNTER">
+            <event frame="KEY_EVENT_DOUBLE" />
+          </physical>
+          <conversion type="action_key_counter" counter_size="6" sim_counter="SIM_COUNTER" />
+        </parameter>
+      </paramset>
+    </channel>
+  </channels>
 </device>
diff --git a/io6node.c b/io6node.c
index 0b38b41..cbc4f77 100644
--- a/io6node.c
+++ b/io6node.c
@@ -12,6 +12,19 @@ uint8_t in4state;
 uint8_t in5state;
 uint8_t scount;
 
+uint8_t anain0;
+uint8_t anain1;
+uint8_t anain2;
+uint8_t anain3;
+uint8_t anain4;
+uint8_t anain5;
+uint16_t anatimer0;
+uint16_t anatimer1;
+uint16_t anatimer2;
+uint16_t anatimer3;
+uint16_t anatimer4;
+uint16_t anatimer5;
+
 uint16_t logtime;
 uint8_t logging0;
 uint8_t logging1;
@@ -23,6 +36,8 @@ uint16_t logtimer2;
 uint16_t logtimer3;
 uint8_t scount;
 
+uint16_t adcvalue;
+
 void hbw_read_config(void)
 {
         uint8_t ee;
@@ -33,14 +48,22 @@ void hbw_read_config(void)
         ee =  eeprom_read_byte((const uint8_t *)6);
         logging0 = ee & 0x01;
 
-        ee =  eeprom_read_byte((const uint8_t *)8);
+        ee =  eeprom_read_byte((const uint8_t *)7);
         logging1 = ee & 0x01;
 
-        ee =  eeprom_read_byte((const uint8_t *)10);
+        ee =  eeprom_read_byte((const uint8_t *)8);
         logging2 = ee & 0x01;
 
-        ee =  eeprom_read_byte((const uint8_t *)12);
+        ee =  eeprom_read_byte((const uint8_t *)9);
         logging3 = ee & 0x01;
+
+        ee =  eeprom_read_byte((const uint8_t *)10);
+        anain0 = ee & 0x01;
+        anain1 = ee & 0x02;
+        anain2 = ee & 0x04;
+        anain3 = ee & 0x08;
+        anain4 = ee & 0x10;
+        anain5 = ee & 0x20;
 }
 
 uint8_t hbw_get_channel(uint8_t channel, uint8_t data[])
@@ -74,6 +97,15 @@ uint8_t hbw_get_channel(uint8_t channel, uint8_t data[])
 		return 1;
 	}
 	if (channel == 4) {
+		if (anain0) {
+			ADMUX = (ADMUX & ~(0x1F)) | 0;
+			ADCSRA |= (1<<ADSC);
+			loop_until_bit_is_clear(ADCSRA, ADSC);
+			adcvalue = ADCW;
+			data[0] = adcvalue >> 8;
+			data[1] = adcvalue & 0xFF;
+			return 2;
+		}
 		if (bit_is_clear(PINC, In0))
 			data[0] = 200;
 		else
@@ -81,6 +113,15 @@ uint8_t hbw_get_channel(uint8_t channel, uint8_t data[])
 		return 1;
 	}
 	if (channel == 5) {
+		if (anain1) {
+			ADMUX = (ADMUX & ~(0x1F)) | 1;
+			ADCSRA |= (1<<ADSC);
+			loop_until_bit_is_clear(ADCSRA, ADSC);
+			adcvalue = ADCW;
+			data[0] = adcvalue >> 8;
+			data[1] = adcvalue & 0xFF;
+			return 2;
+		}
 		if (bit_is_clear(PINC, In1))
 			data[0] = 200;
 		else
@@ -88,6 +129,15 @@ uint8_t hbw_get_channel(uint8_t channel, uint8_t data[])
 		return 1;
 	}
 	if (channel == 6) {
+		if (anain2) {
+			ADMUX = (ADMUX & ~(0x1F)) | 2;
+			ADCSRA |= (1<<ADSC);
+			loop_until_bit_is_clear(ADCSRA, ADSC);
+			adcvalue = ADCW;
+			data[0] = adcvalue >> 8;
+			data[1] = adcvalue & 0xFF;
+			return 2;
+		}
 		if (bit_is_clear(PINC, In2))
 			data[0] = 200;
 		else
@@ -95,6 +145,15 @@ uint8_t hbw_get_channel(uint8_t channel, uint8_t data[])
 		return 1;
 	}
 	if (channel == 7) {
+		if (anain3) {
+			ADMUX = (ADMUX & ~(0x1F)) | 3;
+			ADCSRA |= (1<<ADSC);
+			loop_until_bit_is_clear(ADCSRA, ADSC);
+			adcvalue = ADCW;
+			data[0] = adcvalue >> 8;
+			data[1] = adcvalue & 0xFF;
+			return 2;
+		}
 		if (bit_is_clear(PINC, In3))
 			data[0] = 200;
 		else
@@ -102,6 +161,15 @@ uint8_t hbw_get_channel(uint8_t channel, uint8_t data[])
 		return 1;
 	}
 	if (channel == 8) {
+		if (anain4) {
+			ADMUX = (ADMUX & ~(0x1F)) | 4;
+			ADCSRA |= (1<<ADSC);
+			loop_until_bit_is_clear(ADCSRA, ADSC);
+			adcvalue = ADCW;
+			data[0] = adcvalue >> 8;
+			data[1] = adcvalue & 0xFF;
+			return 2;
+		}
 		if (bit_is_clear(PINC, In4))
 			data[0] = 200;
 		else
@@ -109,6 +177,15 @@ uint8_t hbw_get_channel(uint8_t channel, uint8_t data[])
 		return 1;
 	}
 	if (channel == 9) {
+		if (anain5) {
+			ADMUX = (ADMUX & ~(0x1F)) | 5;
+			ADCSRA |= (1<<ADSC);
+			loop_until_bit_is_clear(ADCSRA, ADSC);
+			adcvalue = ADCW;
+			data[0] = adcvalue >> 8;
+			data[1] = adcvalue & 0xFF;
+			return 2;
+		}
 		if (bit_is_clear(PINC, In5))
 			data[0] = 200;
 		else
@@ -157,13 +234,13 @@ void hbw_receive_key(uint32_t saddress, uint8_t schannel, uint8_t channel, uint8
                 return;
 
         for (i=0; i < 16; i++) {
-                if ((eeprom_read_byte((const uint8_t *)(i*7)+0x10) == ((uint8_t*)&saddress)[0]) &&
-                    (eeprom_read_byte((const uint8_t *)(i*7)+0x11) == ((uint8_t*)&saddress)[1]) &&
-                    (eeprom_read_byte((const uint8_t *)(i*7)+0x12) == ((uint8_t*)&saddress)[2]) &&
-                    (eeprom_read_byte((const uint8_t *)(i*7)+0x13) == ((uint8_t*)&saddress)[3]) &&
-                    (eeprom_read_byte((const uint8_t *)(i*7)+0x14) == schannel) &&
-                    (eeprom_read_byte((const uint8_t *)(i*7)+0x15) == channel)) {
-                        type = eeprom_read_byte((const uint8_t *)(i*7)+0x16);
+                if ((eeprom_read_byte((const uint8_t *)(i*7)+0x38) == ((uint8_t*)&saddress)[0]) &&
+                    (eeprom_read_byte((const uint8_t *)(i*7)+0x39) == ((uint8_t*)&saddress)[1]) &&
+                    (eeprom_read_byte((const uint8_t *)(i*7)+0x3a) == ((uint8_t*)&saddress)[2]) &&
+                    (eeprom_read_byte((const uint8_t *)(i*7)+0x3b) == ((uint8_t*)&saddress)[3]) &&
+                    (eeprom_read_byte((const uint8_t *)(i*7)+0x3c) == schannel) &&
+                    (eeprom_read_byte((const uint8_t *)(i*7)+0x3d) == channel)) {
+                        type = eeprom_read_byte((const uint8_t *)(i*7)+0x3e);
                         switch (countflag & 3) {
                                 case 1:
                                         type = (type >> 6) & 0x3;
@@ -231,7 +308,7 @@ void hbw_receive_key(uint32_t saddress, uint8_t schannel, uint8_t channel, uint8
 
 int main(void)
 {
-	uint8_t state;
+	uint8_t state[2];
 
 	DDRB |= (1<<RedLED);
 	DDRB |= (1<<GreenLED);
@@ -259,128 +336,230 @@ int main(void)
 	PORTC |= (1<<In4);
 	PORTC |= (1<<In5);
 
+	ADMUX  = (0<<REFS1) | (1<<REFS0);
+	ADCSRA = (1<<ADPS2) | (1<<ADPS1);
+	ADCSRA |= (1<<ADEN);
+	ADCSRA |= (1<<ADSC);
+	loop_until_bit_is_clear(ADCSRA, ADSC);
+	adcvalue = ADCW;
+
 	hbw_init();
 
 	while(1) {
 		hbw_loop();
 
-		if (bit_is_clear(PINC, In0) && (!in0state)) {
-			state = 200;
-			
-			if (hbw_send_channel(4, 1, &state))
-				in0state = ~0;
-		}
+		if (anain0) {
+			if (!anatimer0 || (hbw_timer - anatimer0 < 100)) {
+				ADMUX = (ADMUX & ~(0x1F)) | 0;
+				ADCSRA |= (1<<ADSC);
+				loop_until_bit_is_clear(ADCSRA, ADSC);
+				adcvalue = ADCW;
+				state[0] = adcvalue >> 8;
+				state[1] = adcvalue& 0xFF;
+
+				if (hbw_send_channel(4, 2, state)) {
+					anatimer0 = hbw_timer + logtime;
+					if (!anatimer0) anatimer0 = 1;
+				}
+			}
+		} else {
+			if (bit_is_clear(PINC, In0) && (!in0state)) {
+				state[0] = 200;
 
-		if (bit_is_set(PINC, In0) && in0state) {
-			state = 0;
+				if (hbw_send_channel(4, 1, state))
+					in0state = ~0;
+			}
 
-			if (hbw_send_channel(4, 1, &state))
-				in0state = 0;
-		}
+			if (bit_is_set(PINC, In0) && in0state) {
+				state[0] = 0;
 
-		if (bit_is_clear(PINC, In1) && (!in1state)) {
-			state = 200;
-			
-			if (hbw_send_channel(5, 1, &state))
-				in1state = ~0;
+				if (hbw_send_channel(4, 1, state))
+					in0state = 0;
+			}
 		}
+		if (anain1) {
+			if (!anatimer1 || (hbw_timer - anatimer1 < 100)) {
+				ADMUX = (ADMUX & ~(0x1F)) | 1;
+				ADCSRA |= (1<<ADSC);
+				loop_until_bit_is_clear(ADCSRA, ADSC);
+				adcvalue = ADCW;
+				state[0] = adcvalue >> 8;
+				state[1] = adcvalue& 0xFF;
+
+				if (hbw_send_channel(5, 2, state)) {
+					anatimer1 = hbw_timer + logtime;
+					if (!anatimer1) anatimer1 = 1;
+				}
+			}
+		} else {
+			if (bit_is_clear(PINC, In1) && (!in1state)) {
+				state[0] = 200;
 
-		if (bit_is_set(PINC, In1) && in1state) {
-			state = 0;
+				if (hbw_send_channel(5, 1, state))
+					in1state = ~0;
+			}
 
-			if (hbw_send_channel(5, 1, &state))
-				in1state = 0;
-		}
+			if (bit_is_set(PINC, In1) && in1state) {
+				state[0] = 0;
 
-		if (bit_is_clear(PINC, In2) && (!in2state)) {
-			state = 200;
-			
-			if (hbw_send_channel(6, 1, &state))
-				in2state = ~0;
+				if (hbw_send_channel(5, 1, state))
+					in1state = 0;
+			}
 		}
 
-		if (bit_is_set(PINC, In2) && in2state) {
-			state = 0;
+		if (anain2) {
+			if (!anatimer2 || (hbw_timer - anatimer2 < 100)) {
+				ADMUX = (ADMUX & ~(0x1F)) | 2;
+				ADCSRA |= (1<<ADSC);
+				loop_until_bit_is_clear(ADCSRA, ADSC);
+				adcvalue = ADCW;
+				state[0] = adcvalue >> 8;
+				state[1] = adcvalue& 0xFF;
+
+				if (hbw_send_channel(6, 2, state)) {
+					anatimer2 = hbw_timer + logtime;
+					if (!anatimer2) anatimer2 = 1;
+				}
+			}
+		} else {
+			if (bit_is_clear(PINC, In2) && (!in2state)) {
+				state[0] = 200;
 
-			if (hbw_send_channel(6, 1, &state))
-				in2state = 0;
-		}
+				if (hbw_send_channel(6, 1, state))
+					in2state = ~0;
+			}
+
+			if (bit_is_set(PINC, In2) && in2state) {
+				state[0] = 0;
 
-		if (bit_is_clear(PINC, In3) && (!in3state)) {
-			state = 200;
-			
-			if (hbw_send_channel(7, 1, &state))
-				in3state = ~0;
+				if (hbw_send_channel(6, 1, state))
+					in2state = 0;
+			}
 		}
 
-		if (bit_is_set(PINC, In3) && in3state) {
-			state = 0;
+		if (anain3) {
+			if (!anatimer3 || (hbw_timer - anatimer3 < 100)) {
+				ADMUX = (ADMUX & ~(0x1F)) | 3;
+				ADCSRA |= (1<<ADSC);
+				loop_until_bit_is_clear(ADCSRA, ADSC);
+				adcvalue = ADCW;
+				state[0] = adcvalue >> 8;
+				state[1] = adcvalue& 0xFF;
+
+				if (hbw_send_channel(7, 2, state)) {
+					anatimer3 = hbw_timer + logtime;
+					if (!anatimer3) anatimer3 = 1;
+				}
+			}
+		} else {
+			if (bit_is_clear(PINC, In3) && (!in3state)) {
+				state[0] = 200;
 
-			if (hbw_send_channel(7, 1, &state))
-				in3state = 0;
-		}
+				if (hbw_send_channel(7, 1, state))
+					in3state = ~0;
+			}
 
-		if (bit_is_clear(PINC, In4) && (!in4state)) {
-			state = 200;
-			
-			if (hbw_send_channel(8, 1, &state))
-				in4state = ~0;
+			if (bit_is_set(PINC, In3) && in3state) {
+				state[0] = 0;
+
+				if (hbw_send_channel(7, 1, state))
+					in3state = 0;
+			}
 		}
 
-		if (bit_is_set(PINC, In4) && in4state) {
-			state = 0;
+		if (anain4) {
+			if (!anatimer4 || (hbw_timer - anatimer4 < 100)) {
+				ADMUX = (ADMUX & ~(0x1F)) | 4;
+				ADCSRA |= (1<<ADSC);
+				loop_until_bit_is_clear(ADCSRA, ADSC);
+				adcvalue = ADCW;
+				state[0] = adcvalue >> 8;
+				state[1] = adcvalue& 0xFF;
+
+				if (hbw_send_channel(8, 2, state)) {
+					anatimer4 = hbw_timer + logtime;
+					if (!anatimer4) anatimer4 = 1;
+				}
+			}
+		} else {
+			if (bit_is_clear(PINC, In4) && (!in4state)) {
+				state[0] = 200;
 
-			if (hbw_send_channel(8, 1, &state))
-				in4state = 0;
-		}
+				if (hbw_send_channel(8, 1, state))
+					in4state = ~0;
+			}
 
-		if (bit_is_clear(PINC, In5) && (!in5state)) {
-			state = 200;
-			
-			if (hbw_send_channel(9, 1, &state))
-				in5state = ~0;
+			if (bit_is_set(PINC, In4) && in4state) {
+				state[0] = 0;
+
+				if (hbw_send_channel(8, 1, state))
+					in4state = 0;
+			}
 		}
 
-		if (bit_is_set(PINC, In5) && in5state) {
-			state = 0;
+		if (anain5) {
+			if (!anatimer5 || (hbw_timer - anatimer5 < 100)) {
+				ADMUX = (ADMUX & ~(0x1F)) | 5;
+				ADCSRA |= (1<<ADSC);
+				loop_until_bit_is_clear(ADCSRA, ADSC);
+				adcvalue = ADCW;
+				state[0] = adcvalue >> 8;
+				state[1] = adcvalue& 0xFF;
+
+				if (hbw_send_channel(9, 2, state)) {
+					anatimer5 = hbw_timer + logtime;
+					if (!anatimer5) anatimer5 = 1;
+				}
+			}
+		} else {
+			if (bit_is_clear(PINC, In5) && (!in5state)) {
+				state[0] = 200;
+
+				if (hbw_send_channel(9, 1, state))
+					in5state = ~0;
+			}
 
-			if (hbw_send_channel(9, 1, &state))
-				in5state = 0;
+			if (bit_is_set(PINC, In5) && in5state) {
+				state[0] = 0;
+
+				if (hbw_send_channel(9, 1, state))
+					in5state = 0;
+			}
 		}
 
 		if (logtimer0 && (hbw_timer - logtimer0 < 100)) {
-			state = 0;
+			state[0] = 0;
 			if (bit_is_set(PINB, RedLED))
-				state = 200;
-			if (!hbw_send_channel(0, 1, &state))
+				state[0] = 200;
+			if (!hbw_send_channel(0, 1, state))
 				logtimer0 += 300;
 			else
 				logtimer0 = 0;
 		}
 
 		if (logtimer1 && (hbw_timer - logtimer1 < 100)) {
-			state = 0;
+			state[0] = 0;
 			if (bit_is_set(PINB, GreenLED))
-				state = 200;
-			if (!hbw_send_channel(1, 1, &state))
+				state[0] = 200;
+			if (!hbw_send_channel(1, 1, state))
 				logtimer1 += 300;
 			else
 				logtimer1 = 0;
 		}
 		if (logtimer2 && (hbw_timer - logtimer2 < 100)) {
-			state = 0;
+			state[0] = 0;
 			if (bit_is_set(PIND, Out0))
-				state = 200;
-			if (!hbw_send_channel(2, 1, &state))
+				state[0] = 200;
+			if (!hbw_send_channel(2, 1, state))
 				logtimer2 += 300;
 			else
 				logtimer2 = 0;
 		}
 		if (logtimer3 && (hbw_timer - logtimer3 < 100)) {
-			state = 0;
+			state[0] = 0;
 			if (bit_is_set(PIND, Out1))
-				state = 200;
-			if (!hbw_send_channel(3, 1, &state))
+				state[0] = 200;
+			if (!hbw_send_channel(3, 1, state))
 				logtimer3 += 300;
 			else
 				logtimer3 = 0;
diff --git a/relaisnode.c b/relaisnode.c
index 20a8c0f..103a64e 100644
--- a/relaisnode.c
+++ b/relaisnode.c
@@ -27,7 +27,7 @@ void hbw_read_config(void)
         ee =  eeprom_read_byte((const uint8_t *)6);
         logging0 = ee & 0x01;
 
-        ee =  eeprom_read_byte((const uint8_t *)8);
+        ee =  eeprom_read_byte((const uint8_t *)7);
         logging1 = ee & 0x01;
 }
 
@@ -105,13 +105,13 @@ void hbw_receive_key(uint32_t saddress, uint8_t schannel, uint8_t channel, uint8
                 return;
 
         for (i=0; i < 16; i++) {
-                if ((eeprom_read_byte((const uint8_t *)(i*7)+0x10) == ((uint8_t*)&saddress)[0]) &&
-                    (eeprom_read_byte((const uint8_t *)(i*7)+0x11) == ((uint8_t*)&saddress)[1]) &&
-                    (eeprom_read_byte((const uint8_t *)(i*7)+0x12) == ((uint8_t*)&saddress)[2]) &&
-                    (eeprom_read_byte((const uint8_t *)(i*7)+0x13) == ((uint8_t*)&saddress)[3]) &&
-                    (eeprom_read_byte((const uint8_t *)(i*7)+0x14) == schannel) &&
-                    (eeprom_read_byte((const uint8_t *)(i*7)+0x15) == channel)) {
-                        type = eeprom_read_byte((const uint8_t *)(i*7)+0x16);
+                if ((eeprom_read_byte((const uint8_t *)(i*7)+0x0C) == ((uint8_t*)&saddress)[0]) &&
+                    (eeprom_read_byte((const uint8_t *)(i*7)+0x0D) == ((uint8_t*)&saddress)[1]) &&
+                    (eeprom_read_byte((const uint8_t *)(i*7)+0x0E) == ((uint8_t*)&saddress)[2]) &&
+                    (eeprom_read_byte((const uint8_t *)(i*7)+0x0F) == ((uint8_t*)&saddress)[3]) &&
+                    (eeprom_read_byte((const uint8_t *)(i*7)+0x10) == schannel) &&
+                    (eeprom_read_byte((const uint8_t *)(i*7)+0x11) == channel)) {
+                        type = eeprom_read_byte((const uint8_t *)(i*7)+0x12);
                         switch (countflag & 3) {
                                 case 1:
                                         type = (type >> 6) & 0x3;
diff --git a/testnode.c b/testnode.c
index ce80a0a..9c6ef17 100644
--- a/testnode.c
+++ b/testnode.c
@@ -25,7 +25,7 @@ void hbw_read_config(void)
 	ee =  eeprom_read_byte((const uint8_t *)6);
 	logging = ee & 0x01;
 
-	ee =  eeprom_read_byte((const uint8_t *)8);
+	ee =  eeprom_read_byte((const uint8_t *)7);
 
 	if (ee == 0xFF)
 		longtime = 1000;