diff --git a/buildroot-external/board/rpi0/uboot.config b/buildroot-external/board/rpi0/uboot.config
index fde8a4c197..5a4eb7f699 100644
--- a/buildroot-external/board/rpi0/uboot.config
+++ b/buildroot-external/board/rpi0/uboot.config
@@ -1,3 +1,7 @@
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="RaspberryPi"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0a5c
diff --git a/buildroot-external/board/rpi2/uboot.config b/buildroot-external/board/rpi2/uboot.config
index fde8a4c197..5a4eb7f699 100644
--- a/buildroot-external/board/rpi2/uboot.config
+++ b/buildroot-external/board/rpi2/uboot.config
@@ -1,3 +1,7 @@
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="RaspberryPi"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0a5c
diff --git a/buildroot-external/board/rpi3/uboot.config b/buildroot-external/board/rpi3/uboot.config
index b295da2cdb..acdb8d9f3d 100644
--- a/buildroot-external/board/rpi3/uboot.config
+++ b/buildroot-external/board/rpi3/uboot.config
@@ -1,5 +1,9 @@
 CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
 
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="RaspberryPi"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0a5c
diff --git a/buildroot-external/board/rpi4/uboot.config b/buildroot-external/board/rpi4/uboot.config
index df5128010b..9c8eeb2760 100644
--- a/buildroot-external/board/rpi4/uboot.config
+++ b/buildroot-external/board/rpi4/uboot.config
@@ -1,3 +1,7 @@
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_CMD_NVME=y
 
 CONFIG_USB_STORAGE=y
diff --git a/buildroot-external/bootloader/uboot.config b/buildroot-external/bootloader/uboot.config
index 9ac99bf8d0..cb3ea558ae 100644
--- a/buildroot-external/bootloader/uboot.config
+++ b/buildroot-external/bootloader/uboot.config
@@ -27,8 +27,8 @@ CONFIG_SPL_SILENT_CONSOLE=y
 CONFIG_TPL_SILENT_CONSOLE=y
 CONFIG_SILENT_U_BOOT_ONLY=y
 CONFIG_DISPLAY_BOARDINFO=y
-CONFIG_NULLDEV_SERIAL=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
+# CONFIG_SERIAL_PRESENT is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
diff --git a/buildroot-external/package/occu/occu.hash b/buildroot-external/package/occu/occu.hash
index 0191ec3ff9..da071d6a18 100644
--- a/buildroot-external/package/occu/occu.hash
+++ b/buildroot-external/package/occu/occu.hash
@@ -1,3 +1,3 @@
 # Locally computed
 sha256  e600b8a501a17600d01bd7a4646508f94f3cd3b9df03661babd9f1801e579b36  LicenseDE.txt
-sha256  d81c82bfc5af699fed48f8f4fd8d29071aca4855c73ecad37a1b7b1b049eea0a  occu-3.73.6-2.tar.gz
+sha256  d2498d5e9f9527de029f62737b14bf35f75a02345b45909db55248dd7250afef  occu-3.73.9-1.tar.gz
diff --git a/buildroot-external/package/occu/occu.mk b/buildroot-external/package/occu/occu.mk
index 670526dfc1..c58860fd18 100644
--- a/buildroot-external/package/occu/occu.mk
+++ b/buildroot-external/package/occu/occu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OCCU_VERSION = 3.73.6-2
+OCCU_VERSION = 3.73.9-1
 OCCU_SITE = $(call github,jens-maus,occu,$(OCCU_VERSION))
 OCCU_LICENSE = HMSL
 OCCU_LICENSE_FILES = LicenseDE.txt
diff --git a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-rpi1.dts b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-rpi1.dts
index f8183bd03e..8d43d391cd 100644
--- a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-rpi1.dts
+++ b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-rpi1.dts
@@ -65,14 +65,4 @@
             pivccu,rtc = <&rpi_rf_mod_rtc>;  // RPI-RF-MOD
         };
     };
-
-    // fragement to make sure that stdout-path under chosen
-    // is empty so that the above uart0 fragement does not
-    // interfere with u-boot.
-    fragment@4 {
-        target = <&chosen>;
-        __overlay__ {
-            stdout-path = "";
-        };
-    };
 };
diff --git a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-yellow.dts b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-yellow.dts
index 7c6f4e04bc..da800b50b4 100644
--- a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-yellow.dts
+++ b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-yellow.dts
@@ -46,14 +46,4 @@
             pivccu,reset-gpios = <&gpio 18 0>; // HM-MOD-RPI-PCB
         };
     };
-
-    // fragement to make sure that stdout-path under chosen
-    // is empty so that the above uart0 fragement does not
-    // interfere with u-boot.
-    fragment@3 {
-        target = <&chosen>;
-        __overlay__ {
-            stdout-path = "";
-        };
-    };
 };
diff --git a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dts b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dts
index 1adfb72193..722a3feb35 100644
--- a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dts
+++ b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dts
@@ -84,14 +84,4 @@
             pivccu,rtc = <&rpi_rf_mod_rtc>;       // RPI-RF-MOD
         };
     };
-
-    // fragement to make sure that stdout-path under chosen
-    // is empty so that the above uart0 fragement does not
-    // interfere with u-boot.
-    fragment@4 {
-        target = <&chosen>;
-        __overlay__ {
-            stdout-path = "";
-        };
-    };
 };
diff --git a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk
index 01f7b4a213..bdc48eae54 100644
--- a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk
+++ b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk
@@ -11,7 +11,7 @@
 #
 ################################################################################
 
-RPI_RF_MOD_VERSION = 1.13.1
+RPI_RF_MOD_VERSION = 1.13.2
 RPI_RF_MOD_SITE = $(BR2_EXTERNAL_EQ3_PATH)/package/rpi-rf-mod
 RPI_RF_MOD_SITE_METHOD = local
 RPI_RF_MOD_LICENSE = Apache-2.0
diff --git a/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches.patch b/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches.patch
index 6a2d797142..66b17457e9 100644
--- a/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches.patch
+++ b/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches.patch
@@ -1191,119 +1191,119 @@
 +++ occu/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm
 @@ -63,43 +63,43 @@
  <div class="CLASS04301">
- <div id="noNewDevs" class="CLASS04302" style="display:none;">${noDeviceInPostBox}</div>
- <table id="newDevTbl" class="tblList CLASS04303" cellpadding="0" cellspacing="0"
--       style="display:none; width:97%; margin:1%;">
-+       style="display:none;">
- <colgroup>
--  <col style="width:2%;"  width="2%"/>
-+  <col style="width:25px;" />
-   <!-- Plus/Minus Device-->
--  <col style="width:2%;"/>
-+  <col style="width:25px;" />
-   <!-- Plus/Minus Group -->
--  <col style="width:2%;"/>
-+  <col />
-   <!-- Leere Zelle vor GroupMember -->
--  <col style="width:1%;"/>
--  <col style="width:3%;"/>
--  <col style="width:7%;"/>
--  <col style="width:7%;"/>
--  <col style="width:9%;"/>
--  <col style="width:7%;"/>
--  <col style="width:7%;"/>
--  <col style="width:7%;"/>
--  <col style="width:7%;"/>
--  <col style="width:7%;"/>
--  <col style="width:15%;"/>
--  <col style="width:7%;"/>
-+  <col />
-+  <col style="width:50px;" />
-+  <col />
-+  <col />
-+  <col />
-+  <col />
-+  <col />
-+  <col />
-+  <col />
-+  <col />
-+  <col style="width:100px;"/>
-+  <col style="width:100px;"/>
- </colgroup>
- <tbody id="tblNewDevices">
- <tr id="tblNewDevicesHeader">
-   <th id="tblListFold"></th>
- 
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('type')" colspan='3'><b>${thTypeDescriptor}</b></th>
--  <th class="Sort CLASS04304 border1px"><b>${thPicture}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('desc')"><b>${thDescriptor}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('sn')"><b>${thSerialNumber}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('iface')"><b>${thInterfaceCategory}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('trans')"><b>${thTransmitMode}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('name')"><b>${thName}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('func')"><b>${thFunc}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('room')"><b>${thRoom}</b></th>
--  <th class="Sort CLASS04304 border1px"><b>${thFunctionTest}</b></th>
--  <th class="Sort CLASS04304 border1px"><b>${thAction}</b></th>
--  <th class="Sort CLASS04304 border1px"><b>${thReady}</b></th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('type')" colspan='3'>${thTypeDescriptor}</th>
-+  <th class="DeviceListHead">${thPicture}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('desc')">${thDescriptor}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('sn')">${thSerialNumber}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('iface')">${thInterfaceCategory}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('trans')">${thTransmitMode}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('name')">${thName}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('func')">${thFunc}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('room')">${thRoom}</th>
-+  <th class="DeviceListHead">${thFunctionTest}</th>
-+  <th class="DeviceListHead">${thAction}</th>
-+  <th class="DeviceListHead">${thReady}</th>
- </tr>
- 
- <script type="text/javascript">
+   <div id="noNewDevs" class="CLASS04302" style="display:none;">${noDeviceInPostBox}</div>
+   <table id="newDevTbl" class="tblList CLASS04303" cellpadding="0" cellspacing="0"
+-         style="display:none; width:97%; margin:1%;">
++         style="display:none;">
+     <colgroup>
+-      <col style="width:2%;"  width="2%"/>
++      <col style="width:25px;"/>
+       <!-- Plus/Minus Device-->
+-      <col style="width:2%;"/>
++      <col style="width:25px;"/>
+       <!-- Plus/Minus Group -->
+-      <col style="width:2%;"/>
++      <col />
+       <!-- Leere Zelle vor GroupMember -->
+-      <col style="width:1%;"/>
+-      <col style="width:3%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:9%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:15%;"/>
+-      <col style="width:7%;"/>
++      <col />
++      <col style="width:50px;"/>
++      <col />
++      <col />
++      <col />
++      <col />
++      <col />
++      <col />
++      <col />
++      <col />
++      <col style="width:100px;"/>
++      <col style="width:100px;"/>
+     </colgroup>
+     <tbody id="tblNewDevices">
+     <tr id="tblNewDevicesHeader">
+       <th id="tblListFold"></th>
+ 
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('type')" colspan='3'><b>${thTypeDescriptor}</b></th>
+-      <th class="Sort CLASS04304 border1px"><b>${thPicture}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('desc')"><b>${thDescriptor}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('sn')"><b>${thSerialNumber}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('iface')"><b>${thInterfaceCategory}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('trans')"><b>${thTransmitMode}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('name')"><b>${thName}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('func')"><b>${thFunc}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('room')"><b>${thRoom}</b></th>
+-      <th class="Sort CLASS04304 border1px"><b>${thFunctionTest}</b></th>
+-      <th class="Sort CLASS04304 border1px"><b>${thAction}</b></th>
+-      <th class="Sort CLASS04304 border1px"><b>${thReady}</b></th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('type')" colspan='3'>${thTypeDescriptor}</th>
++      <th class="DeviceListHead">${thPicture}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('desc')">${thDescriptor}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('sn')">${thSerialNumber}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('iface')">${thInterfaceCategory}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('trans')">${thTransmitMode}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('name')">${thName}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('func')">${thFunc}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('room')">${thRoom}</th>
++      <th class="DeviceListHead">${thFunctionTest}</th>
++      <th class="DeviceListHead">${thAction}</th>
++      <th class="DeviceListHead">${thReady}</th>
+     </tr>
+ 
+     <script type="text/javascript">
 @@ -381,7 +381,7 @@
-   var img = Builder.node('img', {src: "/ise/img/plus.png", id: "img" + arDevices[i]['id'], alt: "plus", onclick: "expandDevice(" + arDevices[i]['id'] + "," + i + ")"});
-   td.appendChild(img);
-   tr.appendChild(td);
--  td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, strCut(arDevices[i]['type'], true));
-+  td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, arDevices[i]['type']);
-   tr.appendChild(td);
-   td = Builder.node('td', {className: 'WhiteBkgPic CLASS04314 border1px'}, [
-     Builder.node('div', {id: 'picDiv' + arDevices[i]['id'], className: "CLASS04305",
+         var img = Builder.node('img', {src: "/ise/img/plus.png", id: "img" + arDevices[i]['id'], alt: "plus", onclick: "expandDevice(" + arDevices[i]['id'] + "," + i + ")"});
+         td.appendChild(img);
+         tr.appendChild(td);
+-        td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, strCut(arDevices[i]['type'], true));
++        td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, arDevices[i]['type']);
+         tr.appendChild(td);
+         td = Builder.node('td', {className: 'WhiteBkgPic CLASS04314 border1px'}, [
+           Builder.node('div', {id: 'picDiv' + arDevices[i]['id'], className: "CLASS04305",
 @@ -391,7 +391,7 @@
-   td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['desc'] );
-   td.innerHTML = translateKey(arDevices[i]['desc']);
-   tr.appendChild(td);
--  td = Builder.node('td', {className: 'GrayBkg border1px'}, strCut(arDevices[i]['sn']));
-+  td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['sn']);
-   tr.appendChild(td);
-   td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['iface']);
-   tr.appendChild(td);
+         td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['desc'] );
+         td.innerHTML = translateKey(arDevices[i]['desc']);
+         tr.appendChild(td);
+-        td = Builder.node('td', {className: 'GrayBkg border1px'}, strCut(arDevices[i]['sn']));
++        td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['sn']);
+         tr.appendChild(td);
+         td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['iface']);
+         tr.appendChild(td);
 @@ -401,13 +401,13 @@
  
-   if (NAV_IE) {
-     td = Builder.node('td', {className: 'WhiteBkg border1px'},
--      [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true)) ]);
-+      [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']) ]);
-     tr.appendChild(td);
-   }
-   else {
-     if (isDevTypeHmIPW(arDevices[i]['type'])) {
-       td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px'});
--      divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, strCut(arDevices[i]['name'].replace(/:/g, ":<br/>"), false));
-+      divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, arDevices[i]['name'].replace(/:/g, ":<br/>"));
-       divB = Builder.node('div', {
-         id: 'btnRename_' + arDevices[i]["id"],
-         className: 'TestButton colorGradient borderRadius2px hidden',
+         if (NAV_IE) {
+           td = Builder.node('td', {className: 'WhiteBkg border1px'},
+-            [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true)) ]);
++          [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']) ]);
+           tr.appendChild(td);
+         }
+         else {
+           if (isDevTypeHmIPW(arDevices[i]['type'])) {
+             td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px'});
+-            divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, strCut(arDevices[i]['name'].replace(/:/g, ":<br/>"), false));
++            divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, arDevices[i]['name'].replace(/:/g, ":<br/>"));
+             divB = Builder.node('div', {
+               id: 'btnRename_' + arDevices[i]["id"],
+               className: 'TestButton colorGradient borderRadius2px hidden',
 @@ -417,7 +417,7 @@
-       td.appendChild(divA);
-       td.appendChild(divB);
-     } else {
--      td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true));
-+      td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']);
-     }
- 
-     tr.appendChild(td);
+             td.appendChild(divA);
+             td.appendChild(divB);
+           } else {
+-            td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true));
++            td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']);
+           }
+ 
+           tr.appendChild(td);
 --- occu/WebUI/www/rega/pages/tabs/admin/views/programlist.htm.orig
 +++ occu/WebUI/www/rega/pages/tabs/admin/views/programlist.htm
 @@ -57,9 +57,16 @@
diff --git a/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches/occu/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm b/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches/occu/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm
index 293ca12567..85156cc52a 100755
--- a/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches/occu/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm
+++ b/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches/occu/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm
@@ -61,1710 +61,2160 @@
 
 <div id="dummy" class="CLASS04300"></div>
 <div class="CLASS04301">
-<div id="noNewDevs" class="CLASS04302" style="display:none;">${noDeviceInPostBox}</div>
-<table id="newDevTbl" class="tblList CLASS04303" cellpadding="0" cellspacing="0"
-       style="display:none;">
-<colgroup>
-  <col style="width:25px;" />
-  <!-- Plus/Minus Device-->
-  <col style="width:25px;" />
-  <!-- Plus/Minus Group -->
-  <col />
-  <!-- Leere Zelle vor GroupMember -->
-  <col />
-  <col style="width:50px;" />
-  <col />
-  <col />
-  <col />
-  <col />
-  <col />
-  <col />
-  <col />
-  <col />
-  <col style="width:100px;"/>
-  <col style="width:100px;"/>
-</colgroup>
-<tbody id="tblNewDevices">
-<tr id="tblNewDevicesHeader">
-  <th id="tblListFold"></th>
-
-  <th class="DeviceListHead clickable" onclick="NewDevSort('type')" colspan='3'>${thTypeDescriptor}</th>
-  <th class="DeviceListHead">${thPicture}</th>
-  <th class="DeviceListHead clickable" onclick="NewDevSort('desc')">${thDescriptor}</th>
-  <th class="DeviceListHead clickable" onclick="NewDevSort('sn')">${thSerialNumber}</th>
-  <th class="DeviceListHead clickable" onclick="NewDevSort('iface')">${thInterfaceCategory}</th>
-  <th class="DeviceListHead clickable" onclick="NewDevSort('trans')">${thTransmitMode}</th>
-  <th class="DeviceListHead clickable" onclick="NewDevSort('name')">${thName}</th>
-  <th class="DeviceListHead clickable" onclick="NewDevSort('func')">${thFunc}</th>
-  <th class="DeviceListHead clickable" onclick="NewDevSort('room')">${thRoom}</th>
-  <th class="DeviceListHead">${thFunctionTest}</th>
-  <th class="DeviceListHead">${thAction}</th>
-  <th class="DeviceListHead">${thReady}</th>
-</tr>
+  <div id="noNewDevs" class="CLASS04302" style="display:none;">${noDeviceInPostBox}</div>
+  <table id="newDevTbl" class="tblList CLASS04303" cellpadding="0" cellspacing="0"
+         style="display:none;">
+    <colgroup>
+      <col style="width:25px;"/>
+      <!-- Plus/Minus Device-->
+      <col style="width:25px;"/>
+      <!-- Plus/Minus Group -->
+      <col />
+      <!-- Leere Zelle vor GroupMember -->
+      <col />
+      <col style="width:50px;"/>
+      <col />
+      <col />
+      <col />
+      <col />
+      <col />
+      <col />
+      <col />
+      <col />
+      <col style="width:100px;"/>
+      <col style="width:100px;"/>
+    </colgroup>
+    <tbody id="tblNewDevices">
+    <tr id="tblNewDevicesHeader">
+      <th id="tblListFold"></th>
+
+      <th class="DeviceListHead clickable" onclick="NewDevSort('type')" colspan='3'>${thTypeDescriptor}</th>
+      <th class="DeviceListHead">${thPicture}</th>
+      <th class="DeviceListHead clickable" onclick="NewDevSort('desc')">${thDescriptor}</th>
+      <th class="DeviceListHead clickable" onclick="NewDevSort('sn')">${thSerialNumber}</th>
+      <th class="DeviceListHead clickable" onclick="NewDevSort('iface')">${thInterfaceCategory}</th>
+      <th class="DeviceListHead clickable" onclick="NewDevSort('trans')">${thTransmitMode}</th>
+      <th class="DeviceListHead clickable" onclick="NewDevSort('name')">${thName}</th>
+      <th class="DeviceListHead clickable" onclick="NewDevSort('func')">${thFunc}</th>
+      <th class="DeviceListHead clickable" onclick="NewDevSort('room')">${thRoom}</th>
+      <th class="DeviceListHead">${thFunctionTest}</th>
+      <th class="DeviceListHead">${thAction}</th>
+      <th class="DeviceListHead">${thReady}</th>
+    </tr>
+
+    <script type="text/javascript">
+      translatePage("tblNewDevicesHeader");
+      iNewDevCount =
+      <%
+      Write(iNewCount);
+      %>
+      ;
+      if (iNewDevCount == 0) {
+        $("noNewDevs").show();
+      }
+      else {
+        $("newDevTbl").show();
+      }
 
-<script type="text/javascript">
-translatePage("tblNewDevicesHeader");
-iNewDevCount =
-<%
-Write(iNewCount);
-%>
-;
-if (iNewDevCount == 0) {
-  $("noNewDevs").show();
-}
-else {
-  $("newDevTbl").show();
-}
-
-<%
-string devId = "";
-foreach(devId, oUser.UserTempViewIDs().EnumEnabledIDs())
-{
-  object dev = dom.GetObject(devId);
-  if (dev && (dev.ReadyConfig() == false) && (dev.Name() != 'Gateway') && (dev.Interface() != ID_ERROR)) {
-    Write("deviceData = new Object();");
-    Write("deviceData['id'] = "#dev.ID()#";");
-    Write("deviceData['name'] = '"#dev.Name()#"';");
-    Write("deviceData['type'] = '"#dev.Label()#"';");
-    Write("deviceData['pic'] = '';");
-    Write("deviceData['desc'] = DEV_getDescription('"#dev.Label()#"');");
-    Write("deviceData['sn'] = '"#dev.Address()#"';");
-    Write("var chnTypes = new Array();");
-
-    Write("setNewDevicePos2SystemPos(deviceData);");
+      <%
+      string devId = "";
+      foreach(devId, oUser.UserTempViewIDs().EnumEnabledIDs())
+      {
+        object dev = dom.GetObject(devId);
+        if (dev && (dev.ReadyConfig() == false) && (dev.Name() != 'Gateway') && (dev.Interface() != ID_ERROR)) {
+          Write("deviceData = new Object();");
+          Write("deviceData['id'] = "#dev.ID()#";");
+          Write("deviceData['name'] = '"#dev.Name()#"';");
+          Write("deviceData['type'] = '"#dev.Label()#"';");
+          Write("deviceData['pic'] = '';");
+          Write("deviceData['desc'] = DEV_getDescription('"#dev.Label()#"');");
+          Write("deviceData['sn'] = '"#dev.Address()#"';");
+          Write("var chnTypes = new Array();");
+
+          Write("setNewDevicePos2SystemPos(deviceData);");
 
-    string
-    chnId;
-    foreach(chnId, dev.Channels())
-    {
-      object
-      chn = dom.GetObject(chnId);
-      Write("chnTypes.push('"#chn.HssType()#"');"
-    )
-    }
-    Write("deviceData['chnTypes'] = chnTypes;");
-
-    string chnTmp = "";
-    string roomIDs = "";
-    string funcIDs = "";
-    boolean bOneProto = false;
-    integer STD_FLAG = 1;
-    integer SAFE_FLAG = 2;
-    integer bitTrans = 0;
-    foreach(chnTmp, dev.EnumChannelGroups(true))
-    {
-      object
-      chn = dom.GetObject(chnTmp);
-      if (chn && (chn.Internal() == false)) {
-        if (chn.ChnArchive()) {
-          bOneProto = true;
-        }
-        if (chn.ChnAESActive()) {
-          bitTrans = bitTrans | SAFE_FLAG;
-        }
-        else {
-          bitTrans = bitTrans | STD_FLAG;
-        }
-        string
-        tmp = "";
-        foreach(tmp, chn.ChnRoom())
-        {
-          boolean
-          bFound = false;
           string
-          tmpR = "";
-          foreach(tmpR, roomIDs)
+          chnId;
+          foreach(chnId, dev.Channels())
           {
-            if (tmpR == tmp) {
-              bFound = true;
+            object
+            chn = dom.GetObject(chnId);
+            Write("chnTypes.push('"#chn.HssType()#"');"
+          )
+          }
+          Write("deviceData['chnTypes'] = chnTypes;");
+
+          string chnTmp = "";
+          string roomIDs = "";
+          string funcIDs = "";
+          boolean bOneProto = false;
+          integer STD_FLAG = 1;
+          integer SAFE_FLAG = 2;
+          integer bitTrans = 0;
+          foreach(chnTmp, dev.EnumChannelGroups(true))
+          {
+            object
+            chn = dom.GetObject(chnTmp);
+            if (chn && (chn.Internal() == false)) {
+              if (chn.ChnArchive()) {
+                bOneProto = true;
+              }
+              if (chn.ChnAESActive()) {
+                bitTrans = bitTrans | SAFE_FLAG;
+              }
+              else {
+                bitTrans = bitTrans | STD_FLAG;
+              }
+              string
+              tmp = "";
+              foreach(tmp, chn.ChnRoom())
+              {
+                boolean
+                bFound = false;
+                string
+                tmpR = "";
+                foreach(tmpR, roomIDs)
+                {
+                  if (tmpR == tmp) {
+                    bFound = true;
+                  }
+                }
+                if (!bFound) {
+                  roomIDs = roomIDs # tmp # "\t";
+                }
+              }
+
+              string
+              tmp = "";
+              foreach(tmp, chn.ChnFunction())
+              {
+                boolean
+                bFound = false;
+                string
+                tmpF = "";
+                foreach(tmpF, funcIDs)
+                {
+                  if (tmpF == tmp) {
+                    bFound = true;
+                  }
+                }
+                if (!bFound) {
+                  funcIDs = funcIDs # tmp # "\t";
+                }
+              }
+            }
+          }
+          foreach(chnTmp, dev.EnumChannelGroups(false))
+          {
+            object
+            chn = dom.GetObject(chnTmp);
+            if (chn && (chn.Internal() == false)) {
+              if (chn.ChnAESActive()) {
+                bitTrans = bitTrans | SAFE_FLAG;
+              }
+              else {
+                bitTrans = bitTrans | STD_FLAG;
+              }
+              if (chn.ChnArchive()) {
+                bOneProto = true;
+              }
+              string
+              tmp = "";
+              foreach(tmp, chn.ChnRoom())
+              {
+                boolean
+                bFound = false;
+                string
+                tmpR = "";
+                foreach(tmpR, roomIDs)
+                {
+                  if (tmpR == tmp) {
+                    bFound = true;
+                  }
+                }
+                if (!bFound) {
+                  roomIDs = roomIDs # tmp # "\t";
+                }
+              }
+
+              string
+              tmp = "";
+              foreach(tmp, chn.ChnFunction())
+              {
+                boolean
+                bFound = false;
+                string
+                tmpF = "";
+                foreach(tmpF, funcIDs)
+                {
+                  if (tmpF == tmp) {
+                    bFound = true;
+                  }
+                }
+                if (!bFound) {
+                  funcIDs = funcIDs # tmp # "\t";
+                }
+              }
             }
           }
-          if (!bFound) {
-            roomIDs = roomIDs # tmp # "\t";
+          string funcNames = "";
+          string roomNames = "";
+          string tmp = "";
+          foreach(tmp, roomIDs)
+          {
+            object obj = dom.GetObject(tmp);
+            roomNames = roomNames # obj.Name() # ";";
+          }
+          string tmp = "";
+          foreach(tmp, funcIDs)
+          {
+            object obj = dom.GetObject(tmp);
+            funcNames = funcNames # obj.Name() #  ";";
           }
-        }
 
-        string
-        tmp = "";
-        foreach(tmp, chn.ChnFunction())
-        {
-          boolean
-          bFound = false;
-          string
-          tmpF = "";
-          foreach(tmpF, funcIDs)
+
+          string sTrans;
+
+          if (bitTrans & STD_FLAG) {
+            sTrans = sTrans # "${lblStandard} ";
+          }
+
+          if (bitTrans & SAFE_FLAG) {
+            sTrans = sTrans # "${lblSecured}";
+          }
+          Write("deviceData['trans'] = '"#sTrans#"';");
+
+          string sIface = "";
+          integer iface = dev.Interface();
+          if (iface != ID_ERROR) {
+            sIface = dom.GetObject(iface).Name();
+          }
+          Write("deviceData['iface'] = '"#sIface#"';");
+          Write("deviceData['func'] = '"#funcNames#"';");
+          Write("deviceData['room'] = '"#roomNames#"';");
+          Write("deviceData['proto'] = "#bOneProto#";");
+          boolean bFound3 = false;
+          string s3;
+          foreach(s3, dev.Channels().EnumEnabledIDs())
           {
-            if (tmpF == tmp) {
-              bFound = true;
+            object
+            oChTmp = dom.GetObject(s3);
+            if (oChTmp) {
+              object
+              oDpTmp = dom.GetObject(oChTmp.DefaultDPWrite());
+              if (oDpTmp) {
+                if ((!oDpTmp.IsTypeOf(OT_VARDP)) && (!oDpTmp.IsTypeOf(OT_ALARMDP))) {
+                  bFound3 = true;
+                }
+              }
             }
           }
-          if (!bFound) {
-            funcIDs = funcIDs # tmp # "\t";
+          if (bFound3) {
+            boolean bHasFullAccess = (dev.UserAccessRights(iulOtherThanAdmin) == iarFullAccess);
+            if (bHasFullAccess) {
+              Write("deviceData['handle'] = 'YES';");
+            }
+            else {
+              Write("deviceData['handle'] = 'NO';");
+            }
           }
-        }
-      }
-    }
-    foreach(chnTmp, dev.EnumChannelGroups(false))
-    {
-      object
-      chn = dom.GetObject(chnTmp);
-      if (chn && (chn.Internal() == false)) {
-        if (chn.ChnAESActive()) {
-          bitTrans = bitTrans | SAFE_FLAG;
-        }
-        else {
-          bitTrans = bitTrans | STD_FLAG;
-        }
-        if (chn.ChnArchive()) {
-          bOneProto = true;
-        }
-        string
-        tmp = "";
-        foreach(tmp, chn.ChnRoom())
-        {
-          boolean
-          bFound = false;
-          string
-          tmpR = "";
-          foreach(tmpR, roomIDs)
+          else {
+            Write("deviceData['handle'] = 'READONLY';");
+          }
+          Write("deviceData['vis'] = "#(dev.Visible())#";");
+          Write('conInfo( "Device '#(dev.Name())#' : '#(dev.Visible())#'" );');
+          Write("deviceData['readyconfig'] = "#(dev.ReadyConfigChns())#";");
+          Write("deviceData['loaded'] = false;");
+
+          boolean bExistComTestDP = false;
+          string sdev;
+          foreach(sdev, dev.Channels().EnumIDs())
           {
-            if (tmpR == tmp) {
-              bFound = true;
+            object
+            oCHTmpECT = dom.GetObject(sdev);
+            if (oCHTmpECT) {
+              if (oCHTmpECT.ExistComTestDP()) {
+                bExistComTestDP = true;
+              }
             }
           }
-          if (!bFound) {
-            roomIDs = roomIDs # tmp # "\t";
+          if (bExistComTestDP) {
+            Write('deviceData["comtestdp"] = true;');
+          }
+          else {
+            Write('deviceData["comtestdp"] = false;');
           }
-        }
 
-        string
-        tmp = "";
-        foreach(tmp, chn.ChnFunction())
-        {
-          boolean
-          bFound = false;
-          string
-          tmpF = "";
-          foreach(tmpF, funcIDs)
+
+          boolean bFound = false;
+          string s;
+          foreach(s, dom.TestRunningIDs().EnumIDs())
           {
-            if (tmpF == tmp) {
+            if (dev.Channels().Get(s)) {
               bFound = true;
             }
           }
-          if (!bFound) {
-            funcIDs = funcIDs # tmp # "\t";
-          }
-        }
-      }
-    }
-    string funcNames = "";
-    string roomNames = "";
-    string tmp = "";
-    foreach(tmp, roomIDs)
-    {
-      object obj = dom.GetObject(tmp);
-      roomNames = roomNames # obj.Name() # ";";
-    }
-    string tmp = "";
-    foreach(tmp, funcIDs)
-    {
-      object obj = dom.GetObject(tmp);
-      funcNames = funcNames # obj.Name() #  ";";
-    }
 
+          if (bFound) {
+            Write("deviceData['testrunning'] = true;");
+          }
+          else {
+            Write("deviceData['testrunning'] = false;");
+          }
 
-    string sTrans;
-
-    if (bitTrans & STD_FLAG) {
-      sTrans = sTrans # "${lblStandard} ";
-    }
-
-    if (bitTrans & SAFE_FLAG) {
-      sTrans = sTrans # "${lblSecured}";
-    }
-    Write("deviceData['trans'] = '"#sTrans#"';");
+          string sTimestamp = dev.LastTestCompletedTime();
+          Call("/esp/TimeStamp.fn::TimeStampToString3()");
+          Write("deviceData['testtime'] = '"#sTimestamp#"';");
 
-    string sIface = "";
-    integer iface = dev.Interface();
-    if (iface != ID_ERROR) {
-      sIface = dom.GetObject(iface).Name();
-    }
-    Write("deviceData['iface'] = '"#sIface#"';");
-    Write("deviceData['func'] = '"#funcNames#"';");
-    Write("deviceData['room'] = '"#roomNames#"';");
-    Write("deviceData['proto'] = "#bOneProto#";");
-    boolean bFound3 = false;
-    string s3;
-    foreach(s3, dev.Channels().EnumEnabledIDs())
-    {
-      object
-      oChTmp = dom.GetObject(s3);
-      if (oChTmp) {
-        object
-        oDpTmp = dom.GetObject(oChTmp.DefaultDPWrite());
-        if (oDpTmp) {
-          if ((!oDpTmp.IsTypeOf(OT_VARDP)) && (!oDpTmp.IsTypeOf(OT_ALARMDP))) {
-            bFound3 = true;
-          }
+          Write("arDevices[arDevices.length] = deviceData;");
         }
       }
-    }
-    if (bFound3) {
-      boolean bHasFullAccess = (dev.UserAccessRights(iulOtherThanAdmin) == iarFullAccess);
-      if (bHasFullAccess) {
-        Write("deviceData['handle'] = 'YES';");
-      }
-      else {
-        Write("deviceData['handle'] = 'NO';");
-      }
-    }
-    else {
-      Write("deviceData['handle'] = 'READONLY';");
-    }
-    Write("deviceData['vis'] = "#(dev.Visible())#";");
-    Write('conInfo( "Device '#(dev.Name())#' : '#(dev.Visible())#'" );');
-    Write("deviceData['readyconfig'] = "#(dev.ReadyConfigChns())#";");
-    Write("deviceData['loaded'] = false;");
-
-    boolean bExistComTestDP = false;
-    string sdev;
-    foreach(sdev, dev.Channels().EnumIDs())
-    {
-      object
-      oCHTmpECT = dom.GetObject(sdev);
-      if (oCHTmpECT) {
-        if (oCHTmpECT.ExistComTestDP()) {
-          bExistComTestDP = true;
+      %>
+      var arDevInInbox = [];
+      for (var i = 0; i < arDevices.length; i++) {
+        arDevInInbox.push({"serialNumber": arDevices[i]['sn'], "regaID": arDevices[i]['id']});
+
+        var tr = Builder.node('tr', {id: "tr" + arDevices[i]['id']});
+        //var td = Builder.node('td');
+        var td = Builder.node('td', {className: 'DeviceListCell_Invisible'});
+        arImgIds[arImgIds.length] = "img" + arDevices[i]['id'];
+        var img = Builder.node('img', {src: "/ise/img/plus.png", id: "img" + arDevices[i]['id'], alt: "plus", onclick: "expandDevice(" + arDevices[i]['id'] + "," + i + ")"});
+        td.appendChild(img);
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, arDevices[i]['type']);
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'WhiteBkgPic CLASS04314 border1px'}, [
+          Builder.node('div', {id: 'picDiv' + arDevices[i]['id'], className: "CLASS04305",
+            onmouseover: "picDivShow(jg_250, '" + arDevices[i]['type'] + "', 250, '-1', this);", onmouseout: "picDivHide(jg_250);"})
+        ]);
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['desc'] );
+        td.innerHTML = translateKey(arDevices[i]['desc']);
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['sn']);
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['iface']);
+        tr.appendChild(td);
+        td = Builder.node('td', {id: "transParent" + arDevices[i]['id'], className: 'GrayBkg border1px'}, spaceCut(arDevices[i]['trans']));
+        tr.appendChild(td);
+
+
+        if (NAV_IE) {
+          td = Builder.node('td', {className: 'WhiteBkg border1px'},
+          [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']) ]);
+          tr.appendChild(td);
         }
-      }
-    }
-    if (bExistComTestDP) {
-      Write('deviceData["comtestdp"] = true;');
-    }
-    else {
-      Write('deviceData["comtestdp"] = false;');
-    }
-
-
-    boolean bFound = false;
-    string s;
-    foreach(s, dom.TestRunningIDs().EnumIDs())
-    {
-      if (dev.Channels().Get(s)) {
-        bFound = true;
-      }
-    }
-
-    if (bFound) {
-      Write("deviceData['testrunning'] = true;");
-    }
-    else {
-      Write("deviceData['testrunning'] = false;");
-    }
-
-    string sTimestamp = dev.LastTestCompletedTime();
-    Call("/esp/TimeStamp.fn::TimeStampToString3()");
-    Write("deviceData['testtime'] = '"#sTimestamp#"';");
-
-    Write("arDevices[arDevices.length] = deviceData;");
-  }
-}
-%>
-var arDevInInbox = [];
-for (var i = 0; i < arDevices.length; i++) {
-  arDevInInbox.push({"serialNumber": arDevices[i]['sn'], "regaID": arDevices[i]['id']});
-
-  var tr = Builder.node('tr', {id: "tr" + arDevices[i]['id']});
-  //var td = Builder.node('td');
-  var td = Builder.node('td', {className: 'DeviceListCell_Invisible'});
-  arImgIds[arImgIds.length] = "img" + arDevices[i]['id'];
-  var img = Builder.node('img', {src: "/ise/img/plus.png", id: "img" + arDevices[i]['id'], alt: "plus", onclick: "expandDevice(" + arDevices[i]['id'] + "," + i + ")"});
-  td.appendChild(img);
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, arDevices[i]['type']);
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'WhiteBkgPic CLASS04314 border1px'}, [
-    Builder.node('div', {id: 'picDiv' + arDevices[i]['id'], className: "CLASS04305",
-      onmouseover: "picDivShow(jg_250, '" + arDevices[i]['type'] + "', 250, '-1', this);", onmouseout: "picDivHide(jg_250);"})
-  ]);
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['desc'] );
-  td.innerHTML = translateKey(arDevices[i]['desc']);
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['sn']);
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['iface']);
-  tr.appendChild(td);
-  td = Builder.node('td', {id: "transParent" + arDevices[i]['id'], className: 'GrayBkg border1px'}, spaceCut(arDevices[i]['trans']));
-  tr.appendChild(td);
-
-
-  if (NAV_IE) {
-    td = Builder.node('td', {className: 'WhiteBkg border1px'},
-      [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']) ]);
-    tr.appendChild(td);
-  }
-  else {
-    if (isDevTypeHmIPW(arDevices[i]['type'])) {
-      td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px'});
-      divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, arDevices[i]['name'].replace(/:/g, ":<br/>"));
-      divB = Builder.node('div', {
-        id: 'btnRename_' + arDevices[i]["id"],
-        className: 'TestButton colorGradient borderRadius2px hidden',
-        style: 'min-width:7em',
-        onclick: 'renameAllNamesDialog(' + arDevices[i]["id"] + ')'
-      }, translateKey("lblRename"));
-      td.appendChild(divA);
-      td.appendChild(divB);
-    } else {
-      td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']);
-    }
+        else {
+          if (isDevTypeHmIPW(arDevices[i]['type'])) {
+            td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px'});
+            divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, arDevices[i]['name'].replace(/:/g, ":<br/>"));
+            divB = Builder.node('div', {
+              id: 'btnRename_' + arDevices[i]["id"],
+              className: 'TestButton colorGradient borderRadius2px hidden',
+              style: 'min-width:7em',
+              onclick: 'renameAllNamesDialog(' + arDevices[i]["id"] + ')'
+            }, translateKey("lblRename"));
+            td.appendChild(divA);
+            td.appendChild(divB);
+          } else {
+            td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']);
+          }
 
-    tr.appendChild(td);
-  }
-  td = Builder.node('td', {id: "funcs" + arDevices[i]['id'], className: 'GrayBkg border1px'}, semCut(arDevices[i]['func']));
-  tr.appendChild(td);
-  td = Builder.node('td', {id: "rooms" + arDevices[i]['id'], className: 'GrayBkg border1px'}, semCut(arDevices[i]['room']));
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'WhiteBkg border1px'});
-
-  if (arDevices[i]['type'].match(/Team/g) == null ) {
-    writeTestField(td, arDevices[i]['id'].toString(), arDevices[i]['testtime'], arDevices[i]['comtestdp'], arDevices[i]['testrunning']);
-  }
+          tr.appendChild(td);
+        }
+        td = Builder.node('td', {id: "funcs" + arDevices[i]['id'], className: 'GrayBkg border1px'}, semCut(arDevices[i]['func']));
+        tr.appendChild(td);
+        td = Builder.node('td', {id: "rooms" + arDevices[i]['id'], className: 'GrayBkg border1px'}, semCut(arDevices[i]['room']));
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'WhiteBkg border1px'});
+
+        if (arDevices[i]['type'].match(/Team/g) == null ) {
+          writeTestField(td, arDevices[i]['id'].toString(), arDevices[i]['testtime'], arDevices[i]['comtestdp'], arDevices[i]['testrunning']);
+        }
 
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'WhiteBkg border1px'}, '');
-  writeDeviceAction(td, true, true, true, arDevices[i]);
-  tr.appendChild(td);
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'WhiteBkg border1px'}, '');
+        writeDeviceAction(td, true, true, true, arDevices[i]);
+        tr.appendChild(td);
 
-  td = Builder.node('td', {className: 'WhiteBkg border1px'}, '');
-  writeReadyField(td, arDevices[i]);
-  tr.appendChild(td);
+        td = Builder.node('td', {className: 'WhiteBkg border1px'}, '');
+        writeReadyField(td, arDevices[i]);
+        tr.appendChild(td);
 
-  $("tblNewDevices").appendChild(tr);
-  // draw pic
-  var jg_0 = new jsGraphics('picDiv' + arDevices[i]['id']);
-  InitGD(jg_0, 50);
-  Draw(jg_0, arDevices[i]['type'], 50, '-1');
+        $("tblNewDevices").appendChild(tr);
+        // draw pic
+        var jg_0 = new jsGraphics('picDiv' + arDevices[i]['id']);
+        InitGD(jg_0, 50);
+        Draw(jg_0, arDevices[i]['type'], 50, '-1');
 
-  arDevPosis[arDevPosis.length] = i + 2;
+        arDevPosis[arDevPosis.length] = i + 2;
 
-  // Zeilenumbruch im Ger�tenamen
-  var devNameElm = jQuery("#tdn" + arDevices[i]['id']);
-  devNameElm.html(devNameElm.text());
+        // Zeilenumbruch im Ger�tenamen
+        var devNameElm = jQuery("#tdn" + arDevices[i]['id']);
+        devNameElm.html(devNameElm.text());
 
-}
+      }
 
 
-Groups.createGroupButtons(arDevInInbox);
+      Groups.createGroupButtons(arDevInInbox);
 
-if (NAV_IE) {
-  var tr = Builder.node('tr');
-  Element.addClassName(tr, "CLASS04309");
-  for (var i = 0; i < 15; i++) {
-    var td = Builder.node('td', {}, ".");
-    Element.addClassName(td, "CLASS04310");
-    tr.appendChild(td);
-  }
-  $("tblNewDevices").appendChild(tr);
-}
-</script>
-</tbody>
-</table>
-<br/><br/><br/><br/><br/><br/><br/>
-<br/><br/><br/><br/><br/><br/><br/>
+      if (NAV_IE) {
+        var tr = Builder.node('tr');
+        Element.addClassName(tr, "CLASS04309");
+        for (var i = 0; i < 15; i++) {
+          var td = Builder.node('td', {}, ".");
+          Element.addClassName(td, "CLASS04310");
+          tr.appendChild(td);
+        }
+        $("tblNewDevices").appendChild(tr);
+      }
+    </script>
+    </tbody>
+  </table>
+  <br/><br/><br/><br/><br/><br/><br/>
+  <br/><br/><br/><br/><br/><br/><br/>
 </div>
 <div class="RoomFuncChooser CLASS04311" id="roomOverlay" style="display:none;"></div>
 <div class="RoomFuncChooser CLASS04311" id="funcOverlay" style="display:none;"></div>
 <script type="text/javascript">
-iseRooms.buildRoomOverlay();
-iseFunctions.buildFuncOverlay();
-/* * * * * * * Expand / Collapse  * * * * * * * * * * * * * * * * * * * */
-var iDevicesExpanded = 0;
-expandDevice = function (id, arIdx, bAutoExpandGroups) {
-  // Ausklappen
-  if ($("img" + id).alt == "plus") {
-    if (!bEIP) {
-      arDevices[arIdx]['expanded'] = true;
-      $("img" + id).src = "/ise/img/minus.png";
-      $("img" + id).alt = "minus";
-      Cursor.set(Cursor.WAIT);
-      if (arDevices[arIdx]['loaded']) {
-        for (var i = 0; i < arDevices[arIdx]['chns'].length; i++) {
-          show(arDevices[arIdx]['chns'][i]['trid']);
-          // show picture for row
-          show('picDiv' + arDevices[arIdx]['chns'][i]['id']);
-        }
-        for (var i = 0; i < arDevices[arIdx]['chnsgr'].length; i++) {
-          show(arDevices[arIdx]['chnsgr'][i]['trid']);
-          // show picture for row
-          show('picDiv' + arDevices[arIdx]['chnsgr'][i][0]['id'] + arDevices[arIdx]['chnsgr'][i][1]['id']);
-          if (bAutoExpandGroups) {
-            expandGroup(arDevices[arIdx]['id'],
-              arDevices[arIdx]['chnsgr'][i][0]['id'],
-              arDevices[arIdx]['chnsgr'][i][1]['id']);
+  iseRooms.buildRoomOverlay();
+  iseFunctions.buildFuncOverlay();
+  /* * * * * * * Expand / Collapse  * * * * * * * * * * * * * * * * * * * */
+  var iDevicesExpanded = 0;
+  expandDevice = function (id, arIdx, bAutoExpandGroups) {
+    // Ausklappen
+    if ($("img" + id).alt == "plus") {
+      if (!bEIP) {
+        arDevices[arIdx]['expanded'] = true;
+        $("img" + id).src = "/ise/img/minus.png";
+        $("img" + id).alt = "minus";
+        Cursor.set(Cursor.WAIT);
+        if (arDevices[arIdx]['loaded']) {
+          for (var i = 0; i < arDevices[arIdx]['chns'].length; i++) {
+            show(arDevices[arIdx]['chns'][i]['trid']);
+            // show picture for row
+            show('picDiv' + arDevices[arIdx]['chns'][i]['id']);
+          }
+          for (var i = 0; i < arDevices[arIdx]['chnsgr'].length; i++) {
+            show(arDevices[arIdx]['chnsgr'][i]['trid']);
+            // show picture for row
+            show('picDiv' + arDevices[arIdx]['chnsgr'][i][0]['id'] + arDevices[arIdx]['chnsgr'][i][1]['id']);
+            if (bAutoExpandGroups) {
+              expandGroup(arDevices[arIdx]['id'],
+                arDevices[arIdx]['chnsgr'][i][0]['id'],
+                arDevices[arIdx]['chnsgr'][i][1]['id']);
+            }
           }
+          iDevicesExpanded++;
+          Cursor.set(Cursor.NORMAL);
+        }
+        else {
+          var pb = "";
+          pb += "integer devid = " + id + ";";
+          pb += "integer arIdx = " + arIdx + ";";
+          pb += "integer insIdx = " + arDevPosis[arIdx] + ";";
+          if (bAutoExpandGroups)
+            pb += "boolean bAutoExpGr = true;";
+          else
+            pb += "boolean bAutoExpGr = false;";
+          bEIP = true;
+          var opts = {
+            evalScripts: true,
+            postBody: pb,
+            asynchronous: false,
+            onComplete: function () {
+              arDevices[arIdx]['loaded'] = true;
+            }
+          };
+          new Ajax.Updater("dummy", "/pages/tabs/admin/views/newDeviceLoader.htm?sid=" + SessionId, opts);
+          iDevicesExpanded++;
         }
-        iDevicesExpanded++;
-        Cursor.set(Cursor.NORMAL);
       }
       else {
-        var pb = "";
-        pb += "integer devid = " + id + ";";
-        pb += "integer arIdx = " + arIdx + ";";
-        pb += "integer insIdx = " + arDevPosis[arIdx] + ";";
+        var s = "false";
         if (bAutoExpandGroups)
-          pb += "boolean bAutoExpGr = true;";
-        else
-          pb += "boolean bAutoExpGr = false;";
-        bEIP = true;
-        var opts = {
-          evalScripts: true,
-          postBody: pb,
-          asynchronous: false,
-          onComplete: function () {
-            arDevices[arIdx]['loaded'] = true;
-          }
-        };
-        new Ajax.Updater("dummy", "/pages/tabs/admin/views/newDeviceLoader.htm?sid=" + SessionId, opts);
-        iDevicesExpanded++;
+          s = "true";
+        window.setTimeout("expandDevice(" + id + "," + arIdx + ", " + s + ")", 500);
       }
     }
+    // Einklappen
     else {
-      var s = "false";
-      if (bAutoExpandGroups)
-        s = "true";
-      window.setTimeout("expandDevice(" + id + "," + arIdx + ", " + s + ")", 500);
+      $("img" + id).src = "/ise/img/plus.png";
+      $("img" + id).alt = "plus";
+      arDevices[arIdx]['expanded'] = false;
+      for (var i = 0; i < arDevices[arIdx]['chns'].length; i++) {
+        hide("" + arDevices[arIdx]['id'] + arDevices[arIdx]['chns'][i]['id']);
+        // arDevices[arIdx]['chns'][i]['id'] -> id des Channels
+        // hide picture for row
+        hide('picDiv' + arDevices[arIdx]['chns'][i]['id']);
+      }
+      for (var i = 0; i < arDevices[arIdx]['chnsgr'].length; i++) {
+        // arDevices[arIdx]['chnsgr'][i][0]['id'] -> id des Channels in der channel group 0
+        // hide picture for row
+        hide('picDiv' + arDevices[arIdx]['chnsgr'][i][0]['id'] + arDevices[arIdx]['chnsgr'][i][1]['id']);
+        collapseGroup(arDevices[arIdx]['id'], arDevices[arIdx]['chnsgr'][i][0]['id'], arDevices[arIdx]['chnsgr'][i][1]['id'], false);
+      }
+      iDevicesExpanded--;
     }
-  }
-  // Einklappen
-  else {
-    $("img" + id).src = "/ise/img/plus.png";
-    $("img" + id).alt = "plus";
-    arDevices[arIdx]['expanded'] = false;
-    for (var i = 0; i < arDevices[arIdx]['chns'].length; i++) {
-      hide("" + arDevices[arIdx]['id'] + arDevices[arIdx]['chns'][i]['id']);
-      // arDevices[arIdx]['chns'][i]['id'] -> id des Channels
-      // hide picture for row
-      hide('picDiv' + arDevices[arIdx]['chns'][i]['id']);
+    refreshFooterButton();
+  };
+
+  expandGroup = function (devId, id1, id2) {
+    if ($("img" + id1 + id2).alt == "plus") {
+      $("img" + id1 + id2).src = "/ise/img/minus.png";
+      $("img" + id1 + id2).alt = "minus";
+      show("" + devId + id1 + id2 + "1");
+      show("" + devId + id1 + id2 + "2");
+      // show channel picture pictures
+      show('picDiv' + id1);
+      show('picDiv' + id2);
     }
-    for (var i = 0; i < arDevices[arIdx]['chnsgr'].length; i++) {
-      // arDevices[arIdx]['chnsgr'][i][0]['id'] -> id des Channels in der channel group 0
-      // hide picture for row
-      hide('picDiv' + arDevices[arIdx]['chnsgr'][i][0]['id'] + arDevices[arIdx]['chnsgr'][i][1]['id']);
-      collapseGroup(arDevices[arIdx]['id'], arDevices[arIdx]['chnsgr'][i][0]['id'], arDevices[arIdx]['chnsgr'][i][1]['id'], false);
+    // Einklappen
+    else {
+      collapseGroup(devId, id1, id2, true);
     }
-    iDevicesExpanded--;
-  }
-  refreshFooterButton();
-};
-
-expandGroup = function (devId, id1, id2) {
-  if ($("img" + id1 + id2).alt == "plus") {
-    $("img" + id1 + id2).src = "/ise/img/minus.png";
-    $("img" + id1 + id2).alt = "minus";
-    show("" + devId + id1 + id2 + "1");
-    show("" + devId + id1 + id2 + "2");
-    // show channel picture pictures
-    show('picDiv' + id1);
-    show('picDiv' + id2);
-  }
-  // Einklappen
-  else {
-    collapseGroup(devId, id1, id2, true);
-  }
-};
+  };
 
-collapseGroup = function (devId, id1, id2, subsOnly) {
-  if ($("img" + id1 + id2)) {
-    $("img" + id1 + id2).src = "/ise/img/plus.png";
-    $("img" + id1 + id2).alt = "plus";
-  }
-  if (!subsOnly)
-    hide("" + devId + id1 + id2);
-  hide("" + devId + id1 + id2 + "1");
-  hide("" + devId + id1 + id2 + "2");
-  // hide channel pictures
-  hide('picDiv' + id1);
-  hide('picDiv' + id2);
-};
-
-collapseAll = function () {
-  var pb = "integer iNewOnly = 0;";
-  if (iDevicesExpanded == 0) {
-    for (var i = 0; i < arDevices.length; i++) {
-      expandDevice(arDevices[i]['id'], i, true);
-    }
-  }
-  else {
-    for (var i = 0; i < arSubIds.length; i++) {
-      $(arSubIds[i]).hide();
+  collapseGroup = function (devId, id1, id2, subsOnly) {
+    if ($("img" + id1 + id2)) {
+      $("img" + id1 + id2).src = "/ise/img/plus.png";
+      $("img" + id1 + id2).alt = "plus";
     }
-    for (var i = 0; i < arImgIds.length; i++) {
-      $(arImgIds[i]).src = "/ise/img/plus.png";
-      $(arImgIds[i]).alt = "plus";
+    if (!subsOnly)
+      hide("" + devId + id1 + id2);
+    hide("" + devId + id1 + id2 + "1");
+    hide("" + devId + id1 + id2 + "2");
+    // hide channel pictures
+    hide('picDiv' + id1);
+    hide('picDiv' + id2);
+  };
+
+  collapseAll = function () {
+    var pb = "integer iNewOnly = 0;";
+    if (iDevicesExpanded == 0) {
+      for (var i = 0; i < arDevices.length; i++) {
+        expandDevice(arDevices[i]['id'], i, true);
+      }
     }
-    for (var i = 0; i < arDevices.length; i++) {
-      arDevices[i]['expanded'] = false;
-      if (arDevices[i]['chns']) {
-        for (var x = 0; x < arDevices[i]['chns'].length; x++) {
-          hide('picDiv' + arDevices[i]['chns'][x]['id']);
-        }
+    else {
+      for (var i = 0; i < arSubIds.length; i++) {
+        $(arSubIds[i]).hide();
       }
-      if (arDevices[i]['chnsgr']) {
-        for (var x = 0; x < arDevices[i]['chnsgr'].length; x++) {
-          collapseGroup(arDevices[i]['id'], arDevices[i]['chnsgr'][x][0]['id'], arDevices[i]['chnsgr'][x][1]['id'], false);
-          hide('picDiv' + arDevices[i]['chnsgr'][x][0]['id'] + arDevices[i]['chnsgr'][x][1]['id']);
+      for (var i = 0; i < arImgIds.length; i++) {
+        $(arImgIds[i]).src = "/ise/img/plus.png";
+        $(arImgIds[i]).alt = "plus";
+      }
+      for (var i = 0; i < arDevices.length; i++) {
+        arDevices[i]['expanded'] = false;
+        if (arDevices[i]['chns']) {
+          for (var x = 0; x < arDevices[i]['chns'].length; x++) {
+            hide('picDiv' + arDevices[i]['chns'][x]['id']);
+          }
+        }
+        if (arDevices[i]['chnsgr']) {
+          for (var x = 0; x < arDevices[i]['chnsgr'].length; x++) {
+            collapseGroup(arDevices[i]['id'], arDevices[i]['chnsgr'][x][0]['id'], arDevices[i]['chnsgr'][x][1]['id'], false);
+            hide('picDiv' + arDevices[i]['chnsgr'][x][0]['id'] + arDevices[i]['chnsgr'][x][1]['id']);
+          }
         }
       }
+      iDevicesExpanded = 0;
     }
-    iDevicesExpanded = 0;
-  }
-  refreshFooterButton();
-};
-
-editRooms = function () {
-  dlgPopup = new iseMessageBox(ID_ROOMS);
-  PopupClose = function () {
-    dlgPopup.hide();
-    iseRooms.buildRoomOverlay();
+    refreshFooterButton();
+  };
+
+  editRooms = function () {
+    dlgPopup = new iseMessageBox(ID_ROOMS);
+    PopupClose = function () {
+      dlgPopup.hide();
+      iseRooms.buildRoomOverlay();
+    };
+    dlgPopup.ShowPopup();
   };
-  dlgPopup.ShowPopup();
-};
-editFuncs = function () {
-  dlgPopup = new iseMessageBox(ID_FUNCTIONS);
-  PopupClose = function () {
-    dlgPopup.hide();
-    iseFunctions.buildFuncOverlay();
+  editFuncs = function () {
+    dlgPopup = new iseMessageBox(ID_FUNCTIONS);
+    PopupClose = function () {
+      dlgPopup.hide();
+      iseFunctions.buildFuncOverlay();
+    };
+    dlgPopup.ShowPopup();
   };
-  dlgPopup.ShowPopup();
-};
 
-renameAllNamesDialog = function(devId) {
+  renameAllNamesDialog = function(devId) {
 
-  var url = '/pages/msg/askRenameAllChannels.htm?sid=' + SessionId;
-  var opt =
-  {
-    onComplete: function (t) {
-      var selectedVal = "";
-      var dlg = new YesNoDialog("", t.responseText, function(result) {
+    var url = '/pages/msg/askRenameAllChannels.htm?sid=' + SessionId;
+    var opt =
+      {
+        onComplete: function (t) {
+          var selectedVal = "";
+          var dlg = new YesNoDialog("", t.responseText, function(result) {
 
-        if (result) {
-            //var val = jQuery("input[name='allChannels']:checked").val();
-            renameDeviceDialog(devId, selectedVal);
-        }
-      }, "html");
+            if (result) {
+              //var val = jQuery("input[name='allChannels']:checked").val();
+              renameDeviceDialog(devId, selectedVal);
+            }
+          }, "html");
 
-      selectedVal = jQuery("input[name='allChannels']:checked").val();
-      jQuery("input[name='allChannels']").change(function() {selectedVal = this.value;});
+          selectedVal = jQuery("input[name='allChannels']:checked").val();
+          jQuery("input[name='allChannels']").change(function() {selectedVal = this.value;});
 
-      dlg.setWidth(400);
-      dlg.btnTextYes(translateKey("btnNext"));
-      dlg.btnTextNo(translateKey("btnCancel"));
-    }
+          dlg.setWidth(400);
+          dlg.btnTextYes(translateKey("btnNext"));
+          dlg.btnTextNo(translateKey("btnCancel"));
+        }
+      };
+    new Ajax.Request(url, opt);
   };
-  new Ajax.Request(url, opt);
-};
-
-showBtnYes = function(value) {
-  if (value == "") {
-    renameDeviceDlg.btnYesHide();
-  } else {
-    renameDeviceDlg.btnYesShow();
-  }
 
-};
+  showBtnYes = function(value) {
+    if (value == "") {
+      renameDeviceDlg.btnYesHide();
+    } else {
+      renameDeviceDlg.btnYesShow();
+    }
 
-actualizePreviewChannelNames = function(value) {
+  };
 
-  if (typeof  actualizeChannelTimer != "undefined") {
-    clearTimeout(actualizeChannelTimer);
-  }
+  actualizePreviewChannelNames = function(value) {
 
-  actualizeChannelTimer = setTimeout(function() {
-    var channelRows = jQuery("[name='previewChannelName']"),
-      basisName = renameDeviceDlg.convertToValidBasicName(value);
+    if (typeof  actualizeChannelTimer != "undefined") {
+      clearTimeout(actualizeChannelTimer);
+    }
 
-    jQuery("#deviceBasisName").val(basisName);
+    actualizeChannelTimer = setTimeout(function() {
+      var channelRows = jQuery("[name='previewChannelName']"),
+        basisName = renameDeviceDlg.convertToValidBasicName(value);
 
-    if (basisName == "") {
-      renameDeviceDlg.btnYesHide();
-    } else {
-      renameDeviceDlg.btnYesShow();
-    }
+      jQuery("#deviceBasisName").val(basisName);
+
+      if (basisName == "") {
+        renameDeviceDlg.btnYesHide();
+      } else {
+        renameDeviceDlg.btnYesShow();
+      }
 
-    channelRows.each(function(index, elm) {
-      var arChannelName = jQuery(elm).html().split(":"),
-      newName = "";
-      // Set the new basis name
-      arChannelName[0] = value;
-      // Build the new name
-      arChannelName.each(function(val) {
-        newName += val +":";
+      channelRows.each(function(index, elm) {
+        var arChannelName = jQuery(elm).html().split(":"),
+          newName = "";
+        // Set the new basis name
+        arChannelName[0] = value;
+        // Build the new name
+        arChannelName.each(function(val) {
+          newName += val +":";
+        });
+        jQuery(elm).html(renameDeviceDlg.convertToValidBasicName(newName.slice(0,-1))); // slice removes the unnecessary ':' at the end of the new name
       });
-      jQuery(elm).html(renameDeviceDlg.convertToValidBasicName(newName.slice(0,-1))); // slice removes the unnecessary ':' at the end of the new name
-    });
-  },1000);
-};
-
-renameDeviceDialog = function(devId, allChannels) {
-  var url = '/pages/msg/renameDevice.htm?sid=' + SessionId;
-  var opt =
-  {
-    onComplete: function (t) {
-      renameDeviceDlg = new RenameDeviceDialog("", t.responseText, devId, allChannels, function(result) {
-        var self = this;
-        // Yes pressed
-        if (result) {
-
-          var newName = this.getNewDeviceName();
-          conInfo("renameDeviceDialog - Try to save the new name!");
-          homematic("Device.setName", {id: devId, name: newName.replace(/<[^>]*>/g, " ")}, function(result) {
-            conInfo("Device name successfully set to " + result);
-            //WebUI.enter(NewDeviceListPage);
-            jQuery("#tdn" + devId).html(result.replace(/:/g,":<br/>"));
-
-            if (allChannels == "true") {
-              conInfo("Now we should rename all available channels.");
-              var arChnObj = self.getNewChannelNames();
-
-              conInfo(arChnObj);
-
-              jQuery.each(arChnObj, function(index, chnObj) {
-                homematic("Channel.setName", {id: chnObj.id, name: chnObj.name.replace(/<[^>]*>/g, " ")},function(result) {
-                  conInfo("Channel "+chnObj.id+": name successfully set to " + result.replace(/:/g,":<br/>"));
-                  jQuery("#tdn" + chnObj.id).html(result.replace(/:/g,":<br/>"));
-                });
-              });
+    },1000);
+  };
 
+  renameDeviceDialog = function(devId, allChannels) {
+    var url = '/pages/msg/renameDevice.htm?sid=' + SessionId;
+    var opt =
+      {
+        onComplete: function (t) {
+          renameDeviceDlg = new RenameDeviceDialog("", t.responseText, devId, allChannels, function(result) {
+            var self = this;
+            // Yes pressed
+            if (result) {
+
+              var newName = this.getNewDeviceName();
+              conInfo("renameDeviceDialog - Try to save the new name!");
+              homematic("Device.setName", {id: devId, name: newName.replace(/<[^>]*>/g, " ")}, function(result) {
+                conInfo("Device name successfully set to " + result);
+                //WebUI.enter(NewDeviceListPage);
+                jQuery("#tdn" + devId).html(result.replace(/:/g,":<br/>"));
+
+                if (allChannels == "true") {
+                  conInfo("Now we should rename all available channels.");
+                  var arChnObj = self.getNewChannelNames();
+
+                  conInfo(arChnObj);
+
+                  jQuery.each(arChnObj, function(index, chnObj) {
+                    homematic("Channel.setName", {id: chnObj.id, name: chnObj.name.replace(/<[^>]*>/g, " ")},function(result) {
+                      conInfo("Channel "+chnObj.id+": name successfully set to " + result.replace(/:/g,":<br/>"));
+                      jQuery("#tdn" + chnObj.id).html(result.replace(/:/g,":<br/>"));
+                    });
+                  });
+
+                }
+              });
             }
-          });
+          }, "html");
+          renameDeviceDlg.resetHeight();
+          renameDeviceDlg.setWidth(600);
+          renameDeviceDlg.btnTextNo(translateKey("btnCancel"));
+          renameDeviceDlg.btnTextYes(translateKey("btnOk"));
         }
-      }, "html");
-      renameDeviceDlg.resetHeight();
-      renameDeviceDlg.setWidth(600);
-      renameDeviceDlg.btnTextNo(translateKey("btnCancel"));
-      renameDeviceDlg.btnTextYes(translateKey("btnOk"));
+      };
+    new Ajax.Request(url, opt);
+  };
+
+  refreshFooterButton = function () {
+    if (iDevicesExpanded == 0) {
+      $("btnStructure").innerHTML = translateKey('footerBtnOpenTree'); //"Baumstruktur<br />&ouml;ffnen";
+    }
+    else {
+      $("btnStructure").innerHTML = translateKey('footerBtnCloseTree'); //  "Baumstruktur schlie�en";
     }
   };
-  new Ajax.Request(url, opt);
-};
 
-refreshFooterButton = function () {
-  if (iDevicesExpanded == 0) {
-    $("btnStructure").innerHTML = translateKey('footerBtnOpenTree'); //"Baumstruktur<br />&ouml;ffnen";
-  }
-  else {
-    $("btnStructure").innerHTML = translateKey('footerBtnCloseTree'); //  "Baumstruktur schlie�en";
-  }
-};
+  var s = "";
 
-var s = "";
+  s += "<table cellspacing='8'>";
+  s += "<tr>";
+  s += "<td style='text-align:center; vertical-align: middle;'><div class='FooterButton' onclick='WebUI.goBack()'>" + translateKey('footerBtnPageBack') + "</div></td>";
+  s += "<td style='text-align:center; vertical-align: middle;'><div id='btnStructure' class='FooterButton CLASS04312' onclick='collapseAll()'>" + translateKey('footerBtnOpenTree') + "</div></td>";
+  s += "</tr>";
+  s += "</table>";
 
-s += "<table cellspacing='8'>";
-s += "<tr>";
-s += "<td style='text-align:center; vertical-align: middle;'><div class='FooterButton' onclick='WebUI.goBack()'>" + translateKey('footerBtnPageBack') + "</div></td>";
-s += "<td style='text-align:center; vertical-align: middle;'><div id='btnStructure' class='FooterButton CLASS04312' onclick='collapseAll()'>" + translateKey('footerBtnOpenTree') + "</div></td>";
-s += "</tr>";
-s += "</table>";
+  setFooter(s);
 
-setFooter(s);
+  NewDevSort = function (colName) {
+    updateContent("/pages/tabs/admin/views/newdevices.htm", null, "system.SetSessionVar('sessionLS', '" + colName + "');");
+  };
 
-NewDevSort = function (colName) {
-  updateContent("/pages/tabs/admin/views/newdevices.htm", null, "system.SetSessionVar('sessionLS', '" + colName + "');");
-};
+  GetChannelType = function (channel) {
+    return channel.channelType;
+  };
 
-GetChannelType = function (channel) {
-  return channel.channelType;
-};
+  CreateSysVar = function (name, type, value, chnID) {
+    if (typeof chnID === "undefined") {
+      chnID = -1;
+    }
+    switch (type) {
+      case "float" :
+        var minVal = 0,
+          maxVal = (1.7 * Math.pow(10, 308)) - 1; // Double in C++
+        return homematic("SysVar.createFloat", {"name": name, "minValue": minVal, "maxValue": maxVal, "internal": 1, "chnID": chnID}, function() {
+          if ((value != undefined) && (value != "")) {
+            homematic("SysVar.setFloat", {"name" : name, "value" : value});
+          }
+        });
+      case "boolean":
+        return homematic("SysVar.createBool", {"name": name, "init_val": false, "internal": 1, "chnID": chnID}, function() {
+          if ((value != undefined) && (value != "")) {
+            homematic("SysVar.setBool", {"name" : name, "value" : value});
+          }
+        });
+      case "enum":
+        return homematic("SysVar.createEnum", {"name": name, "valList": "val1,val2,val3", "internal": 1, "chnID": chnID}, function() {
+          if ((value != undefined) && (value != "")) {
+            homematic("SysVar.setEnum", {"name" : name, "valueList" : value});
+          }
+        });
+    }
+  };
 
-CreateSysVar = function (name, type, value, chnID) {
-  if (typeof chnID === "undefined") {
-    chnID = -1;
-  }
-  switch (type) {
-    case "float" :
-      var minVal = 0,
-        maxVal = (1.7 * Math.pow(10, 308)) - 1; // Double in C++
-      return homematic("SysVar.createFloat", {"name": name, "minValue": minVal, "maxValue": maxVal, "internal": 1, "chnID": chnID}, function() {
-        if ((value != undefined) && (value != "")) {
-          homematic("SysVar.setFloat", {"name" : name, "value" : value});
-        }
-      });
-    case "boolean":
-      return homematic("SysVar.createBool", {"name": name, "init_val": false, "internal": 1, "chnID": chnID}, function() {
-        if ((value != undefined) && (value != "")) {
-          homematic("SysVar.setBool", {"name" : name, "value" : value});
-        }
-      });
-    case "enum":
-      return homematic("SysVar.createEnum", {"name": name, "valList": "val1,val2,val3", "internal": 1, "chnID": chnID}, function() {
-        if ((value != undefined) && (value != "")) {
-          homematic("SysVar.setEnum", {"name" : name, "valueList" : value});
-        }
-      });
-  }
-};
-
-//Standard EnergyCounter
-CreateSysVarEnergyCounterScript = function(chn) {
-
-  var sysVarIds = getSysVarEnergyCounterIds(chn);
-  var sysVarId = sysVarIds.counterId,
-    sysVarOldValId = sysVarIds.tmpCounterId;
-
-  var updateScript =
-  "object chn = dom.GetObject('"+chn.id+"');\n" +
-  "object oBoot = chn.DPByControl('POWERMETER.BOOT');\n" +
-  "object oEnergyCounter = chn.DPByControl('POWERMETER.ENERGY_COUNTER');\n" +
-  "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
-  "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-
-  "boolean bootFlag = oBoot.Value();\n" +
-  "real devVal = oEnergyCounter.Value();\n" +
-  "real devValMax = oEnergyCounter.ValueMax();\n" +
-  "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
-  "real diffVal = 0.0;\n" +
-  "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
-  "integer tmp_devVal = (devVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-
-
-  "if (oldDevVal <= 0) {\n" +
-    "oSysVarEnergyCounterOldVal.State(devVal);\n" +
-    "oSysVarEnergyCounter.State(devVal);\n" +
-  "} else {\n" +
-    "if ( ( bootFlag == true ) && ( tmp_devVal < tmp_oldDevVal ) ) {\n" +
+  CreateMetaEnergyCounter = function(chn) {
+    /*
+      initialVal
+      Values for the last 30 days. The first 0 is yesterdy......
+      This is being used to store the values of the last 30 days.
+    */
+    var initialVal = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0";
+    homematic("Interface.setMetadata", {
+      "objectId" : chn.id,
+      "dataId" : "energyCounter30Days",
+      "value" : initialVal
+    });
+    homematic("Interface.setMetadata", {"objectId" : chn.id, "dataId" : "energy0","value" : 0}); // Today
+    homematic("Interface.setMetadata", {"objectId" : chn.id, "dataId" : "energy1","value" : 0}); // Yesterday
+    homematic("Interface.setMetadata", {"objectId" : chn.id, "dataId" : "energy7","value" : 0}); // 1 Week
+    homematic("Interface.setMetadata", {"objectId" : chn.id, "dataId" : "energy30","value" : 0}); // 1 Month
+  };
+
+  //Standard EnergyCounter
+  CreateSysVarEnergyCounterScript = function(chn) {
+
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oBoot = chn.DPByControl('POWERMETER.BOOT');\n" +
+      "object oEnergyCounter = chn.DPByControl('POWERMETER.ENERGY_COUNTER');\n" +
+      "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+      "boolean bootFlag = oBoot.Value();\n" +
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 100000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
+
+
+      "if (oldDevVal <= 0) {\n" +
+      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+      "oSysVarEnergyCounter.State(devVal);\n" +
+      "} else {\n" +
+      "if ( ( bootFlag == true ) && ( tmp_devVal < tmp_oldDevVal ) ) {\n" +
       "diffVal = devVal;\n" +
-    "} else {\n" +
+      "} else {\n" +
       "if (tmp_devVal >= tmp_oldDevVal) {\n" +
-        "diffVal = devVal - oldDevVal;\n" +
+      "diffVal = devVal - oldDevVal;\n" +
       "}\n"+
 
       "if ((tmp_devVal > 0) && (tmp_devVal < tmp_oldDevVal)) {\n" +
-        "diffVal = (devVal + devValMax) - oldDevVal;\n" +
+      "diffVal = (devVal + devValMax) - oldDevVal;\n" +
       "}\n" +
-    "}\n"+
-    "if (devVal > 0) {\n" +
+      "}\n"+
+      "if (devVal > 0) {\n" +
       "oSysVarEnergyCounterOldVal.State(devVal);\n" +
-    "}\n" +
-    "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
-  "}\n";
-
-  var script =
-  "var sysVarId = '"+sysVarId+"';\n" +
-  "var channel = dom.GetObject('"+chn.id+"');\n" +
-  "var channelId = channel.ID();\n" +
-  "var paramId = channel.DPByControl('POWERMETER.ENERGY_COUNTER').ID();\n"+
-  "var _script = \""+updateScript+"\";\n" +
-
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
-
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
-
-
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
-
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(9);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtObjectId);"+
-  "singleCondition.LeftVal(paramId);"+
-  "singleCondition.RightVal1ValType(ivtFloat);"+
-  "singleCondition.RightVal1(0.0);"+
-  "singleCondition.RightVal2ValType(ivtFloat);"+
-  "singleCondition.RightVal2(0.0);"+
-
-  "singleCondition.ConditionChannel(channelId);"+
-
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
-
-  "program.Active(true);"+
-  "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-// Current/Gas EnergyCounter
-CreateSysVarEnergyCounterScriptIGL = function (chn, channelType, sensorType) {
-
-  var sysVarIds = (sensorType == "CURRENT") ? getSysVarEnergyCounterIds(chn) : getSysVarEnergyCounterGasIds(chn);
-  var sysVarId = sysVarIds.counterId,
-    sysVarOldValId = sysVarIds.tmpCounterId;
-
-  var counter = (sensorType == "CURRENT") ? "ENERGY_COUNTER" : "GAS_ENERGY_COUNTER";
-  var prgNameExtension = (counter == "ENERGY_COUNTER") ? "" : "GAS";
-
-  var updateScript =
-    "object chn = dom.GetObject('" + chn.id + "');\n" +
-    "object oBoot = chn.DPByControl('" + channelType + ".BOOT');\n" +
-    "object oEnergyCounter = chn.DPByControl('" + channelType + "." + counter + "');\n" +
-    "object oSysVarEnergyCounter = dom.GetObject('" + sysVarId + "');\n" +
-    "object oSysVarEnergyCounterOldVal = dom.GetObject('" + sysVarOldValId + "');\n" +
-    "object oSysVarEnergyCounterResetPressed = dom.GetObject('" + sysVarId + "_RESET');\n" +
-    "object oSysVarEnergyCounterTmpOldVal = dom.GetObject('" + sysVarId + "_TMP_OLDVAL');\n" +
-    "object oSysVarEnergyCounterDeviceReset = dom.GetObject('" + sysVarId + "_DEVICE_RESET');\n" +
-
-    "boolean bootFlag = oBoot.Value();\n" +
-    "real devVal = oEnergyCounter.Value();\n" +
-    "real devValMax = oEnergyCounter.ValueMax();\n" +
-    "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
-    "real tmpOldDevVal = oSysVarEnergyCounterTmpOldVal.Value();\n" +
-    "integer ioldDevVal = (tmpOldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-    "real diffVal = 0.0;\n" +
-    "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
-    "integer tmp_devVal = (devVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-    "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-
-    "if ( oBoot.Value() == true ) {\n" +
-    "   oSysVarEnergyCounterDeviceReset.State(true);\n" +
-    "   if (ioldDevVal <= 0) {\n" +
-    "     oSysVarEnergyCounter.State(0);\n" +
-    "   }\n" +
-    "} else {\n" +
-    "   boolean resetPressed = oSysVarEnergyCounterResetPressed.Value();\n" +
-    "   ! boolean devReset = oSysVarEnergyCounterDeviceReset.Value();\n" +
-    "   if ( (resetPressed == true) && (oSysVarEnergyCounterDeviceReset.Value() == true) ) {\n" +
-    "       oSysVarEnergyCounterTmpOldVal.State(0);\n" +
-    "       tmpOldDevVal = 0;\n" +
-    "   }\n" +
-    "  !Normales Hochzaehlen. Geraetwert > vorheriger Wert\n" +
-    "  if ((tmp_devVal >= tmp_oldDevVal) && (oSysVarEnergyCounterDeviceReset.Value() == false)) {\n" +
-    "   if (resetPressed == false) {\n" +
-    "      diffVal = oEnergyCounter.Value() - oldDevVal;\n" +
-    "    } else {\n" +
-    "      !Reset pressed\n" +
-    "      diffVal = oEnergyCounter.Value() - tmpOldDevVal;\n" +
-    "      if ((diffVal.ToString().ToFloat() * 100000).ToInteger() < 0 ) {\n" +
-    "		     diffVal = oEnergyCounter.Value();\n" +
-    "      }\n" +
-    "      oSysVarEnergyCounterResetPressed.State(0);\n" +
-    "    }\n" +
-    "  } else {\n" +
-    "    !Geraetewert ist kleiner vorheriger Wert\n" +
-    "   !Entweder Ueberlauf, oder Batterietausch\n" +
-    "    if (oSysVarEnergyCounterDeviceReset.Value() == false) {\n" +
-    "      !Normaler Geraeteueberlauf\n" +
-    "      if(tmp_devVal > 0) {\n" +
-    "         diffVal = (oEnergyCounter.Value() + devValMax) - oldDevVal;\n" +
-    "      }\n" +
-    "    } else {\n" +
-    "         !Zaehle Geraetewert zum CCU-Zaehler\n" +
-    "          diffVal = oEnergyCounter.Value();\n" +
-    "          if ((diffVal.ToString().ToFloat() * 100000).ToInteger() == 0) {\n" +
-    "	            oSysVarEnergyCounterDeviceReset.State(true);\n" +
-    "           } else {\n" +
-    "            oSysVarEnergyCounterDeviceReset.State(false);\n" +
-    "          }\n" +
-    "    }\n" +
-    "  }\n" +
-    "  !Erhoehe den CCU-Zaehler\n" +
-    "  oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
-    "  oSysVarEnergyCounterOldVal.State(oEnergyCounter.Value());\n" +
-    "  oSysVarEnergyCounterTmpOldVal.State(oEnergyCounter.Value());\n" +
-    "}\n";
-
-  var script =
-    "var sysVarId = '" + sysVarId + "';\n" +
-    "var channel = dom.GetObject('" + chn.id + "');\n" +
-    "var channelId = channel.ID();\n" +
-    "var paramId = channel.DPByControl('" + channelType + "." + counter + "').ID();\n" +
-    "var _script = \"" + updateScript + "\";\n" +
-
-    "var DP_VALUE_CHECK_UPDATE = 13;" +
-
-    "var programs = dom.GetObject(ID_PROGRAMS);" +
-    "var program  = dom.CreateObject(OT_PROGRAM);" +
-    "program.Name('prgEnergyCounter" + prgNameExtension + "_" + chn.id + "_" + chn.address + "');" +
-    "program.Internal(true);" +
-    "programs.Add(program.ID());" +
-
-
-    "var rule = program.Rule();" +
-    "rule.RuleOperatorType(OPERATOR_NONE);" +
-
-    "var condition = rule.RuleAddCondition();" +
-    "condition.CndOperatorType(OPERATOR_NONE);" +
-
-    "var singleCondition = condition.CndAddSingle();" +
-    "singleCondition.OperatorType(OPERATOR_NONE);" +
-    "singleCondition.ConditionType(9);" +
-    "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);" +
-    "singleCondition.LeftValType(ivtObjectId);" +
-    "singleCondition.LeftVal(paramId);" +
-    "singleCondition.RightVal1ValType(ivtFloat);" +
-    "singleCondition.RightVal1(0.0);" +
-    "singleCondition.RightVal2ValType(ivtFloat);" +
-    "singleCondition.RightVal2(0.0);" +
-
-    "singleCondition.ConditionChannel(channelId);" +
-
-    "var destination = rule.RuleDestination();" +
-    "var action = destination.DestAddSingle();" +
-    "action.DestinationParam(ivtString);" +
-    "action.DestinationValueType(ivtString);" +
-    "action.DestinationValue(_script);" +
-
-    "program.Active(true);" +
-    "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-
-//HmIP-PSM EnergyCounter
-CreateSysVarEnergyCounterScriptPSM = function(chn) {
-
-  var sysVarIds = getSysVarEnergyCounterIds(chn);
-  var sysVarId = sysVarIds.counterId,
-    sysVarOldValId = sysVarIds.tmpCounterId;
-
-  var updateScript =
-  "object chn = dom.GetObject('"+chn.id+"');\n" +
-  "object oOverflow = chn.DPByControl('POWERMETER_PSM.ENERGY_COUNTER_OVERFLOW');\n" +
-  "object oEnergyCounter = chn.DPByControl('POWERMETER_PSM.ENERGY_COUNTER');\n" +
-  "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
-  "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-
-  "boolean overFlowFlag = oOverflow.Value();\n" +
-  "real devVal = oEnergyCounter.Value();\n" +
-  "real devValMax = oEnergyCounter.ValueMax();\n" +
-  "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
-  "real diffVal = 0.0;\n" +
-  "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
-  "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-
-
-  "if (overFlowFlag == false) {\n" +
-    "! Normal conditions\n" +
-    "if (tmp_oldDevVal <= tmp_devVal) {\n" +
-       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-
-    "! Device has rebooted\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
-       "diffVal = devVal;\n" +
-    "}\n"+
-
-  "} else {\n" +
-    "!overFlow is true\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "}\n" +
+      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+      "}\n";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('POWERMETER.ENERGY_COUNTER').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+  // Current/Gas EnergyCounter
+  CreateSysVarEnergyCounterScriptIGL = function (chn, channelType, sensorType) {
+
+    var sysVarIds = (sensorType == "CURRENT") ? getSysVarEnergyCounterIds(chn) : getSysVarEnergyCounterGasIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+
+    var counter = (sensorType == "CURRENT") ? "ENERGY_COUNTER" : "GAS_ENERGY_COUNTER";
+    var prgNameExtension = (counter == "ENERGY_COUNTER") ? "" : "GAS";
+
+    var updateScript =
+      "object chn = dom.GetObject('" + chn.id + "');\n" +
+      "object oBoot = chn.DPByControl('" + channelType + ".BOOT');\n" +
+      "object oEnergyCounter = chn.DPByControl('" + channelType + "." + counter + "');\n" +
+      "object oSysVarEnergyCounter = dom.GetObject('" + sysVarId + "');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('" + sysVarOldValId + "');\n" +
+      "object oSysVarEnergyCounterResetPressed = dom.GetObject('" + sysVarId + "_RESET');\n" +
+      "object oSysVarEnergyCounterTmpOldVal = dom.GetObject('" + sysVarId + "_TMP_OLDVAL');\n" +
+      "object oSysVarEnergyCounterDeviceReset = dom.GetObject('" + sysVarId + "_DEVICE_RESET');\n" +
+
+      "boolean bootFlag = oBoot.Value();\n" +
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real tmpOldDevVal = oSysVarEnergyCounterTmpOldVal.Value();\n" +
+      "integer ioldDevVal = (tmpOldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 100000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
+
+      "if ( oBoot.Value() == true ) {\n" +
+      "   oSysVarEnergyCounterDeviceReset.State(true);\n" +
+      "   if (ioldDevVal <= 0) {\n" +
+      "     oSysVarEnergyCounter.State(0);\n" +
+      "   }\n" +
+      "} else {\n" +
+      "   boolean resetPressed = oSysVarEnergyCounterResetPressed.Value();\n" +
+      "   ! boolean devReset = oSysVarEnergyCounterDeviceReset.Value();\n" +
+      "   if ( (resetPressed == true) && (oSysVarEnergyCounterDeviceReset.Value() == true) ) {\n" +
+      "       oSysVarEnergyCounterTmpOldVal.State(0);\n" +
+      "       tmpOldDevVal = 0;\n" +
+      "   }\n" +
+      "  !Normales Hochzaehlen. Geraetwert > vorheriger Wert\n" +
+      "  if ((tmp_devVal >= tmp_oldDevVal) && (oSysVarEnergyCounterDeviceReset.Value() == false)) {\n" +
+      "   if (resetPressed == false) {\n" +
+      "      diffVal = oEnergyCounter.Value() - oldDevVal;\n" +
+      "    } else {\n" +
+      "      !Reset pressed\n" +
+      "      diffVal = oEnergyCounter.Value() - tmpOldDevVal;\n" +
+      "      if ((diffVal.ToString().ToFloat() * 100000).ToInteger() < 0 ) {\n" +
+      "		     diffVal = oEnergyCounter.Value();\n" +
+      "      }\n" +
+      "      oSysVarEnergyCounterResetPressed.State(0);\n" +
+      "    }\n" +
+      "  } else {\n" +
+      "    !Geraetewert ist kleiner vorheriger Wert\n" +
+      "   !Entweder Ueberlauf, oder Batterietausch\n" +
+      "    if (oSysVarEnergyCounterDeviceReset.Value() == false) {\n" +
+      "      !Normaler Geraeteueberlauf\n" +
+      "      if(tmp_devVal > 0) {\n" +
+      "         diffVal = (oEnergyCounter.Value() + devValMax) - oldDevVal;\n" +
+      "      }\n" +
+      "    } else {\n" +
+      "         !Zaehle Geraetewert zum CCU-Zaehler\n" +
+      "          diffVal = oEnergyCounter.Value();\n" +
+      "          if ((diffVal.ToString().ToFloat() * 100000).ToInteger() == 0) {\n" +
+      "	            oSysVarEnergyCounterDeviceReset.State(true);\n" +
+      "           } else {\n" +
+      "            oSysVarEnergyCounterDeviceReset.State(false);\n" +
+      "          }\n" +
+      "    }\n" +
+      "  }\n" +
+      "  !Erhoehe den CCU-Zaehler\n" +
+      "  oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+      "  oSysVarEnergyCounterOldVal.State(oEnergyCounter.Value());\n" +
+      "  oSysVarEnergyCounterTmpOldVal.State(oEnergyCounter.Value());\n" +
+      "}\n";
+
+    var script =
+      "var sysVarId = '" + sysVarId + "';\n" +
+      "var channel = dom.GetObject('" + chn.id + "');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('" + channelType + "." + counter + "').ID();\n" +
+      "var _script = \"" + updateScript + "\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;" +
+
+      "var programs = dom.GetObject(ID_PROGRAMS);" +
+      "var program  = dom.CreateObject(OT_PROGRAM);" +
+      "program.Name('prgEnergyCounter" + prgNameExtension + "_" + chn.id + "_" + chn.address + "');" +
+      "program.Internal(true);" +
+      "programs.Add(program.ID());" +
+
+
+      "var rule = program.Rule();" +
+      "rule.RuleOperatorType(OPERATOR_NONE);" +
+
+      "var condition = rule.RuleAddCondition();" +
+      "condition.CndOperatorType(OPERATOR_NONE);" +
+
+      "var singleCondition = condition.CndAddSingle();" +
+      "singleCondition.OperatorType(OPERATOR_NONE);" +
+      "singleCondition.ConditionType(9);" +
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);" +
+      "singleCondition.LeftValType(ivtObjectId);" +
+      "singleCondition.LeftVal(paramId);" +
+      "singleCondition.RightVal1ValType(ivtFloat);" +
+      "singleCondition.RightVal1(0.0);" +
+      "singleCondition.RightVal2ValType(ivtFloat);" +
+      "singleCondition.RightVal2(0.0);" +
+
+      "singleCondition.ConditionChannel(channelId);" +
+
+      "var destination = rule.RuleDestination();" +
+      "var action = destination.DestAddSingle();" +
+      "action.DestinationParam(ivtString);" +
+      "action.DestinationValueType(ivtString);" +
+      "action.DestinationValue(_script);" +
+
+      "program.Active(true);" +
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+
+  //HmIP-PSM EnergyCounter
+  CreateSysVarEnergyCounterScriptPSM = function(chn) {
+
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oOverflow = chn.DPByControl('POWERMETER_PSM.ENERGY_COUNTER_OVERFLOW');\n" +
+      "object oEnergyCounter = chn.DPByControl('POWERMETER_PSM.ENERGY_COUNTER');\n" +
+      "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+      "boolean overFlowFlag = oOverflow.Value();\n" +
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+      "real energy0 = chn.MetaData('energy0').ToFloat();\n" +
+
+      "if (overFlowFlag == false) {\n" +
+      "! Normal conditions\n" +
+      "if (tmp_oldDevVal <= tmp_devVal) {\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+      "}\n" +
+
+      "! Device has rebooted\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "diffVal = devVal;\n" +
+      "}\n"+
+
+      "} else {\n" +
+      "!overFlow is true\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
       "! An device overflow has occured\n" +
       "diffVal = (devVal + devValMax) - oldDevVal;\n" +
-    "} else {\n" +
+      "} else {\n" +
       "! Once the overflow flag has been set it will only be false when the device reboots\n"+
       "! Therefore this is the normal condition after an device overflow\n" +
       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-  "}\n" +
-
-  "if (tmp_devVal != 0) {" +
-    "oSysVarEnergyCounterOldVal.State(devVal);\n" +
-    "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
-  "}";
-
-  var script =
-  "var sysVarId = '"+sysVarId+"';\n" +
-  "var channel = dom.GetObject('"+chn.id+"');\n" +
-  "var channelId = channel.ID();\n" +
-  "var paramId = channel.DPByControl('POWERMETER_PSM.ENERGY_COUNTER').ID();\n"+
-  "var _script = \""+updateScript+"\";\n" +
-
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
-
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
-
-
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
-
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(9);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtObjectId);"+
-  "singleCondition.LeftVal(paramId);"+
-  "singleCondition.RightVal1ValType(ivtFloat);"+
-  "singleCondition.RightVal1(0.0);"+
-  "singleCondition.RightVal2ValType(ivtFloat);"+
-  "singleCondition.RightVal2(0.0);"+
-
-  "singleCondition.ConditionChannel(channelId);"+
-
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
-
-  "program.Active(true);"+
-  "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-//POWERMETER_IEC1
-CreateSysVarEnergyCounterScriptIEC = function(chn) {
-
-  var sysVarIds = getSysVarEnergyCounterIECIds(chn);
-  var sysVarId = sysVarIds.counterId,
-    sysVarOldValId = sysVarIds.tmpCounterId;
-
-  var updateScript =
-  "object chn = dom.GetObject('"+chn.id+"');\n" +
-  "object oEnergyCounter = chn.DPByControl('POWERMETER_IEC1.IEC_ENERGY_COUNTER');\n" +
-  "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
-  "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-
-  "real devVal = oEnergyCounter.Value();\n" +
-  "real devValMax = oEnergyCounter.ValueMax();\n" +
-  "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
-  "real diffVal = 0.0;\n" +
-  "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
-  "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-
-
-    "!overFlow is true\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "}\n" +
+      "}\n" +
+
+      "if (tmp_devVal != 0) {" +
+      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+
+      "! Save todays energy consumption\n" +
+      "chn.MetaData('energy0',energy0 + diffVal);\n" +
+
+      "}";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('POWERMETER_PSM.ENERGY_COUNTER').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+  //POWERMETER_IEC1
+  CreateSysVarEnergyCounterScriptIEC = function(chn) {
+
+    var sysVarIds = getSysVarEnergyCounterIECIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oEnergyCounter = chn.DPByControl('POWERMETER_IEC1.IEC_ENERGY_COUNTER');\n" +
+      "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+
+      "!overFlow is true\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
       "! An device overflow has occured\n" +
       "diffVal = (devVal + devValMax) - oldDevVal;\n" +
-    "} else {\n" +
+      "} else {\n" +
       "! This is the normal condition\n" +
       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-
-  "if (tmp_devVal != 0) {" +
-    "oSysVarEnergyCounterOldVal.State(devVal);\n" +
-    "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
-  "}";
-
-  var script =
-  "var sysVarId = '"+sysVarId+"';\n" +
-  "var channel = dom.GetObject('"+chn.id+"');\n" +
-  "var channelId = channel.ID();\n" +
-  "var paramId = channel.DPByControl('POWERMETER_IEC1.IEC_ENERGY_COUNTER').ID();\n"+
-  "var _script = \""+updateScript+"\";\n" +
-
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
-
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgEnergyCounterIEC_"+ chn.id +"_"+chn.address+"');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
-
-
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
-
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(9);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtObjectId);"+
-  "singleCondition.LeftVal(paramId);"+
-  "singleCondition.RightVal1ValType(ivtFloat);"+
-  "singleCondition.RightVal1(0.0);"+
-  "singleCondition.RightVal2ValType(ivtFloat);"+
-  "singleCondition.RightVal2(0.0);"+
-
-  "singleCondition.ConditionChannel(channelId);"+
-
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
-
-  "program.Active(true);"+
-  "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-/*
-"sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
-"tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
-"sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
-"sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
-*/
-
-//HmIP-SWO-B -> (basic)
-CreateHmIPSunshineCounterScript = function(chn) {
-  conInfo("CreateHmIPSunshineCounterScript");
-  var sysVarIds = getSysVarRainSunshineCounterIds(chn, false);
-  var sysVarId = sysVarIds.sunshineCounterId,
-    sysVarOldValId = sysVarIds.tmpSunshineCounterId,
-
-    sysVarCounterTodayId = sysVarIds.sunshineCounterTodayId,
-    sysVarCounterYesterdayId = sysVarIds.sunshineCounterYesterdayId;
-
-  var updateScript =
-  "object chn = dom.GetObject('"+chn.id+"');\n" +
-  "object oOverflow = chn.DPByControl('WEATHER_TRANSMIT.SUNSHINEDURATION_OVERFLOW');\n" +
-  "object oSunshineCounter = chn.DPByControl('WEATHER_TRANSMIT.SUNSHINEDURATION');\n" +
-  "object oSysVarSunshine = dom.GetObject('"+sysVarId+"');\n" +
-  "object oSysVarSunshineOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-  "object oSysVarCounterToday =  dom.GetObject('"+sysVarCounterTodayId+"');\n" +
-  "object oSysVarCounterYesterday =  dom.GetObject('"+sysVarCounterYesterdayId+"');\n" +
-
-
-  "boolean overFlowFlag = oOverflow.Value();\n" +
-  "real devVal = oSunshineCounter.Value();\n" +
-  "real devValMax = oSunshineCounter.ValueMax();\n" +
-  "real oldDevVal = oSysVarSunshineOldVal.Value();\n" +
-  "real diffVal = 0.0;\n" +
-  "real sysVarVal = oSysVarSunshine.Value();\n" +
-
-  "real sysVarTodayVal = oSysVarCounterToday.Value();\n" +
-
-  "real todayTotal = 0.0;\n" +
-
-  "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-
-
-  "if (overFlowFlag == false) {\n" +
-    "! Normal conditions\n" +
-    "if (tmp_oldDevVal <= tmp_devVal) {\n" +
-       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-
-    "! Device has rebooted\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
-       "diffVal = devVal;\n" +
-    "}\n"+
-
-  "} else {\n" +
-    "!overFlow is true\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "}\n" +
+
+      "if (tmp_devVal != 0) {" +
+      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+      "}";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('POWERMETER_IEC1.IEC_ENERGY_COUNTER').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgEnergyCounterIEC_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+  //HmIP-ESI Counter ENERGY
+  CreateSysVarEnergyCounterScriptESI = function(chn) {
+
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oEnergyCounter = chn.DPByControl('POWERMETER_PSM.ENERGY_COUNTER');\n" +
+
+      "object oDevice = dom.GetObject(chn.Device());\n" +
+      "object oChnOne = dom.GetObject(oDevice.Channels().GetAt(1));\n" +
+      "object oChannelOperationMode = oChnOne.DPByControl('POWERMETER_PSM.CHANNEL_OPERATION_MODE');\n" +
+
+      "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+      "integer sensorType = oChannelOperationMode.Value();\n" +
+
+      "integer iecPrgFirstStart = chn.MetaData('iecPrgFirstStart');\n" +
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "real energy0 = chn.MetaData('energy0').ToFloat();\n" +
+
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "! An device overflow has occured\n" +
+      "! diffVal = (devVal + devValMax) - oldDevVal;\n" +
+      "} else {\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+      "}\n" +
+
+      "if (tmp_devVal != 0) {\n" +
+      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+
+      "! sensorType 0 = UNKNOWN, 1 = GAS, 2 = LED, 3 = IEC w/o protocol, > 3 = IEC....\n" +
+      "if ((sensorType > 3) && (iecPrgFirstStart == 1) ){\n" +
+      "chn.MetaData('iecPrgFirstStart', 0);\n" +
+      "chn.MetaData('energy0',0);\n" +
+
+      "string chnAddress = chn.Address();\n" +
+      "integer chnNumber = chnAddress.StrValueByIndex(':',1).ToInteger();\n" +
+      "if (chnNumber == 2) {chn.AddMetaData('startValA',tmp_devVal);}\n" +
+      "if (chnNumber == 3) {chn.AddMetaData('startValB',tmp_devVal);}\n" +
+      "if (chnNumber == 4) {chn.AddMetaData('startValC',tmp_devVal);}\n" +
+
+      "} else {\n" +
+      "! Save todays energy consumption\n" +
+      "if (sensorType != 3)  {\n" +
+      "chn.MetaData('energy0',energy0 + diffVal);\n" +
+      "}\n" +
+
+      "}\n" +
+      "}";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('POWERMETER_PSM.ENERGY_COUNTER').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+  //HmIP-ESI Counter GAS
+  CreateSysVarGasCounterScriptESI = function(chn) {
+
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oEnergyCounter = chn.DPByControl('POWERMETER_PSM.GAS_VOLUME');\n" +
+      "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+      "real energy0 = chn.MetaData('energy0').ToFloat();\n" +
+
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "! An device overflow has occured\n" +
+      "! diffVal = (devVal + devValMax) - oldDevVal;\n" +
+      "} else {\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+      "}\n" +
+
+      "if (tmp_devVal != 0) {" +
+      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+
+      "! Save todays energy consumption\n" +
+      "chn.MetaData('energy0',energy0 + diffVal);\n" +
+      "}";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('POWERMETER_PSM.GAS_VOLUME').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgGasCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+
+  /*
+  "sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
+  "tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
+  "sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
+  "sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
+  */
+
+  //HmIP-SWO-B -> (basic)
+  CreateHmIPSunshineCounterScript = function(chn) {
+    conInfo("CreateHmIPSunshineCounterScript");
+    var sysVarIds = getSysVarRainSunshineCounterIds(chn, false);
+    var sysVarId = sysVarIds.sunshineCounterId,
+      sysVarOldValId = sysVarIds.tmpSunshineCounterId,
+
+      sysVarCounterTodayId = sysVarIds.sunshineCounterTodayId,
+      sysVarCounterYesterdayId = sysVarIds.sunshineCounterYesterdayId;
+
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oOverflow = chn.DPByControl('WEATHER_TRANSMIT.SUNSHINEDURATION_OVERFLOW');\n" +
+      "object oSunshineCounter = chn.DPByControl('WEATHER_TRANSMIT.SUNSHINEDURATION');\n" +
+      "object oSysVarSunshine = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarSunshineOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+      "object oSysVarCounterToday =  dom.GetObject('"+sysVarCounterTodayId+"');\n" +
+      "object oSysVarCounterYesterday =  dom.GetObject('"+sysVarCounterYesterdayId+"');\n" +
+
+
+      "boolean overFlowFlag = oOverflow.Value();\n" +
+      "real devVal = oSunshineCounter.Value();\n" +
+      "real devValMax = oSunshineCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarSunshineOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarSunshine.Value();\n" +
+
+      "real sysVarTodayVal = oSysVarCounterToday.Value();\n" +
+
+      "real todayTotal = 0.0;\n" +
+
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+
+      "if (overFlowFlag == false) {\n" +
+      "! Normal conditions\n" +
+      "if (tmp_oldDevVal <= tmp_devVal) {\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+      "}\n" +
+
+      "! Device has rebooted\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "diffVal = devVal;\n" +
+      "}\n"+
+
+      "} else {\n" +
+      "!overFlow is true\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
       "! An device overflow has occured\n" +
       "diffVal = (devVal + devValMax) - oldDevVal;\n" +
-    "} else {\n" +
+      "} else {\n" +
       "! Once the overflow flag has been set it will only be false when the device reboots\n"+
       "! Therefore this is the normal condition after an device overflow\n" +
       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-  "}\n" +
-
-  "if (tmp_devVal != 0) {\n" +
-    "oSysVarSunshineOldVal.State(devVal);\n" +
-    "oSysVarSunshine.State(sysVarVal + diffVal);\n"+
-  "}\n" +
-
-  "todayTotal = sysVarTodayVal + diffVal;\n" +
-  "if (todayTotal >= 1440.0) {todayTotal = 0.0;}\n" +
-  "oSysVarCounterToday.State(todayTotal);\n";
-
-  var script =
-  "var sysVarId = '"+sysVarId+"';\n" +
-  "var channel = dom.GetObject('"+chn.id+"');\n" +
-  "var channelId = channel.ID();\n" +
-  "var paramId = channel.DPByControl('WEATHER_TRANSMIT.ILLUMINATION').ID();\n"+
-  "var _script = \""+updateScript+"\";\n" +
-
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
-
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgSunshineCounter_"+ chn.id +"_"+chn.address+"');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
-
-
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
-
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(9);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtObjectId);"+
-  "singleCondition.LeftVal(paramId);"+
-  "singleCondition.RightVal1ValType(ivtFloat);"+
-  "singleCondition.RightVal1(0.0);"+
-  "singleCondition.RightVal2ValType(ivtFloat);"+
-  "singleCondition.RightVal2(0.0);"+
-
-  "singleCondition.ConditionChannel(channelId);"+
-
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
-
-  "program.Active(true);"+
-  "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-
-//HmIP-SWO-PL/PR -> (plus/pro)
-CreateHmIPRainCounterScript = function(chn) {
-  conInfo("CreateHmIPRainCounterScript");
-  var sysVarIds = getSysVarRainSunshineCounterIds(chn, true);
-  var sysVarId = sysVarIds.rainCounterId,
-    sysVarOldValId = sysVarIds.tmpRainCounterId,
-
-    sysVarCounterTodayId = sysVarIds.rainCounterTodayId,
-    sysVarCounterYesterdayId = sysVarIds.rainCounterYesterdayId;
-
-  var updateScript =
-  "object chn = dom.GetObject('"+chn.id+"');\n" +
-  "object oOverflow = chn.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER_OVERFLOW');\n" +
-  "object oRainCounter = chn.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER');\n" +
-  "object oSysVarRain = dom.GetObject('"+sysVarId+"');\n" +
-  "object oSysVarRainOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-  "object oSysVarCounterToday =  dom.GetObject('"+sysVarCounterTodayId+"');\n" +
-  "object oSysVarCounterYesterday =  dom.GetObject('"+sysVarCounterYesterdayId+"');\n" +
-
-
-  "boolean overFlowFlag = oOverflow.Value();\n" +
-  "real devVal = oRainCounter.Value();\n" +
-  "real devValMax = oRainCounter.ValueMax();\n" +
-  "real oldDevVal = oSysVarRainOldVal.Value();\n" +
-  "real diffVal = 0.0;\n" +
-  "real sysVarVal = oSysVarRain.Value();\n" +
-
-  "real sysVarTodayVal = oSysVarCounterToday.Value();\n" +
-  "real todayTotal = 0.0;\n" +
-
-  "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-
-
-  "if (overFlowFlag == false) {\n" +
-    "! Normal conditions\n" +
-    "if (tmp_oldDevVal <= tmp_devVal) {\n" +
-       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-
-    "! Device has rebooted\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
-       "diffVal = devVal;\n" +
-    "}\n"+
-
-  "} else {\n" +
-    "!overFlow is true\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "}\n" +
+      "}\n" +
+
+      "if (tmp_devVal != 0) {\n" +
+      "oSysVarSunshineOldVal.State(devVal);\n" +
+      "oSysVarSunshine.State(sysVarVal + diffVal);\n"+
+      "}\n" +
+
+      "todayTotal = sysVarTodayVal + diffVal;\n" +
+      "if (todayTotal >= 1440.0) {todayTotal = 0.0;}\n" +
+      "oSysVarCounterToday.State(todayTotal);\n";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('WEATHER_TRANSMIT.ILLUMINATION').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgSunshineCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+
+  //HmIP-SWO-PL/PR -> (plus/pro)
+  CreateHmIPRainCounterScript = function(chn) {
+    conInfo("CreateHmIPRainCounterScript");
+    var sysVarIds = getSysVarRainSunshineCounterIds(chn, true);
+    var sysVarId = sysVarIds.rainCounterId,
+      sysVarOldValId = sysVarIds.tmpRainCounterId,
+
+      sysVarCounterTodayId = sysVarIds.rainCounterTodayId,
+      sysVarCounterYesterdayId = sysVarIds.rainCounterYesterdayId;
+
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oOverflow = chn.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER_OVERFLOW');\n" +
+      "object oRainCounter = chn.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER');\n" +
+      "object oSysVarRain = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarRainOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+      "object oSysVarCounterToday =  dom.GetObject('"+sysVarCounterTodayId+"');\n" +
+      "object oSysVarCounterYesterday =  dom.GetObject('"+sysVarCounterYesterdayId+"');\n" +
+
+
+      "boolean overFlowFlag = oOverflow.Value();\n" +
+      "real devVal = oRainCounter.Value();\n" +
+      "real devValMax = oRainCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarRainOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarRain.Value();\n" +
+
+      "real sysVarTodayVal = oSysVarCounterToday.Value();\n" +
+      "real todayTotal = 0.0;\n" +
+
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+
+      "if (overFlowFlag == false) {\n" +
+      "! Normal conditions\n" +
+      "if (tmp_oldDevVal <= tmp_devVal) {\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+      "}\n" +
+
+      "! Device has rebooted\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "diffVal = devVal;\n" +
+      "}\n"+
+
+      "} else {\n" +
+      "!overFlow is true\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
       "! An device overflow has occured\n" +
       "diffVal = (devVal + devValMax) - oldDevVal;\n" +
-    "} else {\n" +
+      "} else {\n" +
       "! Once the overflow flag has been set it will only be false when the device reboots\n"+
       "! Therefore this is the normal condition after an device overflow\n" +
       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-  "}\n" +
+      "}\n" +
+      "}\n" +
 
-  "if (tmp_devVal != 0) {\n" +
-    "oSysVarRainOldVal.State(devVal);\n" +
-    "oSysVarRain.State(sysVarVal + diffVal);\n"+
-  "}\n" +
+      "if (tmp_devVal != 0) {\n" +
+      "oSysVarRainOldVal.State(devVal);\n" +
+      "oSysVarRain.State(sysVarVal + diffVal);\n"+
+      "}\n" +
 
-  "todayTotal = sysVarTodayVal + diffVal;\n" +
-  "if (todayTotal >= 1440.0) {todayTotal = 0.0;}\n" +
-  "oSysVarCounterToday.State(todayTotal);\n";
+      "todayTotal = sysVarTodayVal + diffVal;\n" +
+      "if (todayTotal >= 1440.0) {todayTotal = 0.0;}\n" +
+      "oSysVarCounterToday.State(todayTotal);\n";
 
-  var script =
-  "var sysVarId = '"+sysVarId+"';\n" +
-  "var channel = dom.GetObject('"+chn.id+"');\n" +
-  "var channelId = channel.ID();\n" +
-  "var paramId = channel.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER').ID();\n"+
-  "var _script = \""+updateScript+"\";\n" +
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
 
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
 
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgRainCounter_"+ chn.id +"_"+chn.address+"');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgRainCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
 
 
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
 
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
 
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(9);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtObjectId);"+
-  "singleCondition.LeftVal(paramId);"+
-  "singleCondition.RightVal1ValType(ivtFloat);"+
-  "singleCondition.RightVal1(0.0);"+
-  "singleCondition.RightVal2ValType(ivtFloat);"+
-  "singleCondition.RightVal2(0.0);"+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
 
-  "singleCondition.ConditionChannel(channelId);"+
+      "singleCondition.ConditionChannel(channelId);"+
 
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
 
-  "program.Active(true);"+
-  "dom.RTUpdate(0);";
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
 
-  homematic("ReGa.runScript", {"script": script});
-};
+    homematic("ReGa.runScript", {"script": script});
+  };
 
-CreateHmIPSunRainTodayYesterdayScript = function(chn) {
+  CreateHmIPSunRainTodayYesterdayScript = function(chn) {
 
-  var sysVarIds = getSysVarRainSunshineCounterIds(chn, true);
+    var sysVarIds = getSysVarRainSunshineCounterIds(chn, true);
 
-  var destinationScript =
+    var destinationScript =
 
-    "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
 
-    "object oSysVarSunshineCounterToday = dom.GetObject('"+sysVarIds.sunshineCounterTodayId+"');\n" +
-    "object oSysVarSunshineCounterYesterday = dom.GetObject('"+sysVarIds.sunshineCounterYesterdayId+"');\n" +
+      "object oSysVarSunshineCounterToday = dom.GetObject('"+sysVarIds.sunshineCounterTodayId+"');\n" +
+      "object oSysVarSunshineCounterYesterday = dom.GetObject('"+sysVarIds.sunshineCounterYesterdayId+"');\n" +
 
-    "object oSysVarRainCounterToday = dom.GetObject('"+sysVarIds.rainCounterTodayId+"');\n" +
-    "object oSysVarRainCounterYesterday = dom.GetObject('"+sysVarIds.rainCounterYesterdayId+"');\n" +
+      "object oSysVarRainCounterToday = dom.GetObject('"+sysVarIds.rainCounterTodayId+"');\n" +
+      "object oSysVarRainCounterYesterday = dom.GetObject('"+sysVarIds.rainCounterYesterdayId+"');\n" +
 
-    // 07:00 Uhr
-    // Setze Z�hler Sonne f�r Yesterday auf den Wert des Z�hlers f�r Today
-    "if (oSysVarSunshineCounterYesterday && oSysVarSunshineCounterToday) {oSysVarSunshineCounterYesterday.State(oSysVarSunshineCounterToday.Value());}" +
+      // 07:00 Uhr
+      // Setze Z�hler Sonne f�r Yesterday auf den Wert des Z�hlers f�r Today
+      "if (oSysVarSunshineCounterYesterday && oSysVarSunshineCounterToday) {oSysVarSunshineCounterYesterday.State(oSysVarSunshineCounterToday.Value());}" +
 
-    // Setze Tagesz�hler Sonne auf 0
+      // Setze Tagesz�hler Sonne auf 0
       "if (oSysVarSunshineCounterToday) {oSysVarSunshineCounterToday.State(0);}"+
 
-    // Setze Z�hler Regen f�r Yesterday auf den Wert des Z�hlers f�r Today
-    "if (oSysVarRainCounterYesterday && oSysVarRainCounterToday) {oSysVarRainCounterYesterday.State(oSysVarRainCounterToday.Value());}" +
-
-    // Setze Tagesz�hler Regen auf 0
-    "if (oSysVarRainCounterToday) {oSysVarRainCounterToday.State(0);}";
-
-  var script =
-
-  "var _script = \""+destinationScript+"\";\n" +
-
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
-  "var TIMER_DAILY           = 9;"+
-  "var NOT_SET               = 0;"+
-
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgDailySunshineRainCounter_"+ chn.id + "');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
-
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
-
-  "var timeModule = dom.CreateObject(OT_CALENDARDP);"+
-  "dom.GetObject(ID_CALENDARDPS).Add(timeModule);"+
-  "timeModule.TimerType(TIMER_DAILY);"+
-  "timeModule.Time('2000-01-01 07:00:00');"+
-  "timeModule.CalDuration(NOT_SET);"+
-  "timeModule.CalRepeatTime(NOT_SET);"+
-  "timeModule.Weekdays(NOT_SET);"+
-  "timeModule.Period(NOT_SET);"+
-  "timeModule.CalRepetitionValue(NOT_SET);"+
-  "timeModule.Begin('2000-01-01 00:00:00');"+
-  "timeModule.End(NOT_SET);"+
-  "timeModule.CalRepetitionCount(NOT_SET);"+
-  "timeModule.SunOffsetType(NOT_SET);"+
-
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(3);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtCurrentDate);"+
-  "singleCondition.RightVal1ValType(ivtObjectId);"+
-  "singleCondition.RightVal1(timeModule.ID());"+
-
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
-
-  "program.Active(true);"+
-
-  "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-getSysVarEnergyCounterIds = function (chn) {
-  return {"counterId": "svEnergyCounter_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterOldVal_" + chn.id};
-};
-
-getSysVarRainSunshineCounterIds = function (chn, hasRainSensor) {
-  var result;
-
-  if (hasRainSensor) {
-    result = {
-      "rainCounterId": "svHmIPRainCounter_" + chn.id + "_" + chn.address,
-      "tmpRainCounterId": "svHmIPRainCounterOldVal_" + chn.id,
-      "rainCounterYesterdayId": "svHmIPRainCounterYesterday_" + chn.id,
-      "rainCounterTodayId": "svHmIPRainCounterToday_" + chn.id,
-
-      "sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
-      "tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
-      "sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
-      "sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
-    };
-  } else {
-    result = {
-      "sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
-      "tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
-      "sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
-      "sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
-    };
-  }
+      // Setze Z�hler Regen f�r Yesterday auf den Wert des Z�hlers f�r Today
+      "if (oSysVarRainCounterYesterday && oSysVarRainCounterToday) {oSysVarRainCounterYesterday.State(oSysVarRainCounterToday.Value());}" +
+
+      // Setze Tagesz�hler Regen auf 0
+      "if (oSysVarRainCounterToday) {oSysVarRainCounterToday.State(0);}";
+
+    var script =
+
+      "var _script = \""+destinationScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+      "var TIMER_DAILY           = 9;"+
+      "var NOT_SET               = 0;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgDailySunshineRainCounter_"+ chn.id + "');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var timeModule = dom.CreateObject(OT_CALENDARDP);"+
+      "dom.GetObject(ID_CALENDARDPS).Add(timeModule);"+
+      "timeModule.TimerType(TIMER_DAILY);"+
+      "timeModule.Time('2000-01-01 07:00:00');"+
+      "timeModule.CalDuration(NOT_SET);"+
+      "timeModule.CalRepeatTime(NOT_SET);"+
+      "timeModule.Weekdays(NOT_SET);"+
+      "timeModule.Period(NOT_SET);"+
+      "timeModule.CalRepetitionValue(NOT_SET);"+
+      "timeModule.Begin('2000-01-01 00:00:00');"+
+      "timeModule.End(NOT_SET);"+
+      "timeModule.CalRepetitionCount(NOT_SET);"+
+      "timeModule.SunOffsetType(NOT_SET);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(3);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtCurrentDate);"+
+      "singleCondition.RightVal1ValType(ivtObjectId);"+
+      "singleCondition.RightVal1(timeModule.ID());"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
 
-  return result;
+  getSysVarEnergyCounterIds = function (chn) {
+    return {"counterId": "svEnergyCounter_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterOldVal_" + chn.id};
+  };
 
-};
+  getSysVarRainSunshineCounterIds = function (chn, hasRainSensor) {
+    var result;
+
+    if (hasRainSensor) {
+      result = {
+        "rainCounterId": "svHmIPRainCounter_" + chn.id + "_" + chn.address,
+        "tmpRainCounterId": "svHmIPRainCounterOldVal_" + chn.id,
+        "rainCounterYesterdayId": "svHmIPRainCounterYesterday_" + chn.id,
+        "rainCounterTodayId": "svHmIPRainCounterToday_" + chn.id,
+
+        "sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
+        "tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
+        "sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
+        "sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
+      };
+    } else {
+      result = {
+        "sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
+        "tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
+        "sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
+        "sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
+      };
+    }
 
-getSysVarEnergyCounterGasIds = function (chn) {
-  return {"counterId": "svEnergyCounterGas_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterGasOldVal_" + chn.id};
-};
+    return result;
 
-getSysVarEnergyCounterIECIds = function (chn) {
-  return {"counterId": "svEnergyCounterIEC_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterIECOldVal_" + chn.id};
-};
+  };
 
-CheckAndCreateSysVarEnergyCounter = function(chn) {
-  var sysVarIds = getSysVarEnergyCounterIds(chn);
-  var SysVarEnergyCounterId = sysVarIds.counterId,
-   SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
+  getSysVarEnergyCounterGasIds = function (chn) {
+    return {"counterId": "svEnergyCounterGas_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterGasOldVal_" + chn.id};
+  };
 
-  var oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
+  getSysVarEnergyCounterIECIds = function (chn) {
+    return {"counterId": "svEnergyCounterIEC_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterIECOldVal_" + chn.id};
+  };
 
-  // SysVar svEnergyCounter_xxxx doesn�t exist
-  if (!oSysVarEnergyCounter) {
-    conInfo("create system variable: " + SysVarEnergyCounterId);
-    CreateSysVar(SysVarEnergyCounterId, "float");
-    CreateSysVar(SysVarEnergyCounterOldValId, "float");
-    if (chn.channelType == "ENERGIE_METER_TRANSMITTER") {
-      conInfo("CreateSysVarEnergyCounterScriptPSM");
-      CreateSysVarEnergyCounterScriptPSM(chn);
-    } else {
-      conInfo("CreateSysVarEnergyCounterScript");
-      CreateSysVarEnergyCounterScript(chn);
-    }
-    readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
-  }
-};
-
-//***
-CheckAndCreateSysVarEnergyCounterIEC = function(chn) {
-  conInfo("CheckAndCreateSysVarEnergyCounterIEC");
-  var sysVarIds = getSysVarEnergyCounterIECIds(chn);
-  var SysVarEnergyCounterId = sysVarIds.counterId,
-   SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
-
-   var oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
-
-  // SysVar svEnergyCounter_xxxx doesn�t exist
-  if (!oSysVarEnergyCounter) {
-    conInfo("create system variable: " + SysVarEnergyCounterId);
-    CreateSysVar(SysVarEnergyCounterId, "float");
-    CreateSysVar(SysVarEnergyCounterOldValId, "float");
-    conInfo("CreateSysVarEnergyCounterScriptIEC");
-    CreateSysVarEnergyCounterScriptIEC(chn);
-    readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
-  }
-};
-
-//***
-CheckAndCreateSysVarEnergyCounterIGL = function (chn, channelType) {
-  conInfo("CheckAndCreateSysVarEnergyCounterIGL");
-  var sysVarIds = getSysVarEnergyCounterIds(chn);
-  var SysVarEnergyCounterId = sysVarIds.counterId,
-    SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
-
-  var oSysVarEnergyCounter = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
-
-  // SysVar svEnergyCounter_xxxx doesn�t exist
-  if (!oSysVarEnergyCounter) {
-    conInfo("create system variable: " + SysVarEnergyCounterId);
-    CreateSysVar(SysVarEnergyCounterId, "float");
-    CreateSysVar(SysVarEnergyCounterOldValId, "float");
-    CreateSysVar(SysVarEnergyCounterId + "_RESET", "boolean");
-    CreateSysVar(SysVarEnergyCounterId + "_TMP_OLDVAL", "float");
-    CreateSysVar(SysVarEnergyCounterId + "_DEVICE_RESET", "boolean");
-    CreateSysVarEnergyCounterScriptIGL(chn, channelType, "CURRENT");
-    readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
-  }
-};
-
-CheckAndCreateSysVarEnergyCounterGasIGL = function (chn, channelType) {
-  conInfo("CheckAndCreateSysVarEnergyCounterGasIGL");
-  var sysVarIds = getSysVarEnergyCounterGasIds(chn);
-  var SysVarEnergyCounterId = sysVarIds.counterId,
-    SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
-
-  var oSysVarEnergyCounterGas = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
-
-  // SysVar svEnergyCounterGas_xxxx doesn�t exist
-  if (!oSysVarEnergyCounterGas) {
-    conInfo("create system variable: " + SysVarEnergyCounterId);
-    CreateSysVar(SysVarEnergyCounterId, "float");
-    CreateSysVar(SysVarEnergyCounterOldValId, "float");
-    CreateSysVar(SysVarEnergyCounterId + "_RESET", "boolean");
-    CreateSysVar(SysVarEnergyCounterId + "_TMP_OLDVAL", "float");
-    CreateSysVar(SysVarEnergyCounterId + "_DEVICE_RESET", "boolean");
-    CreateSysVarEnergyCounterScriptIGL(chn, channelType, "GAS");
-    readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
-  }
-};
+  CheckAndCreateSysVarEnergyCounter = function(chn) {
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var SysVarEnergyCounterId = sysVarIds.counterId,
+      SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
 
+    var oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
 
-CheckAndCreateSysVarHmIPRainSunshineCounter = function(chn, hasRainSensor) {
-  var sysVarIds = getSysVarRainSunshineCounterIds(chn, hasRainSensor);
+    // SysVar svEnergyCounter_xxxx doesn�t exist
+    if (!oSysVarEnergyCounter) {
+      conInfo("create system variable: " + SysVarEnergyCounterId);
+      CreateSysVar(SysVarEnergyCounterId, "float");
+      CreateSysVar(SysVarEnergyCounterOldValId, "float");
+      if (chn.channelType == "ENERGIE_METER_TRANSMITTER") {
 
-  var SysVarSunshineCounterId = sysVarIds.sunshineCounterId,
-    SysVarSunshineCounterOldValId = sysVarIds.tmpSunshineCounterId,
-    SysVarSunshineCounterYesterdayId = sysVarIds.sunshineCounterYesterdayId,
-    SysVarSunshineCounterTodayId = sysVarIds.sunshineCounterTodayId;
+        var chnLabel = "";
 
-  var sysVarSunshineCounter = homematic("SysVar.get", {"id": SysVarSunshineCounterId});
+        var regaScript = "object chn = dom.GetObject('"+chn.id+"');" +
+          "WriteLine(chn.Label());";
 
-  // sysVarSunshineCounter doesn't exist
-  if (!sysVarSunshineCounter) {
-    conInfo("create system variable: " + SysVarSunshineCounterId);
-    CreateSysVar(SysVarSunshineCounterId, "float");
-    conInfo("create system variable: " + SysVarSunshineCounterOldValId);
-    CreateSysVar(SysVarSunshineCounterOldValId, "float");
-    conInfo("create system variable: " + SysVarSunshineCounterYesterdayId);
-    CreateSysVar(SysVarSunshineCounterYesterdayId, "float", 0, chn.id);
-    conInfo("create system variable: " + SysVarSunshineCounterTodayId);
-    CreateSysVar(SysVarSunshineCounterTodayId, "float", 0, chn.id);
+        homematic("ReGa.runScript", {"script": regaScript}, function (response, error) {
+          chnLabel = response;
 
-    CreateHmIPSunshineCounterScript(chn);
+          if (chnLabel.indexOf('HmIP-ESI') !== -1) {
+            conInfo("CreateSysVarEnergyCounterScriptESI");
+            CreateSysVarEnergyCounterScriptESI(chn);
+            CreateSysVarGasCounterScriptESI(chn);
+            //Set the values of the last 31 days at midnight (00:00).
+            if (chn.index != 1) {
+              CreateMetaEnergyCounter(chn);
+              storeEnergyValuesAtMidnight(chn);
+            }
+          } else {
+            conInfo("CreateSysVarEnergyCounterScriptPSM");
+            CreateMetaEnergyCounter(chn);
+            CreateSysVarEnergyCounterScriptPSM(chn);
+            //Set the values of the last 31 days at midnight (00:00).
+            storeEnergyValuesAtMidnight(chn);
+          }
+        });
+      } else {
+        conInfo("CreateSysVarEnergyCounterScript");
+        CreateSysVarEnergyCounterScript(chn);
+      }
+      readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
+    }
+  };
 
-  }
+  //***
+  CheckAndCreateSysVarEnergyCounterIEC = function(chn) {
+    conInfo("CheckAndCreateSysVarEnergyCounterIEC");
+    var sysVarIds = getSysVarEnergyCounterIECIds(chn);
+    var SysVarEnergyCounterId = sysVarIds.counterId,
+      SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
+
+    var oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
+
+    // SysVar svEnergyCounter_xxxx doesn�t exist
+    if (!oSysVarEnergyCounter) {
+      conInfo("create system variable: " + SysVarEnergyCounterId);
+      CreateSysVar(SysVarEnergyCounterId, "float");
+      CreateSysVar(SysVarEnergyCounterOldValId, "float");
+      conInfo("CreateSysVarEnergyCounterScriptIEC");
+      CreateSysVarEnergyCounterScriptIEC(chn);
+      readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
+    }
+  };
 
-  if (hasRainSensor) {
-
-    var SysVarRainCounterId = sysVarIds.rainCounterId,
-      SysVarRainCounterOldValId = sysVarIds.tmpRainCounterId,
-      SysVarRainCounterYesterdayId = sysVarIds.rainCounterYesterdayId,
-      SysVarRainCounterTodayId = sysVarIds.rainCounterTodayId;
-
-    var sysVarRainCounter = homematic("SysVar.get", {"id": SysVarRainCounterId});
-    // sysVarRainCounter doesn't exist
-    if (!sysVarRainCounter) {
-      conInfo("create system variable: " + SysVarRainCounterId);
-      CreateSysVar(SysVarRainCounterId, "float");
-      conInfo("create system variable: " + SysVarRainCounterOldValId);
-      CreateSysVar(SysVarRainCounterOldValId, "float");
-      conInfo("create system variable: " + SysVarRainCounterYesterdayId);
-      CreateSysVar(SysVarRainCounterYesterdayId, "float", 0, chn.id);
-      conInfo("create system variable: " + SysVarRainCounterTodayId);
-      CreateSysVar(SysVarRainCounterTodayId, "float", 0, chn.id);
-      CreateHmIPRainCounterScript(chn);
+  //***
+  CheckAndCreateSysVarEnergyCounterIGL = function (chn, channelType) {
+    conInfo("CheckAndCreateSysVarEnergyCounterIGL");
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var SysVarEnergyCounterId = sysVarIds.counterId,
+      SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
+
+    var oSysVarEnergyCounter = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
+
+    // SysVar svEnergyCounter_xxxx doesn�t exist
+    if (!oSysVarEnergyCounter) {
+      conInfo("create system variable: " + SysVarEnergyCounterId);
+      CreateSysVar(SysVarEnergyCounterId, "float");
+      CreateSysVar(SysVarEnergyCounterOldValId, "float");
+      CreateSysVar(SysVarEnergyCounterId + "_RESET", "boolean");
+      CreateSysVar(SysVarEnergyCounterId + "_TMP_OLDVAL", "float");
+      CreateSysVar(SysVarEnergyCounterId + "_DEVICE_RESET", "boolean");
+      CreateSysVarEnergyCounterScriptIGL(chn, channelType, "CURRENT");
+      readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
     }
-  }
+  };
 
-  CreateHmIPSunRainTodayYesterdayScript(chn);
+  CheckAndCreateSysVarEnergyCounterGasIGL = function (chn, channelType) {
+    conInfo("CheckAndCreateSysVarEnergyCounterGasIGL");
+    var sysVarIds = getSysVarEnergyCounterGasIds(chn);
+    var SysVarEnergyCounterId = sysVarIds.counterId,
+      SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
+
+    var oSysVarEnergyCounterGas = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
+
+    // SysVar svEnergyCounterGas_xxxx doesn�t exist
+    if (!oSysVarEnergyCounterGas) {
+      conInfo("create system variable: " + SysVarEnergyCounterId);
+      CreateSysVar(SysVarEnergyCounterId, "float");
+      CreateSysVar(SysVarEnergyCounterOldValId, "float");
+      CreateSysVar(SysVarEnergyCounterId + "_RESET", "boolean");
+      CreateSysVar(SysVarEnergyCounterId + "_TMP_OLDVAL", "float");
+      CreateSysVar(SysVarEnergyCounterId + "_DEVICE_RESET", "boolean");
+      CreateSysVarEnergyCounterScriptIGL(chn, channelType, "GAS");
+      readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
+    }
+  };
 
-};
 
-CreateSysVarHmIPModRC8 = function(channel) {
+  CheckAndCreateSysVarHmIPRainSunshineCounter = function(chn, hasRainSensor) {
+    var sysVarIds = getSysVarRainSunshineCounterIds(chn, hasRainSensor);
 
-  var sysVarID =  "svHmIPModRC8ChnMode_" + channel.id + "_" + channel.address;
-  // Mode of the channels (not active(0), key(1), switch(2) or shuttercontact(3)
-  // The default is key
-  CreateSysVar(sysVarID, "enum", "1", channel.id);
-};
+    var SysVarSunshineCounterId = sysVarIds.sunshineCounterId,
+      SysVarSunshineCounterOldValId = sysVarIds.tmpSunshineCounterId,
+      SysVarSunshineCounterYesterdayId = sysVarIds.sunshineCounterYesterdayId,
+      SysVarSunshineCounterTodayId = sysVarIds.sunshineCounterTodayId;
 
-createNecessarySysVarsAndPrograms = function (oDevice) {
-  if (oDevice) {
-    ShowWaitAnim();
-    jQuery.each(oDevice.channels, function (index, channel) {
-      var channelType = GetChannelType(channel);
-      if (channelType == "POWERMETER") {
-        CheckAndCreateSysVarEnergyCounter(channel);
-      }
+    var sysVarSunshineCounter = homematic("SysVar.get", {"id": SysVarSunshineCounterId});
 
-      if (channelType == "POWERMETER_IGL") {
-        CheckAndCreateSysVarEnergyCounterIGL(channel, channelType);
-        CheckAndCreateSysVarEnergyCounterGasIGL(channel, channelType);
-      }
+    // sysVarSunshineCounter doesn't exist
+    if (!sysVarSunshineCounter) {
+      conInfo("create system variable: " + SysVarSunshineCounterId);
+      CreateSysVar(SysVarSunshineCounterId, "float");
+      conInfo("create system variable: " + SysVarSunshineCounterOldValId);
+      CreateSysVar(SysVarSunshineCounterOldValId, "float");
+      conInfo("create system variable: " + SysVarSunshineCounterYesterdayId);
+      CreateSysVar(SysVarSunshineCounterYesterdayId, "float", 0, chn.id);
+      conInfo("create system variable: " + SysVarSunshineCounterTodayId);
+      CreateSysVar(SysVarSunshineCounterTodayId, "float", 0, chn.id);
 
-      if (channelType == "ENERGIE_METER_TRANSMITTER") {
-        CheckAndCreateSysVarEnergyCounter(channel);
-      }
+      CreateHmIPSunshineCounterScript(chn);
 
-      if (channelType == "POWERMETER_IEC1") {
-        // IEC Sensor 1
-        CheckAndCreateSysVarEnergyCounterIGL(channel, channelType);
-        CheckAndCreateSysVarEnergyCounterGasIGL(channel, channelType);
-        CheckAndCreateSysVarEnergyCounterIEC(channel);
-      }
+    }
 
-      if ((channelType == "WEATHER_TRANSMIT") && (oDevice.type.toLowerCase() == "hmip-swo-b")) {
-        CheckAndCreateSysVarHmIPRainSunshineCounter(channel, false);
+    if (hasRainSensor) {
+
+      var SysVarRainCounterId = sysVarIds.rainCounterId,
+        SysVarRainCounterOldValId = sysVarIds.tmpRainCounterId,
+        SysVarRainCounterYesterdayId = sysVarIds.rainCounterYesterdayId,
+        SysVarRainCounterTodayId = sysVarIds.rainCounterTodayId;
+
+      var sysVarRainCounter = homematic("SysVar.get", {"id": SysVarRainCounterId});
+      // sysVarRainCounter doesn't exist
+      if (!sysVarRainCounter) {
+        conInfo("create system variable: " + SysVarRainCounterId);
+        CreateSysVar(SysVarRainCounterId, "float");
+        conInfo("create system variable: " + SysVarRainCounterOldValId);
+        CreateSysVar(SysVarRainCounterOldValId, "float");
+        conInfo("create system variable: " + SysVarRainCounterYesterdayId);
+        CreateSysVar(SysVarRainCounterYesterdayId, "float", 0, chn.id);
+        conInfo("create system variable: " + SysVarRainCounterTodayId);
+        CreateSysVar(SysVarRainCounterTodayId, "float", 0, chn.id);
+        CreateHmIPRainCounterScript(chn);
       }
+    }
 
-      if ((channelType == "WEATHER_TRANSMIT") && ((oDevice.type.toLowerCase() == "hmip-swo-pr") || (oDevice.type.toLowerCase() == "hmip-swo-pl"))) {
-        CheckAndCreateSysVarHmIPRainSunshineCounter(channel, true);
-      }
+    CreateHmIPSunRainTodayYesterdayScript(chn);
 
-      /* currently not in use
-      if ((channelType == "KEY_TRANSCEIVER") && (oDevice.type.toLowerCase() == "hmip-mod-rc8")) {
-        CreateSysVarHmIPModRC8(channel);
-      }
-      */
-    });
-    HideWaitAnim();
-  }
-};
-
-changeBlind2Shutter = function(oDevice) {
-  ShowWaitAnim();
-  HideWaitAnimAutomatically();
-  if (oDevice.type == "HmIPW-DRBL4" || oDevice.type == "HmIP-DRBLI4") {
-    var hasChannelOperationMode,
-    devMode = "--";
+  };
+
+  storeEnergyValuesAtMidnight = function(chn) {
+
+    var destinationScript =
+
+      "integer loop = 0;\n" +
+      "string last30Days = '';\n" +
+      "string val;\n" +
+
+      "real energy7 = 0.0;\n" +
+      "real energy30 = 0.0;\n" +
+
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+
+      "! Retrieve energyCounter30Days\n" +
+      "string energyCounter30Days = chn.MetaData('energyCounter30Days');\n" +
+
+      "! Retrieve todays value\n" +
+      "real energy0 = chn.MetaData('energy0').ToFloat();\n" +
+
+      "! Move the values of the array energyCounter30Days one position to the right\n" +
+      "foreach (val, energyCounter30Days.Split(',')) {\n" +
+
+      "if (loop <= 28 ) {\n" +
+      "last30Days = last30Days + val + ',';\n" +
+      "} else {\n" +
+      "if (loop == 29) {\n" +
+      "last30Days = last30Days + val;\n" +
+      "}\n" +
+      "}\n" +
+
+      "loop = loop + 1;\n" +
+      "}\n" +
+
+      "! Set the first position of the array energyCounter30Days to todays value.\n" +
+      "last30Days = energy0.ToString(1) + ',' + last30Days;\n" +
+
+      "!Store energyCounter30Days as meta data\n" +
+      "chn.MetaData('energyCounter30Days', last30Days);\n" +
+
+      "! Set the meta data of energy1 (yesterday), energy7 (week) and energy30 (months)\n" +
+      "loop = 0;\n" +
+      "foreach (val, last30Days.Split(',')) {\n" +
+      "val = val.ToFloat();\n" +
+      "if (loop == 0) {chn.MetaData('energy1', val);}\n" +
+      "if (loop <= 6) {\n" +
+      "energy7 = energy7 + val;\n" +
+      "}\n" +
+
+      "energy30 = energy30 + val;\n" +
+
+      "loop = loop +1;\n" +
+      "}\n" +
+
+      "chn.MetaData('energy7', energy7);\n" +
+      "chn.MetaData('energy30', energy30);\n" +
+
+      "! Reset energy0 (today) - a new day begins\n" +
+      "chn.MetaData('energy0', 0.0);\n" ;
+
+
+    var script =
+
+      "var _script = \""+destinationScript+"\";" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+      "var TIMER_DAILY           = 9;"+
+      "var NOT_SET               = 0;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgSetEnergyValuesAtMidnight"+ chn.id + "');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var timeModule = dom.CreateObject(OT_CALENDARDP);"+
+      "dom.GetObject(ID_CALENDARDPS).Add(timeModule);"+
+      "timeModule.TimerType(TIMER_DAILY);"+
+      "timeModule.Time('2000-01-01 00:00:00');"+
+      "timeModule.CalDuration(NOT_SET);"+
+      "timeModule.CalRepeatTime(NOT_SET);"+
+      "timeModule.Weekdays(NOT_SET);"+
+      "timeModule.Period(NOT_SET);"+
+      "timeModule.CalRepetitionValue(NOT_SET);"+
+      "timeModule.Begin('2000-01-01 00:00:00');"+
+      "timeModule.End(NOT_SET);"+
+      "timeModule.CalRepetitionCount(NOT_SET);"+
+      "timeModule.SunOffsetType(NOT_SET);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(3);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtCurrentDate);"+
+      "singleCondition.RightVal1ValType(ivtObjectId);"+
+      "singleCondition.RightVal1(timeModule.ID());"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+  CreateSysVarHmIPModRC8 = function(channel) {
+
+    var sysVarID =  "svHmIPModRC8ChnMode_" + channel.id + "_" + channel.address;
+    // Mode of the channels (not active(0), key(1), switch(2) or shuttercontact(3)
+    // The default is key
+    CreateSysVar(sysVarID, "enum", "1", channel.id);
+  };
+
+  createNecessarySysVarsAndPrograms = function (oDevice) {
+    if (oDevice) {
+      ShowWaitAnim();
+      jQuery.each(oDevice.channels, function (index, channel) {
+        var channelType = GetChannelType(channel);
+        if (channelType == "POWERMETER") {
+          CheckAndCreateSysVarEnergyCounter(channel);
+        }
+
+        if (channelType == "POWERMETER_IGL") {
+          CheckAndCreateSysVarEnergyCounterIGL(channel, channelType);
+          CheckAndCreateSysVarEnergyCounterGasIGL(channel, channelType);
+        }
+
+        if (channelType == "ENERGIE_METER_TRANSMITTER") {
+          if (oDevice.type.toLowerCase() == "hmip-esi") {
+            if (channel.index == 1) {
+              var arSensorTypes = ['SENSOR_UNKNOWN', 'SENSOR_ES_GAS', 'SENSOR_ES_LED', 'SENSOR_ES_IEC', 'SENSOR_ES_IEC_SML', 'SENSOR_ES_IEC_SML_WH', 'SENSOR_ES_IEC_D0_A', 'SENSOR_ES_IEC_D0_B', 'SENSOR_ES_IEC_D0_C', 'SENSOR_ES_IEC_D0_D'],
+                selfCalResult = homematic("Interface.getValue", {"interface": "HmIP-RF", "address": channel.address, "valueKey": "SELF_CALIBRATION_RESULT"});
+
+              if (selfCalResult == null) {selfCalResult = 0;}
+
+              jQuery.each(oDevice.channels, function (index, chn) {
+                if (chn.channelType != 'MAINTENANCE') {
+                  homematic("Interface.setMetadata", {"objectId": chn.id, "dataId": "iecPrgFirstStart","value": 1});
+
+                  homematic("Interface.setMetadata", {
+                    "objectId": chn.id,
+                    "dataId": "sensor",
+                    "value": arSensorTypes[parseInt(selfCalResult)]
+                  });
+                }
+              });
+            }
+
+            if (channel.index >= 2) {
+              homematic("Interface.setMetadata", {"objectId" : channel.id, "dataId" : "devEnergyCounter","value" : 0});
+              if (channel.index == 2) {
+                homematic("Interface.setMetadata", {"objectId" : channel.id, "dataId" : "devGasVolume","value" : 0});
+              }
+            }
+          }
+          CheckAndCreateSysVarEnergyCounter(channel);
+        }
+
+        if (channelType == "POWERMETER_IEC1") {
+          // IEC Sensor 1
+          CheckAndCreateSysVarEnergyCounterIGL(channel, channelType);
+          CheckAndCreateSysVarEnergyCounterGasIGL(channel, channelType);
+          CheckAndCreateSysVarEnergyCounterIEC(channel);
+        }
+
+        if ((channelType == "WEATHER_TRANSMIT") && (oDevice.type.toLowerCase() == "hmip-swo-b")) {
+          CheckAndCreateSysVarHmIPRainSunshineCounter(channel, false);
+        }
+
+        if ((channelType == "WEATHER_TRANSMIT") && ((oDevice.type.toLowerCase() == "hmip-swo-pr") || (oDevice.type.toLowerCase() == "hmip-swo-pl"))) {
+          CheckAndCreateSysVarHmIPRainSunshineCounter(channel, true);
+        }
+
+        /* currently not in use
+        if ((channelType == "KEY_TRANSCEIVER") && (oDevice.type.toLowerCase() == "hmip-mod-rc8")) {
+          CreateSysVarHmIPModRC8(channel);
+        }
+        */
+
+        if (oDevice.type == "HmIP-RGBW" ) {
+          if (channel.index == 0) {
+            homematic("Interface.setMetadata", {
+              "objectId" : channel.id,
+              "dataId" : "deviceMode",
+              "value" : 0 // Default Modus RGBW
+            });
+          }
+        }
+
+        if ((oDevice.type == "HmIP-RGBW") || (oDevice.type == "HmIP-DRG-DALI")) {
+          if (channel.index == 0) {
+            var defaultEffectName, effectNo;
+            var arDefaultEffectName = ["--", translateKey("optionRainbow"), translateKey("optionSunrise"), translateKey("optionSunset"), "--", translateKey("optionForrest"), "--", "--", translateKey("optionSignalingRed"), translateKey("optionGreenBillow")];
+            jQuery.each(arDefaultEffectName, function (index, value) {
+              effectNo = (index + 1);
+              defaultEffectName = (value == "--") ? translateKey("lblEffect") + " " + effectNo : value;
+              homematic("Interface.setMetadata", {
+                "objectId": oDevice.id,
+                "dataId": "effectName_" + effectNo,
+                "value": defaultEffectName
+              });
+            });
+          }
+        }
+
+        if (oDevice.type == "HmIPW-WGD" ) {
+          if (channel.index == 0) {
+            var screenOrder = "0,1,2,3,4,END";
+            homematic("Interface.setMetadata", {"objectId": oDevice.id, "dataId": "screenOrder", "value": screenOrder});
+          }
+        }
+
+        if (oDevice.type == "HmIPW-WGD-PL" ) {
+          if (channel.index == 0) {
+            var screenOrder = "0,1,2,3,4,5,6,7,8,9,END";
+            homematic("Interface.setMetadata", {"objectId": oDevice.id, "dataId": "screenOrder", "value": screenOrder});
+          }
+        }
+
+        if (oDevice.type == "ELV-SH-BM-S") {
+          if (channelType == "GENERIC_MEASURING_TRANSMITTER") {
+            // Set the default unit for the measurement channels to ''
+            homematic("Interface.setMetadata", {
+              "objectId" : channel.id,
+              "dataId" : "measurementUnit",
+              "value" : '' // Default unit = '' (not set)
+            });
+
+            homematic("Interface.setMetadata", {
+              "objectId" : channel.id,
+              "dataId" : "measurementUnitDecimalPlaces",
+              "value" : 0
+            });
+
+          }
+
+          if (channelType == "MULTI_MODE_INPUT_TRANSMITTER") {
+            homematic("Interface.setMetadata", {
+              "objectId" : channel.id,
+              "dataId" : "channelMode",
+              "value" : 1
+            });
+          }
+        }
+
+      });
+      HideWaitAnim();
+    }
+  };
+
+  changeBlind2Shutter = function(oDevice) {
+    ShowWaitAnim();
+    HideWaitAnimAutomatically(60);
+
+    var channelModes = ["shutter", "blind"],
+      channelOperationMode,
+      devMode = "--";
     jQuery.each(oDevice.channels, function (index, channel) {
       if ((channel.channelType == "BLIND_TRANSMITTER") || (channel.channelType == "BLIND_VIRTUAL_RECEIVER")) {
-        if (typeof hasChannelOperationMode == "undefined") {
-          hasChannelOperationMode = homematic("Interface.getMasterValue", {"interface": "HmIP-RF", "address": channel.address, "valueKey": "CHANNEL_OPERATION_MODE"});
+        if (typeof channelOperationMode == "undefined") {
+          channelOperationMode = homematic("Interface.getMasterValue", {"interface": "HmIP-RF", "address": channel.address, "valueKey": "CHANNEL_OPERATION_MODE"});
         }
-        devMode =  (hasChannelOperationMode) ? "shutter" : "blind";
+
+        devMode = ((channelOperationMode == 0) || (channelOperationMode == 1)) ? channelModes[channelOperationMode] : "blind";
 
         homematic("Interface.setMetadata_crRFD", {
           "interface" : "HmIP-RF",
@@ -1780,102 +2230,102 @@
         });
       }
     });
-  }
-  HideWaitAnim();
-};
 
-SetReadyConfigAndHideImgs = function (devId) {
-  var _devId_ = devId;
+    HideWaitAnim();
+  };
 
-  var oDevice = homematic("Device.get", {"id": devId});
+  SetReadyConfigAndHideImgs = function (devId) {
+    var _devId_ = devId;
 
-  //setDevicePos2SystemPos(oDevice);
-  createNecessarySysVarsAndPrograms(oDevice);
+    var oDevice = homematic("Device.get", {"id": devId});
 
-  // This is necessary for HmIPW-Blindactors and the HmIP-DRBLI4 with a firmware version >= 1.6
-  // These devices are coming in with the channel type of BLIND_ but are by default acting as SHUTTER
-  changeBlind2Shutter(oDevice);
+    //setDevicePos2SystemPos(oDevice);
+    createNecessarySysVarsAndPrograms(oDevice);
 
+    // This is necessary for HmIPW-Blindactors and the HmIP-DRBLI4 with a firmware version >= 1.6
+    // These devices are coming in with the channel type of BLIND_ but are by default acting as SHUTTER
+    changeBlind2Shutter(oDevice);
 
 
-  var doSetReady = function () {
-    iNewDevCount--;
-    hideImages(_devId_);
 
-    iseDevices.setReadyConfig(_devId_);
-    if (iNewDevCount == 0) {
-      $("newDevTbl").hide();
-      //$("noNewDevs").innerHTML = "Alle Ger&auml;te wurden konfiguriert.";
-      $("noNewDevs").innerHTML = translateKey("dialogNewDevicesLblAllDevicesConfigured");
-      $("noNewDevs").show();
-    }
-    for (var i = 0; i < arDevices.length; i++) {
-      if (arDevices[i]['id'] == _devId_) {
-        if (arDevices[i]['expanded']) {
-          iDevicesExpanded--;
+    var doSetReady = function () {
+      iNewDevCount--;
+      hideImages(_devId_);
+
+      iseDevices.setReadyConfig(_devId_);
+      if (iNewDevCount == 0) {
+        $("newDevTbl").hide();
+        //$("noNewDevs").innerHTML = "Alle Ger&auml;te wurden konfiguriert.";
+        $("noNewDevs").innerHTML = translateKey("dialogNewDevicesLblAllDevicesConfigured");
+        $("noNewDevs").show();
+      }
+      for (var i = 0; i < arDevices.length; i++) {
+        if (arDevices[i]['id'] == _devId_) {
+          if (arDevices[i]['expanded']) {
+            iDevicesExpanded--;
+          }
         }
       }
-    }
-    refreshFooterButton();
-  };
+      refreshFooterButton();
+    };
 
-  var readyButton = $("readyBtn" + devId);
+    var readyButton = $("readyBtn" + devId);
+
+    // Hiermit kann abgefragt werden, ob schon alle Kan�le konifugiert sind.
+    // Zur Zeit deaktiviert, da von vielen Kunden nicht erw�nscht.
+    /*
+     if (readyButton)
+     {
+     if (readyButton._isReady)
+     {
+     doSetReady();
+     }
+     else
+     {
+     new YesNoDialog("Ger�t fertig konfigurieren", "Es sind noch nicht alle Kan�le fertig konfiguriert. M�chten Sie dennoch fortfahren?", function(result) {
+     if (result == YesNoDialog.RESULT_YES)
+     {
+     doSetReady();
+     }
+     });
+     }
+     }
+     */
+
+    // Hiermit wird verhindert, da� abgefragt wird, ob schon alle Kan�le
+    // konfiguriert sind.
+
+    if (readyButton) {
+      doSetReady();
+    }
 
-  // Hiermit kann abgefragt werden, ob schon alle Kan�le konifugiert sind.
-  // Zur Zeit deaktiviert, da von vielen Kunden nicht erw�nscht.
-  /*
-   if (readyButton)
-   {
-   if (readyButton._isReady)
-   {
-   doSetReady();
-   }
-   else
-   {
-   new YesNoDialog("Ger�t fertig konfigurieren", "Es sind noch nicht alle Kan�le fertig konfiguriert. M�chten Sie dennoch fortfahren?", function(result) {
-   if (result == YesNoDialog.RESULT_YES)
-   {
-   doSetReady();
-   }
-   });
-   }
-   }
-   */
-
-  // Hiermit wird verhindert, da� abgefragt wird, ob schon alle Kan�le
-  // konfiguriert sind.
-
-  if (readyButton) {
-    doSetReady();
-  }
+  };
 
-};
+  specialReloadPage = function () {
+    if (bNecc) {
+      reloadPage();
+    }
+  };
 
-specialReloadPage = function () {
-  if (bNecc) {
-    reloadPage();
-  }
-};
-
-hideImages = function (devId) {
-  var count = arDevices.length;
-  var x = 0;
-  for (var i = 0; i < count; i++) {
-    if (arDevices[i]['id'] == devId) {
-      hide('picDiv' + arDevices[i]['id']);
-      if (arDevices[i]['chns']) {
-        for (x = 0; x < arDevices[i]['chns'].length; x++) {
-          hide('picDiv' + arDevices[i]['chns'][x]['id']);
+  hideImages = function (devId) {
+    var count = arDevices.length;
+    var x = 0;
+    for (var i = 0; i < count; i++) {
+      if (arDevices[i]['id'] == devId) {
+        hide('picDiv' + arDevices[i]['id']);
+        if (arDevices[i]['chns']) {
+          for (x = 0; x < arDevices[i]['chns'].length; x++) {
+            hide('picDiv' + arDevices[i]['chns'][x]['id']);
+          }
         }
-      }
-      if (arDevices[i]['chnsgr']) {
-        for (x = 0; x < arDevices[i]['chnsgr'].length; x++) {
-          collapseGroup(devId, arDevices[i]['chnsgr'][x][0]['id'], arDevices[i]['chnsgr'][x][1]['id'], false);
-          hide('picDiv' + arDevices[i]['chnsgr'][x][0]['id'] + arDevices[i]['chnsgr'][x][1]['id']);
+        if (arDevices[i]['chnsgr']) {
+          for (x = 0; x < arDevices[i]['chnsgr'].length; x++) {
+            collapseGroup(devId, arDevices[i]['chnsgr'][x][0]['id'], arDevices[i]['chnsgr'][x][1]['id'], false);
+            hide('picDiv' + arDevices[i]['chnsgr'][x][0]['id'] + arDevices[i]['chnsgr'][x][1]['id']);
+          }
         }
       }
     }
-  }
-};
-translatePage("#content");
+  };
+  translatePage("#content");
 </script>
diff --git a/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches/occu/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm.orig b/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches/occu/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm.orig
index 72eb5f887e..074eafaaf4 100755
--- a/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches/occu/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm.orig
+++ b/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches/occu/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm.orig
@@ -61,1710 +61,2160 @@
 
 <div id="dummy" class="CLASS04300"></div>
 <div class="CLASS04301">
-<div id="noNewDevs" class="CLASS04302" style="display:none;">${noDeviceInPostBox}</div>
-<table id="newDevTbl" class="tblList CLASS04303" cellpadding="0" cellspacing="0"
-       style="display:none; width:97%; margin:1%;">
-<colgroup>
-  <col style="width:2%;"  width="2%"/>
-  <!-- Plus/Minus Device-->
-  <col style="width:2%;"/>
-  <!-- Plus/Minus Group -->
-  <col style="width:2%;"/>
-  <!-- Leere Zelle vor GroupMember -->
-  <col style="width:1%;"/>
-  <col style="width:3%;"/>
-  <col style="width:7%;"/>
-  <col style="width:7%;"/>
-  <col style="width:9%;"/>
-  <col style="width:7%;"/>
-  <col style="width:7%;"/>
-  <col style="width:7%;"/>
-  <col style="width:7%;"/>
-  <col style="width:7%;"/>
-  <col style="width:15%;"/>
-  <col style="width:7%;"/>
-</colgroup>
-<tbody id="tblNewDevices">
-<tr id="tblNewDevicesHeader">
-  <th id="tblListFold"></th>
-
-  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('type')" colspan='3'><b>${thTypeDescriptor}</b></th>
-  <th class="Sort CLASS04304 border1px"><b>${thPicture}</b></th>
-  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('desc')"><b>${thDescriptor}</b></th>
-  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('sn')"><b>${thSerialNumber}</b></th>
-  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('iface')"><b>${thInterfaceCategory}</b></th>
-  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('trans')"><b>${thTransmitMode}</b></th>
-  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('name')"><b>${thName}</b></th>
-  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('func')"><b>${thFunc}</b></th>
-  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('room')"><b>${thRoom}</b></th>
-  <th class="Sort CLASS04304 border1px"><b>${thFunctionTest}</b></th>
-  <th class="Sort CLASS04304 border1px"><b>${thAction}</b></th>
-  <th class="Sort CLASS04304 border1px"><b>${thReady}</b></th>
-</tr>
+  <div id="noNewDevs" class="CLASS04302" style="display:none;">${noDeviceInPostBox}</div>
+  <table id="newDevTbl" class="tblList CLASS04303" cellpadding="0" cellspacing="0"
+         style="display:none; width:97%; margin:1%;">
+    <colgroup>
+      <col style="width:2%;"  width="2%"/>
+      <!-- Plus/Minus Device-->
+      <col style="width:2%;"/>
+      <!-- Plus/Minus Group -->
+      <col style="width:2%;"/>
+      <!-- Leere Zelle vor GroupMember -->
+      <col style="width:1%;"/>
+      <col style="width:3%;"/>
+      <col style="width:7%;"/>
+      <col style="width:7%;"/>
+      <col style="width:9%;"/>
+      <col style="width:7%;"/>
+      <col style="width:7%;"/>
+      <col style="width:7%;"/>
+      <col style="width:7%;"/>
+      <col style="width:7%;"/>
+      <col style="width:15%;"/>
+      <col style="width:7%;"/>
+    </colgroup>
+    <tbody id="tblNewDevices">
+    <tr id="tblNewDevicesHeader">
+      <th id="tblListFold"></th>
+
+      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('type')" colspan='3'><b>${thTypeDescriptor}</b></th>
+      <th class="Sort CLASS04304 border1px"><b>${thPicture}</b></th>
+      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('desc')"><b>${thDescriptor}</b></th>
+      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('sn')"><b>${thSerialNumber}</b></th>
+      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('iface')"><b>${thInterfaceCategory}</b></th>
+      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('trans')"><b>${thTransmitMode}</b></th>
+      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('name')"><b>${thName}</b></th>
+      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('func')"><b>${thFunc}</b></th>
+      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('room')"><b>${thRoom}</b></th>
+      <th class="Sort CLASS04304 border1px"><b>${thFunctionTest}</b></th>
+      <th class="Sort CLASS04304 border1px"><b>${thAction}</b></th>
+      <th class="Sort CLASS04304 border1px"><b>${thReady}</b></th>
+    </tr>
+
+    <script type="text/javascript">
+      translatePage("tblNewDevicesHeader");
+      iNewDevCount =
+      <%
+      Write(iNewCount);
+      %>
+      ;
+      if (iNewDevCount == 0) {
+        $("noNewDevs").show();
+      }
+      else {
+        $("newDevTbl").show();
+      }
 
-<script type="text/javascript">
-translatePage("tblNewDevicesHeader");
-iNewDevCount =
-<%
-Write(iNewCount);
-%>
-;
-if (iNewDevCount == 0) {
-  $("noNewDevs").show();
-}
-else {
-  $("newDevTbl").show();
-}
-
-<%
-string devId = "";
-foreach(devId, oUser.UserTempViewIDs().EnumEnabledIDs())
-{
-  object dev = dom.GetObject(devId);
-  if (dev && (dev.ReadyConfig() == false) && (dev.Name() != 'Gateway') && (dev.Interface() != ID_ERROR)) {
-    Write("deviceData = new Object();");
-    Write("deviceData['id'] = "#dev.ID()#";");
-    Write("deviceData['name'] = '"#dev.Name()#"';");
-    Write("deviceData['type'] = '"#dev.Label()#"';");
-    Write("deviceData['pic'] = '';");
-    Write("deviceData['desc'] = DEV_getDescription('"#dev.Label()#"');");
-    Write("deviceData['sn'] = '"#dev.Address()#"';");
-    Write("var chnTypes = new Array();");
-
-    Write("setNewDevicePos2SystemPos(deviceData);");
+      <%
+      string devId = "";
+      foreach(devId, oUser.UserTempViewIDs().EnumEnabledIDs())
+      {
+        object dev = dom.GetObject(devId);
+        if (dev && (dev.ReadyConfig() == false) && (dev.Name() != 'Gateway') && (dev.Interface() != ID_ERROR)) {
+          Write("deviceData = new Object();");
+          Write("deviceData['id'] = "#dev.ID()#";");
+          Write("deviceData['name'] = '"#dev.Name()#"';");
+          Write("deviceData['type'] = '"#dev.Label()#"';");
+          Write("deviceData['pic'] = '';");
+          Write("deviceData['desc'] = DEV_getDescription('"#dev.Label()#"');");
+          Write("deviceData['sn'] = '"#dev.Address()#"';");
+          Write("var chnTypes = new Array();");
+
+          Write("setNewDevicePos2SystemPos(deviceData);");
 
-    string
-    chnId;
-    foreach(chnId, dev.Channels())
-    {
-      object
-      chn = dom.GetObject(chnId);
-      Write("chnTypes.push('"#chn.HssType()#"');"
-    )
-    }
-    Write("deviceData['chnTypes'] = chnTypes;");
-
-    string chnTmp = "";
-    string roomIDs = "";
-    string funcIDs = "";
-    boolean bOneProto = false;
-    integer STD_FLAG = 1;
-    integer SAFE_FLAG = 2;
-    integer bitTrans = 0;
-    foreach(chnTmp, dev.EnumChannelGroups(true))
-    {
-      object
-      chn = dom.GetObject(chnTmp);
-      if (chn && (chn.Internal() == false)) {
-        if (chn.ChnArchive()) {
-          bOneProto = true;
-        }
-        if (chn.ChnAESActive()) {
-          bitTrans = bitTrans | SAFE_FLAG;
-        }
-        else {
-          bitTrans = bitTrans | STD_FLAG;
-        }
-        string
-        tmp = "";
-        foreach(tmp, chn.ChnRoom())
-        {
-          boolean
-          bFound = false;
           string
-          tmpR = "";
-          foreach(tmpR, roomIDs)
+          chnId;
+          foreach(chnId, dev.Channels())
           {
-            if (tmpR == tmp) {
-              bFound = true;
+            object
+            chn = dom.GetObject(chnId);
+            Write("chnTypes.push('"#chn.HssType()#"');"
+          )
+          }
+          Write("deviceData['chnTypes'] = chnTypes;");
+
+          string chnTmp = "";
+          string roomIDs = "";
+          string funcIDs = "";
+          boolean bOneProto = false;
+          integer STD_FLAG = 1;
+          integer SAFE_FLAG = 2;
+          integer bitTrans = 0;
+          foreach(chnTmp, dev.EnumChannelGroups(true))
+          {
+            object
+            chn = dom.GetObject(chnTmp);
+            if (chn && (chn.Internal() == false)) {
+              if (chn.ChnArchive()) {
+                bOneProto = true;
+              }
+              if (chn.ChnAESActive()) {
+                bitTrans = bitTrans | SAFE_FLAG;
+              }
+              else {
+                bitTrans = bitTrans | STD_FLAG;
+              }
+              string
+              tmp = "";
+              foreach(tmp, chn.ChnRoom())
+              {
+                boolean
+                bFound = false;
+                string
+                tmpR = "";
+                foreach(tmpR, roomIDs)
+                {
+                  if (tmpR == tmp) {
+                    bFound = true;
+                  }
+                }
+                if (!bFound) {
+                  roomIDs = roomIDs # tmp # "\t";
+                }
+              }
+
+              string
+              tmp = "";
+              foreach(tmp, chn.ChnFunction())
+              {
+                boolean
+                bFound = false;
+                string
+                tmpF = "";
+                foreach(tmpF, funcIDs)
+                {
+                  if (tmpF == tmp) {
+                    bFound = true;
+                  }
+                }
+                if (!bFound) {
+                  funcIDs = funcIDs # tmp # "\t";
+                }
+              }
+            }
+          }
+          foreach(chnTmp, dev.EnumChannelGroups(false))
+          {
+            object
+            chn = dom.GetObject(chnTmp);
+            if (chn && (chn.Internal() == false)) {
+              if (chn.ChnAESActive()) {
+                bitTrans = bitTrans | SAFE_FLAG;
+              }
+              else {
+                bitTrans = bitTrans | STD_FLAG;
+              }
+              if (chn.ChnArchive()) {
+                bOneProto = true;
+              }
+              string
+              tmp = "";
+              foreach(tmp, chn.ChnRoom())
+              {
+                boolean
+                bFound = false;
+                string
+                tmpR = "";
+                foreach(tmpR, roomIDs)
+                {
+                  if (tmpR == tmp) {
+                    bFound = true;
+                  }
+                }
+                if (!bFound) {
+                  roomIDs = roomIDs # tmp # "\t";
+                }
+              }
+
+              string
+              tmp = "";
+              foreach(tmp, chn.ChnFunction())
+              {
+                boolean
+                bFound = false;
+                string
+                tmpF = "";
+                foreach(tmpF, funcIDs)
+                {
+                  if (tmpF == tmp) {
+                    bFound = true;
+                  }
+                }
+                if (!bFound) {
+                  funcIDs = funcIDs # tmp # "\t";
+                }
+              }
             }
           }
-          if (!bFound) {
-            roomIDs = roomIDs # tmp # "\t";
+          string funcNames = "";
+          string roomNames = "";
+          string tmp = "";
+          foreach(tmp, roomIDs)
+          {
+            object obj = dom.GetObject(tmp);
+            roomNames = roomNames # obj.Name() # ";";
+          }
+          string tmp = "";
+          foreach(tmp, funcIDs)
+          {
+            object obj = dom.GetObject(tmp);
+            funcNames = funcNames # obj.Name() #  ";";
           }
-        }
 
-        string
-        tmp = "";
-        foreach(tmp, chn.ChnFunction())
-        {
-          boolean
-          bFound = false;
-          string
-          tmpF = "";
-          foreach(tmpF, funcIDs)
+
+          string sTrans;
+
+          if (bitTrans & STD_FLAG) {
+            sTrans = sTrans # "${lblStandard} ";
+          }
+
+          if (bitTrans & SAFE_FLAG) {
+            sTrans = sTrans # "${lblSecured}";
+          }
+          Write("deviceData['trans'] = '"#sTrans#"';");
+
+          string sIface = "";
+          integer iface = dev.Interface();
+          if (iface != ID_ERROR) {
+            sIface = dom.GetObject(iface).Name();
+          }
+          Write("deviceData['iface'] = '"#sIface#"';");
+          Write("deviceData['func'] = '"#funcNames#"';");
+          Write("deviceData['room'] = '"#roomNames#"';");
+          Write("deviceData['proto'] = "#bOneProto#";");
+          boolean bFound3 = false;
+          string s3;
+          foreach(s3, dev.Channels().EnumEnabledIDs())
           {
-            if (tmpF == tmp) {
-              bFound = true;
+            object
+            oChTmp = dom.GetObject(s3);
+            if (oChTmp) {
+              object
+              oDpTmp = dom.GetObject(oChTmp.DefaultDPWrite());
+              if (oDpTmp) {
+                if ((!oDpTmp.IsTypeOf(OT_VARDP)) && (!oDpTmp.IsTypeOf(OT_ALARMDP))) {
+                  bFound3 = true;
+                }
+              }
             }
           }
-          if (!bFound) {
-            funcIDs = funcIDs # tmp # "\t";
+          if (bFound3) {
+            boolean bHasFullAccess = (dev.UserAccessRights(iulOtherThanAdmin) == iarFullAccess);
+            if (bHasFullAccess) {
+              Write("deviceData['handle'] = 'YES';");
+            }
+            else {
+              Write("deviceData['handle'] = 'NO';");
+            }
           }
-        }
-      }
-    }
-    foreach(chnTmp, dev.EnumChannelGroups(false))
-    {
-      object
-      chn = dom.GetObject(chnTmp);
-      if (chn && (chn.Internal() == false)) {
-        if (chn.ChnAESActive()) {
-          bitTrans = bitTrans | SAFE_FLAG;
-        }
-        else {
-          bitTrans = bitTrans | STD_FLAG;
-        }
-        if (chn.ChnArchive()) {
-          bOneProto = true;
-        }
-        string
-        tmp = "";
-        foreach(tmp, chn.ChnRoom())
-        {
-          boolean
-          bFound = false;
-          string
-          tmpR = "";
-          foreach(tmpR, roomIDs)
+          else {
+            Write("deviceData['handle'] = 'READONLY';");
+          }
+          Write("deviceData['vis'] = "#(dev.Visible())#";");
+          Write('conInfo( "Device '#(dev.Name())#' : '#(dev.Visible())#'" );');
+          Write("deviceData['readyconfig'] = "#(dev.ReadyConfigChns())#";");
+          Write("deviceData['loaded'] = false;");
+
+          boolean bExistComTestDP = false;
+          string sdev;
+          foreach(sdev, dev.Channels().EnumIDs())
           {
-            if (tmpR == tmp) {
-              bFound = true;
+            object
+            oCHTmpECT = dom.GetObject(sdev);
+            if (oCHTmpECT) {
+              if (oCHTmpECT.ExistComTestDP()) {
+                bExistComTestDP = true;
+              }
             }
           }
-          if (!bFound) {
-            roomIDs = roomIDs # tmp # "\t";
+          if (bExistComTestDP) {
+            Write('deviceData["comtestdp"] = true;');
+          }
+          else {
+            Write('deviceData["comtestdp"] = false;');
           }
-        }
 
-        string
-        tmp = "";
-        foreach(tmp, chn.ChnFunction())
-        {
-          boolean
-          bFound = false;
-          string
-          tmpF = "";
-          foreach(tmpF, funcIDs)
+
+          boolean bFound = false;
+          string s;
+          foreach(s, dom.TestRunningIDs().EnumIDs())
           {
-            if (tmpF == tmp) {
+            if (dev.Channels().Get(s)) {
               bFound = true;
             }
           }
-          if (!bFound) {
-            funcIDs = funcIDs # tmp # "\t";
-          }
-        }
-      }
-    }
-    string funcNames = "";
-    string roomNames = "";
-    string tmp = "";
-    foreach(tmp, roomIDs)
-    {
-      object obj = dom.GetObject(tmp);
-      roomNames = roomNames # obj.Name() # ";";
-    }
-    string tmp = "";
-    foreach(tmp, funcIDs)
-    {
-      object obj = dom.GetObject(tmp);
-      funcNames = funcNames # obj.Name() #  ";";
-    }
 
+          if (bFound) {
+            Write("deviceData['testrunning'] = true;");
+          }
+          else {
+            Write("deviceData['testrunning'] = false;");
+          }
 
-    string sTrans;
-
-    if (bitTrans & STD_FLAG) {
-      sTrans = sTrans # "${lblStandard} ";
-    }
-
-    if (bitTrans & SAFE_FLAG) {
-      sTrans = sTrans # "${lblSecured}";
-    }
-    Write("deviceData['trans'] = '"#sTrans#"';");
+          string sTimestamp = dev.LastTestCompletedTime();
+          Call("/esp/TimeStamp.fn::TimeStampToString3()");
+          Write("deviceData['testtime'] = '"#sTimestamp#"';");
 
-    string sIface = "";
-    integer iface = dev.Interface();
-    if (iface != ID_ERROR) {
-      sIface = dom.GetObject(iface).Name();
-    }
-    Write("deviceData['iface'] = '"#sIface#"';");
-    Write("deviceData['func'] = '"#funcNames#"';");
-    Write("deviceData['room'] = '"#roomNames#"';");
-    Write("deviceData['proto'] = "#bOneProto#";");
-    boolean bFound3 = false;
-    string s3;
-    foreach(s3, dev.Channels().EnumEnabledIDs())
-    {
-      object
-      oChTmp = dom.GetObject(s3);
-      if (oChTmp) {
-        object
-        oDpTmp = dom.GetObject(oChTmp.DefaultDPWrite());
-        if (oDpTmp) {
-          if ((!oDpTmp.IsTypeOf(OT_VARDP)) && (!oDpTmp.IsTypeOf(OT_ALARMDP))) {
-            bFound3 = true;
-          }
+          Write("arDevices[arDevices.length] = deviceData;");
         }
       }
-    }
-    if (bFound3) {
-      boolean bHasFullAccess = (dev.UserAccessRights(iulOtherThanAdmin) == iarFullAccess);
-      if (bHasFullAccess) {
-        Write("deviceData['handle'] = 'YES';");
-      }
-      else {
-        Write("deviceData['handle'] = 'NO';");
-      }
-    }
-    else {
-      Write("deviceData['handle'] = 'READONLY';");
-    }
-    Write("deviceData['vis'] = "#(dev.Visible())#";");
-    Write('conInfo( "Device '#(dev.Name())#' : '#(dev.Visible())#'" );');
-    Write("deviceData['readyconfig'] = "#(dev.ReadyConfigChns())#";");
-    Write("deviceData['loaded'] = false;");
-
-    boolean bExistComTestDP = false;
-    string sdev;
-    foreach(sdev, dev.Channels().EnumIDs())
-    {
-      object
-      oCHTmpECT = dom.GetObject(sdev);
-      if (oCHTmpECT) {
-        if (oCHTmpECT.ExistComTestDP()) {
-          bExistComTestDP = true;
+      %>
+      var arDevInInbox = [];
+      for (var i = 0; i < arDevices.length; i++) {
+        arDevInInbox.push({"serialNumber": arDevices[i]['sn'], "regaID": arDevices[i]['id']});
+
+        var tr = Builder.node('tr', {id: "tr" + arDevices[i]['id']});
+        //var td = Builder.node('td');
+        var td = Builder.node('td', {className: 'DeviceListCell_Invisible'});
+        arImgIds[arImgIds.length] = "img" + arDevices[i]['id'];
+        var img = Builder.node('img', {src: "/ise/img/plus.png", id: "img" + arDevices[i]['id'], alt: "plus", onclick: "expandDevice(" + arDevices[i]['id'] + "," + i + ")"});
+        td.appendChild(img);
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, strCut(arDevices[i]['type'], true));
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'WhiteBkgPic CLASS04314 border1px'}, [
+          Builder.node('div', {id: 'picDiv' + arDevices[i]['id'], className: "CLASS04305",
+            onmouseover: "picDivShow(jg_250, '" + arDevices[i]['type'] + "', 250, '-1', this);", onmouseout: "picDivHide(jg_250);"})
+        ]);
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['desc'] );
+        td.innerHTML = translateKey(arDevices[i]['desc']);
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'GrayBkg border1px'}, strCut(arDevices[i]['sn']));
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['iface']);
+        tr.appendChild(td);
+        td = Builder.node('td', {id: "transParent" + arDevices[i]['id'], className: 'GrayBkg border1px'}, spaceCut(arDevices[i]['trans']));
+        tr.appendChild(td);
+
+
+        if (NAV_IE) {
+          td = Builder.node('td', {className: 'WhiteBkg border1px'},
+            [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true)) ]);
+          tr.appendChild(td);
         }
-      }
-    }
-    if (bExistComTestDP) {
-      Write('deviceData["comtestdp"] = true;');
-    }
-    else {
-      Write('deviceData["comtestdp"] = false;');
-    }
-
-
-    boolean bFound = false;
-    string s;
-    foreach(s, dom.TestRunningIDs().EnumIDs())
-    {
-      if (dev.Channels().Get(s)) {
-        bFound = true;
-      }
-    }
-
-    if (bFound) {
-      Write("deviceData['testrunning'] = true;");
-    }
-    else {
-      Write("deviceData['testrunning'] = false;");
-    }
-
-    string sTimestamp = dev.LastTestCompletedTime();
-    Call("/esp/TimeStamp.fn::TimeStampToString3()");
-    Write("deviceData['testtime'] = '"#sTimestamp#"';");
-
-    Write("arDevices[arDevices.length] = deviceData;");
-  }
-}
-%>
-var arDevInInbox = [];
-for (var i = 0; i < arDevices.length; i++) {
-  arDevInInbox.push({"serialNumber": arDevices[i]['sn'], "regaID": arDevices[i]['id']});
-
-  var tr = Builder.node('tr', {id: "tr" + arDevices[i]['id']});
-  //var td = Builder.node('td');
-  var td = Builder.node('td', {className: 'DeviceListCell_Invisible'});
-  arImgIds[arImgIds.length] = "img" + arDevices[i]['id'];
-  var img = Builder.node('img', {src: "/ise/img/plus.png", id: "img" + arDevices[i]['id'], alt: "plus", onclick: "expandDevice(" + arDevices[i]['id'] + "," + i + ")"});
-  td.appendChild(img);
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, strCut(arDevices[i]['type'], true));
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'WhiteBkgPic CLASS04314 border1px'}, [
-    Builder.node('div', {id: 'picDiv' + arDevices[i]['id'], className: "CLASS04305",
-      onmouseover: "picDivShow(jg_250, '" + arDevices[i]['type'] + "', 250, '-1', this);", onmouseout: "picDivHide(jg_250);"})
-  ]);
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['desc'] );
-  td.innerHTML = translateKey(arDevices[i]['desc']);
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'GrayBkg border1px'}, strCut(arDevices[i]['sn']));
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['iface']);
-  tr.appendChild(td);
-  td = Builder.node('td', {id: "transParent" + arDevices[i]['id'], className: 'GrayBkg border1px'}, spaceCut(arDevices[i]['trans']));
-  tr.appendChild(td);
-
-
-  if (NAV_IE) {
-    td = Builder.node('td', {className: 'WhiteBkg border1px'},
-      [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true)) ]);
-    tr.appendChild(td);
-  }
-  else {
-    if (isDevTypeHmIPW(arDevices[i]['type'])) {
-      td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px'});
-      divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, strCut(arDevices[i]['name'].replace(/:/g, ":<br/>"), false));
-      divB = Builder.node('div', {
-        id: 'btnRename_' + arDevices[i]["id"],
-        className: 'TestButton colorGradient borderRadius2px hidden',
-        style: 'min-width:7em',
-        onclick: 'renameAllNamesDialog(' + arDevices[i]["id"] + ')'
-      }, translateKey("lblRename"));
-      td.appendChild(divA);
-      td.appendChild(divB);
-    } else {
-      td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true));
-    }
+        else {
+          if (isDevTypeHmIPW(arDevices[i]['type'])) {
+            td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px'});
+            divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, strCut(arDevices[i]['name'].replace(/:/g, ":<br/>"), false));
+            divB = Builder.node('div', {
+              id: 'btnRename_' + arDevices[i]["id"],
+              className: 'TestButton colorGradient borderRadius2px hidden',
+              style: 'min-width:7em',
+              onclick: 'renameAllNamesDialog(' + arDevices[i]["id"] + ')'
+            }, translateKey("lblRename"));
+            td.appendChild(divA);
+            td.appendChild(divB);
+          } else {
+            td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true));
+          }
 
-    tr.appendChild(td);
-  }
-  td = Builder.node('td', {id: "funcs" + arDevices[i]['id'], className: 'GrayBkg border1px'}, semCut(arDevices[i]['func']));
-  tr.appendChild(td);
-  td = Builder.node('td', {id: "rooms" + arDevices[i]['id'], className: 'GrayBkg border1px'}, semCut(arDevices[i]['room']));
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'WhiteBkg border1px'});
-
-  if (arDevices[i]['type'].match(/Team/g) == null ) {
-    writeTestField(td, arDevices[i]['id'].toString(), arDevices[i]['testtime'], arDevices[i]['comtestdp'], arDevices[i]['testrunning']);
-  }
+          tr.appendChild(td);
+        }
+        td = Builder.node('td', {id: "funcs" + arDevices[i]['id'], className: 'GrayBkg border1px'}, semCut(arDevices[i]['func']));
+        tr.appendChild(td);
+        td = Builder.node('td', {id: "rooms" + arDevices[i]['id'], className: 'GrayBkg border1px'}, semCut(arDevices[i]['room']));
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'WhiteBkg border1px'});
+
+        if (arDevices[i]['type'].match(/Team/g) == null ) {
+          writeTestField(td, arDevices[i]['id'].toString(), arDevices[i]['testtime'], arDevices[i]['comtestdp'], arDevices[i]['testrunning']);
+        }
 
-  tr.appendChild(td);
-  td = Builder.node('td', {className: 'WhiteBkg border1px'}, '');
-  writeDeviceAction(td, true, true, true, arDevices[i]);
-  tr.appendChild(td);
+        tr.appendChild(td);
+        td = Builder.node('td', {className: 'WhiteBkg border1px'}, '');
+        writeDeviceAction(td, true, true, true, arDevices[i]);
+        tr.appendChild(td);
 
-  td = Builder.node('td', {className: 'WhiteBkg border1px'}, '');
-  writeReadyField(td, arDevices[i]);
-  tr.appendChild(td);
+        td = Builder.node('td', {className: 'WhiteBkg border1px'}, '');
+        writeReadyField(td, arDevices[i]);
+        tr.appendChild(td);
 
-  $("tblNewDevices").appendChild(tr);
-  // draw pic
-  var jg_0 = new jsGraphics('picDiv' + arDevices[i]['id']);
-  InitGD(jg_0, 50);
-  Draw(jg_0, arDevices[i]['type'], 50, '-1');
+        $("tblNewDevices").appendChild(tr);
+        // draw pic
+        var jg_0 = new jsGraphics('picDiv' + arDevices[i]['id']);
+        InitGD(jg_0, 50);
+        Draw(jg_0, arDevices[i]['type'], 50, '-1');
 
-  arDevPosis[arDevPosis.length] = i + 2;
+        arDevPosis[arDevPosis.length] = i + 2;
 
-  // Zeilenumbruch im Ger�tenamen
-  var devNameElm = jQuery("#tdn" + arDevices[i]['id']);
-  devNameElm.html(devNameElm.text());
+        // Zeilenumbruch im Ger�tenamen
+        var devNameElm = jQuery("#tdn" + arDevices[i]['id']);
+        devNameElm.html(devNameElm.text());
 
-}
+      }
 
 
-Groups.createGroupButtons(arDevInInbox);
+      Groups.createGroupButtons(arDevInInbox);
 
-if (NAV_IE) {
-  var tr = Builder.node('tr');
-  Element.addClassName(tr, "CLASS04309");
-  for (var i = 0; i < 15; i++) {
-    var td = Builder.node('td', {}, ".");
-    Element.addClassName(td, "CLASS04310");
-    tr.appendChild(td);
-  }
-  $("tblNewDevices").appendChild(tr);
-}
-</script>
-</tbody>
-</table>
-<br/><br/><br/><br/><br/><br/><br/>
-<br/><br/><br/><br/><br/><br/><br/>
+      if (NAV_IE) {
+        var tr = Builder.node('tr');
+        Element.addClassName(tr, "CLASS04309");
+        for (var i = 0; i < 15; i++) {
+          var td = Builder.node('td', {}, ".");
+          Element.addClassName(td, "CLASS04310");
+          tr.appendChild(td);
+        }
+        $("tblNewDevices").appendChild(tr);
+      }
+    </script>
+    </tbody>
+  </table>
+  <br/><br/><br/><br/><br/><br/><br/>
+  <br/><br/><br/><br/><br/><br/><br/>
 </div>
 <div class="RoomFuncChooser CLASS04311" id="roomOverlay" style="display:none;"></div>
 <div class="RoomFuncChooser CLASS04311" id="funcOverlay" style="display:none;"></div>
 <script type="text/javascript">
-iseRooms.buildRoomOverlay();
-iseFunctions.buildFuncOverlay();
-/* * * * * * * Expand / Collapse  * * * * * * * * * * * * * * * * * * * */
-var iDevicesExpanded = 0;
-expandDevice = function (id, arIdx, bAutoExpandGroups) {
-  // Ausklappen
-  if ($("img" + id).alt == "plus") {
-    if (!bEIP) {
-      arDevices[arIdx]['expanded'] = true;
-      $("img" + id).src = "/ise/img/minus.png";
-      $("img" + id).alt = "minus";
-      Cursor.set(Cursor.WAIT);
-      if (arDevices[arIdx]['loaded']) {
-        for (var i = 0; i < arDevices[arIdx]['chns'].length; i++) {
-          show(arDevices[arIdx]['chns'][i]['trid']);
-          // show picture for row
-          show('picDiv' + arDevices[arIdx]['chns'][i]['id']);
-        }
-        for (var i = 0; i < arDevices[arIdx]['chnsgr'].length; i++) {
-          show(arDevices[arIdx]['chnsgr'][i]['trid']);
-          // show picture for row
-          show('picDiv' + arDevices[arIdx]['chnsgr'][i][0]['id'] + arDevices[arIdx]['chnsgr'][i][1]['id']);
-          if (bAutoExpandGroups) {
-            expandGroup(arDevices[arIdx]['id'],
-              arDevices[arIdx]['chnsgr'][i][0]['id'],
-              arDevices[arIdx]['chnsgr'][i][1]['id']);
+  iseRooms.buildRoomOverlay();
+  iseFunctions.buildFuncOverlay();
+  /* * * * * * * Expand / Collapse  * * * * * * * * * * * * * * * * * * * */
+  var iDevicesExpanded = 0;
+  expandDevice = function (id, arIdx, bAutoExpandGroups) {
+    // Ausklappen
+    if ($("img" + id).alt == "plus") {
+      if (!bEIP) {
+        arDevices[arIdx]['expanded'] = true;
+        $("img" + id).src = "/ise/img/minus.png";
+        $("img" + id).alt = "minus";
+        Cursor.set(Cursor.WAIT);
+        if (arDevices[arIdx]['loaded']) {
+          for (var i = 0; i < arDevices[arIdx]['chns'].length; i++) {
+            show(arDevices[arIdx]['chns'][i]['trid']);
+            // show picture for row
+            show('picDiv' + arDevices[arIdx]['chns'][i]['id']);
+          }
+          for (var i = 0; i < arDevices[arIdx]['chnsgr'].length; i++) {
+            show(arDevices[arIdx]['chnsgr'][i]['trid']);
+            // show picture for row
+            show('picDiv' + arDevices[arIdx]['chnsgr'][i][0]['id'] + arDevices[arIdx]['chnsgr'][i][1]['id']);
+            if (bAutoExpandGroups) {
+              expandGroup(arDevices[arIdx]['id'],
+                arDevices[arIdx]['chnsgr'][i][0]['id'],
+                arDevices[arIdx]['chnsgr'][i][1]['id']);
+            }
           }
+          iDevicesExpanded++;
+          Cursor.set(Cursor.NORMAL);
+        }
+        else {
+          var pb = "";
+          pb += "integer devid = " + id + ";";
+          pb += "integer arIdx = " + arIdx + ";";
+          pb += "integer insIdx = " + arDevPosis[arIdx] + ";";
+          if (bAutoExpandGroups)
+            pb += "boolean bAutoExpGr = true;";
+          else
+            pb += "boolean bAutoExpGr = false;";
+          bEIP = true;
+          var opts = {
+            evalScripts: true,
+            postBody: pb,
+            asynchronous: false,
+            onComplete: function () {
+              arDevices[arIdx]['loaded'] = true;
+            }
+          };
+          new Ajax.Updater("dummy", "/pages/tabs/admin/views/newDeviceLoader.htm?sid=" + SessionId, opts);
+          iDevicesExpanded++;
         }
-        iDevicesExpanded++;
-        Cursor.set(Cursor.NORMAL);
       }
       else {
-        var pb = "";
-        pb += "integer devid = " + id + ";";
-        pb += "integer arIdx = " + arIdx + ";";
-        pb += "integer insIdx = " + arDevPosis[arIdx] + ";";
+        var s = "false";
         if (bAutoExpandGroups)
-          pb += "boolean bAutoExpGr = true;";
-        else
-          pb += "boolean bAutoExpGr = false;";
-        bEIP = true;
-        var opts = {
-          evalScripts: true,
-          postBody: pb,
-          asynchronous: false,
-          onComplete: function () {
-            arDevices[arIdx]['loaded'] = true;
-          }
-        };
-        new Ajax.Updater("dummy", "/pages/tabs/admin/views/newDeviceLoader.htm?sid=" + SessionId, opts);
-        iDevicesExpanded++;
+          s = "true";
+        window.setTimeout("expandDevice(" + id + "," + arIdx + ", " + s + ")", 500);
       }
     }
+    // Einklappen
     else {
-      var s = "false";
-      if (bAutoExpandGroups)
-        s = "true";
-      window.setTimeout("expandDevice(" + id + "," + arIdx + ", " + s + ")", 500);
+      $("img" + id).src = "/ise/img/plus.png";
+      $("img" + id).alt = "plus";
+      arDevices[arIdx]['expanded'] = false;
+      for (var i = 0; i < arDevices[arIdx]['chns'].length; i++) {
+        hide("" + arDevices[arIdx]['id'] + arDevices[arIdx]['chns'][i]['id']);
+        // arDevices[arIdx]['chns'][i]['id'] -> id des Channels
+        // hide picture for row
+        hide('picDiv' + arDevices[arIdx]['chns'][i]['id']);
+      }
+      for (var i = 0; i < arDevices[arIdx]['chnsgr'].length; i++) {
+        // arDevices[arIdx]['chnsgr'][i][0]['id'] -> id des Channels in der channel group 0
+        // hide picture for row
+        hide('picDiv' + arDevices[arIdx]['chnsgr'][i][0]['id'] + arDevices[arIdx]['chnsgr'][i][1]['id']);
+        collapseGroup(arDevices[arIdx]['id'], arDevices[arIdx]['chnsgr'][i][0]['id'], arDevices[arIdx]['chnsgr'][i][1]['id'], false);
+      }
+      iDevicesExpanded--;
     }
-  }
-  // Einklappen
-  else {
-    $("img" + id).src = "/ise/img/plus.png";
-    $("img" + id).alt = "plus";
-    arDevices[arIdx]['expanded'] = false;
-    for (var i = 0; i < arDevices[arIdx]['chns'].length; i++) {
-      hide("" + arDevices[arIdx]['id'] + arDevices[arIdx]['chns'][i]['id']);
-      // arDevices[arIdx]['chns'][i]['id'] -> id des Channels
-      // hide picture for row
-      hide('picDiv' + arDevices[arIdx]['chns'][i]['id']);
+    refreshFooterButton();
+  };
+
+  expandGroup = function (devId, id1, id2) {
+    if ($("img" + id1 + id2).alt == "plus") {
+      $("img" + id1 + id2).src = "/ise/img/minus.png";
+      $("img" + id1 + id2).alt = "minus";
+      show("" + devId + id1 + id2 + "1");
+      show("" + devId + id1 + id2 + "2");
+      // show channel picture pictures
+      show('picDiv' + id1);
+      show('picDiv' + id2);
     }
-    for (var i = 0; i < arDevices[arIdx]['chnsgr'].length; i++) {
-      // arDevices[arIdx]['chnsgr'][i][0]['id'] -> id des Channels in der channel group 0
-      // hide picture for row
-      hide('picDiv' + arDevices[arIdx]['chnsgr'][i][0]['id'] + arDevices[arIdx]['chnsgr'][i][1]['id']);
-      collapseGroup(arDevices[arIdx]['id'], arDevices[arIdx]['chnsgr'][i][0]['id'], arDevices[arIdx]['chnsgr'][i][1]['id'], false);
+    // Einklappen
+    else {
+      collapseGroup(devId, id1, id2, true);
     }
-    iDevicesExpanded--;
-  }
-  refreshFooterButton();
-};
-
-expandGroup = function (devId, id1, id2) {
-  if ($("img" + id1 + id2).alt == "plus") {
-    $("img" + id1 + id2).src = "/ise/img/minus.png";
-    $("img" + id1 + id2).alt = "minus";
-    show("" + devId + id1 + id2 + "1");
-    show("" + devId + id1 + id2 + "2");
-    // show channel picture pictures
-    show('picDiv' + id1);
-    show('picDiv' + id2);
-  }
-  // Einklappen
-  else {
-    collapseGroup(devId, id1, id2, true);
-  }
-};
+  };
 
-collapseGroup = function (devId, id1, id2, subsOnly) {
-  if ($("img" + id1 + id2)) {
-    $("img" + id1 + id2).src = "/ise/img/plus.png";
-    $("img" + id1 + id2).alt = "plus";
-  }
-  if (!subsOnly)
-    hide("" + devId + id1 + id2);
-  hide("" + devId + id1 + id2 + "1");
-  hide("" + devId + id1 + id2 + "2");
-  // hide channel pictures
-  hide('picDiv' + id1);
-  hide('picDiv' + id2);
-};
-
-collapseAll = function () {
-  var pb = "integer iNewOnly = 0;";
-  if (iDevicesExpanded == 0) {
-    for (var i = 0; i < arDevices.length; i++) {
-      expandDevice(arDevices[i]['id'], i, true);
-    }
-  }
-  else {
-    for (var i = 0; i < arSubIds.length; i++) {
-      $(arSubIds[i]).hide();
+  collapseGroup = function (devId, id1, id2, subsOnly) {
+    if ($("img" + id1 + id2)) {
+      $("img" + id1 + id2).src = "/ise/img/plus.png";
+      $("img" + id1 + id2).alt = "plus";
     }
-    for (var i = 0; i < arImgIds.length; i++) {
-      $(arImgIds[i]).src = "/ise/img/plus.png";
-      $(arImgIds[i]).alt = "plus";
+    if (!subsOnly)
+      hide("" + devId + id1 + id2);
+    hide("" + devId + id1 + id2 + "1");
+    hide("" + devId + id1 + id2 + "2");
+    // hide channel pictures
+    hide('picDiv' + id1);
+    hide('picDiv' + id2);
+  };
+
+  collapseAll = function () {
+    var pb = "integer iNewOnly = 0;";
+    if (iDevicesExpanded == 0) {
+      for (var i = 0; i < arDevices.length; i++) {
+        expandDevice(arDevices[i]['id'], i, true);
+      }
     }
-    for (var i = 0; i < arDevices.length; i++) {
-      arDevices[i]['expanded'] = false;
-      if (arDevices[i]['chns']) {
-        for (var x = 0; x < arDevices[i]['chns'].length; x++) {
-          hide('picDiv' + arDevices[i]['chns'][x]['id']);
-        }
+    else {
+      for (var i = 0; i < arSubIds.length; i++) {
+        $(arSubIds[i]).hide();
       }
-      if (arDevices[i]['chnsgr']) {
-        for (var x = 0; x < arDevices[i]['chnsgr'].length; x++) {
-          collapseGroup(arDevices[i]['id'], arDevices[i]['chnsgr'][x][0]['id'], arDevices[i]['chnsgr'][x][1]['id'], false);
-          hide('picDiv' + arDevices[i]['chnsgr'][x][0]['id'] + arDevices[i]['chnsgr'][x][1]['id']);
+      for (var i = 0; i < arImgIds.length; i++) {
+        $(arImgIds[i]).src = "/ise/img/plus.png";
+        $(arImgIds[i]).alt = "plus";
+      }
+      for (var i = 0; i < arDevices.length; i++) {
+        arDevices[i]['expanded'] = false;
+        if (arDevices[i]['chns']) {
+          for (var x = 0; x < arDevices[i]['chns'].length; x++) {
+            hide('picDiv' + arDevices[i]['chns'][x]['id']);
+          }
+        }
+        if (arDevices[i]['chnsgr']) {
+          for (var x = 0; x < arDevices[i]['chnsgr'].length; x++) {
+            collapseGroup(arDevices[i]['id'], arDevices[i]['chnsgr'][x][0]['id'], arDevices[i]['chnsgr'][x][1]['id'], false);
+            hide('picDiv' + arDevices[i]['chnsgr'][x][0]['id'] + arDevices[i]['chnsgr'][x][1]['id']);
+          }
         }
       }
+      iDevicesExpanded = 0;
     }
-    iDevicesExpanded = 0;
-  }
-  refreshFooterButton();
-};
-
-editRooms = function () {
-  dlgPopup = new iseMessageBox(ID_ROOMS);
-  PopupClose = function () {
-    dlgPopup.hide();
-    iseRooms.buildRoomOverlay();
+    refreshFooterButton();
+  };
+
+  editRooms = function () {
+    dlgPopup = new iseMessageBox(ID_ROOMS);
+    PopupClose = function () {
+      dlgPopup.hide();
+      iseRooms.buildRoomOverlay();
+    };
+    dlgPopup.ShowPopup();
   };
-  dlgPopup.ShowPopup();
-};
-editFuncs = function () {
-  dlgPopup = new iseMessageBox(ID_FUNCTIONS);
-  PopupClose = function () {
-    dlgPopup.hide();
-    iseFunctions.buildFuncOverlay();
+  editFuncs = function () {
+    dlgPopup = new iseMessageBox(ID_FUNCTIONS);
+    PopupClose = function () {
+      dlgPopup.hide();
+      iseFunctions.buildFuncOverlay();
+    };
+    dlgPopup.ShowPopup();
   };
-  dlgPopup.ShowPopup();
-};
 
-renameAllNamesDialog = function(devId) {
+  renameAllNamesDialog = function(devId) {
 
-  var url = '/pages/msg/askRenameAllChannels.htm?sid=' + SessionId;
-  var opt =
-  {
-    onComplete: function (t) {
-      var selectedVal = "";
-      var dlg = new YesNoDialog("", t.responseText, function(result) {
+    var url = '/pages/msg/askRenameAllChannels.htm?sid=' + SessionId;
+    var opt =
+      {
+        onComplete: function (t) {
+          var selectedVal = "";
+          var dlg = new YesNoDialog("", t.responseText, function(result) {
 
-        if (result) {
-            //var val = jQuery("input[name='allChannels']:checked").val();
-            renameDeviceDialog(devId, selectedVal);
-        }
-      }, "html");
+            if (result) {
+              //var val = jQuery("input[name='allChannels']:checked").val();
+              renameDeviceDialog(devId, selectedVal);
+            }
+          }, "html");
 
-      selectedVal = jQuery("input[name='allChannels']:checked").val();
-      jQuery("input[name='allChannels']").change(function() {selectedVal = this.value;});
+          selectedVal = jQuery("input[name='allChannels']:checked").val();
+          jQuery("input[name='allChannels']").change(function() {selectedVal = this.value;});
 
-      dlg.setWidth(400);
-      dlg.btnTextYes(translateKey("btnNext"));
-      dlg.btnTextNo(translateKey("btnCancel"));
-    }
+          dlg.setWidth(400);
+          dlg.btnTextYes(translateKey("btnNext"));
+          dlg.btnTextNo(translateKey("btnCancel"));
+        }
+      };
+    new Ajax.Request(url, opt);
   };
-  new Ajax.Request(url, opt);
-};
-
-showBtnYes = function(value) {
-  if (value == "") {
-    renameDeviceDlg.btnYesHide();
-  } else {
-    renameDeviceDlg.btnYesShow();
-  }
 
-};
+  showBtnYes = function(value) {
+    if (value == "") {
+      renameDeviceDlg.btnYesHide();
+    } else {
+      renameDeviceDlg.btnYesShow();
+    }
 
-actualizePreviewChannelNames = function(value) {
+  };
 
-  if (typeof  actualizeChannelTimer != "undefined") {
-    clearTimeout(actualizeChannelTimer);
-  }
+  actualizePreviewChannelNames = function(value) {
 
-  actualizeChannelTimer = setTimeout(function() {
-    var channelRows = jQuery("[name='previewChannelName']"),
-      basisName = renameDeviceDlg.convertToValidBasicName(value);
+    if (typeof  actualizeChannelTimer != "undefined") {
+      clearTimeout(actualizeChannelTimer);
+    }
 
-    jQuery("#deviceBasisName").val(basisName);
+    actualizeChannelTimer = setTimeout(function() {
+      var channelRows = jQuery("[name='previewChannelName']"),
+        basisName = renameDeviceDlg.convertToValidBasicName(value);
 
-    if (basisName == "") {
-      renameDeviceDlg.btnYesHide();
-    } else {
-      renameDeviceDlg.btnYesShow();
-    }
+      jQuery("#deviceBasisName").val(basisName);
+
+      if (basisName == "") {
+        renameDeviceDlg.btnYesHide();
+      } else {
+        renameDeviceDlg.btnYesShow();
+      }
 
-    channelRows.each(function(index, elm) {
-      var arChannelName = jQuery(elm).html().split(":"),
-      newName = "";
-      // Set the new basis name
-      arChannelName[0] = value;
-      // Build the new name
-      arChannelName.each(function(val) {
-        newName += val +":";
+      channelRows.each(function(index, elm) {
+        var arChannelName = jQuery(elm).html().split(":"),
+          newName = "";
+        // Set the new basis name
+        arChannelName[0] = value;
+        // Build the new name
+        arChannelName.each(function(val) {
+          newName += val +":";
+        });
+        jQuery(elm).html(renameDeviceDlg.convertToValidBasicName(newName.slice(0,-1))); // slice removes the unnecessary ':' at the end of the new name
       });
-      jQuery(elm).html(renameDeviceDlg.convertToValidBasicName(newName.slice(0,-1))); // slice removes the unnecessary ':' at the end of the new name
-    });
-  },1000);
-};
-
-renameDeviceDialog = function(devId, allChannels) {
-  var url = '/pages/msg/renameDevice.htm?sid=' + SessionId;
-  var opt =
-  {
-    onComplete: function (t) {
-      renameDeviceDlg = new RenameDeviceDialog("", t.responseText, devId, allChannels, function(result) {
-        var self = this;
-        // Yes pressed
-        if (result) {
-
-          var newName = this.getNewDeviceName();
-          conInfo("renameDeviceDialog - Try to save the new name!");
-          homematic("Device.setName", {id: devId, name: newName.replace(/<[^>]*>/g, " ")}, function(result) {
-            conInfo("Device name successfully set to " + result);
-            //WebUI.enter(NewDeviceListPage);
-            jQuery("#tdn" + devId).html(result.replace(/:/g,":<br/>"));
-
-            if (allChannels == "true") {
-              conInfo("Now we should rename all available channels.");
-              var arChnObj = self.getNewChannelNames();
-
-              conInfo(arChnObj);
-
-              jQuery.each(arChnObj, function(index, chnObj) {
-                homematic("Channel.setName", {id: chnObj.id, name: chnObj.name.replace(/<[^>]*>/g, " ")},function(result) {
-                  conInfo("Channel "+chnObj.id+": name successfully set to " + result.replace(/:/g,":<br/>"));
-                  jQuery("#tdn" + chnObj.id).html(result.replace(/:/g,":<br/>"));
-                });
-              });
+    },1000);
+  };
 
+  renameDeviceDialog = function(devId, allChannels) {
+    var url = '/pages/msg/renameDevice.htm?sid=' + SessionId;
+    var opt =
+      {
+        onComplete: function (t) {
+          renameDeviceDlg = new RenameDeviceDialog("", t.responseText, devId, allChannels, function(result) {
+            var self = this;
+            // Yes pressed
+            if (result) {
+
+              var newName = this.getNewDeviceName();
+              conInfo("renameDeviceDialog - Try to save the new name!");
+              homematic("Device.setName", {id: devId, name: newName.replace(/<[^>]*>/g, " ")}, function(result) {
+                conInfo("Device name successfully set to " + result);
+                //WebUI.enter(NewDeviceListPage);
+                jQuery("#tdn" + devId).html(result.replace(/:/g,":<br/>"));
+
+                if (allChannels == "true") {
+                  conInfo("Now we should rename all available channels.");
+                  var arChnObj = self.getNewChannelNames();
+
+                  conInfo(arChnObj);
+
+                  jQuery.each(arChnObj, function(index, chnObj) {
+                    homematic("Channel.setName", {id: chnObj.id, name: chnObj.name.replace(/<[^>]*>/g, " ")},function(result) {
+                      conInfo("Channel "+chnObj.id+": name successfully set to " + result.replace(/:/g,":<br/>"));
+                      jQuery("#tdn" + chnObj.id).html(result.replace(/:/g,":<br/>"));
+                    });
+                  });
+
+                }
+              });
             }
-          });
+          }, "html");
+          renameDeviceDlg.resetHeight();
+          renameDeviceDlg.setWidth(600);
+          renameDeviceDlg.btnTextNo(translateKey("btnCancel"));
+          renameDeviceDlg.btnTextYes(translateKey("btnOk"));
         }
-      }, "html");
-      renameDeviceDlg.resetHeight();
-      renameDeviceDlg.setWidth(600);
-      renameDeviceDlg.btnTextNo(translateKey("btnCancel"));
-      renameDeviceDlg.btnTextYes(translateKey("btnOk"));
+      };
+    new Ajax.Request(url, opt);
+  };
+
+  refreshFooterButton = function () {
+    if (iDevicesExpanded == 0) {
+      $("btnStructure").innerHTML = translateKey('footerBtnOpenTree'); //"Baumstruktur<br />&ouml;ffnen";
+    }
+    else {
+      $("btnStructure").innerHTML = translateKey('footerBtnCloseTree'); //  "Baumstruktur schlie�en";
     }
   };
-  new Ajax.Request(url, opt);
-};
 
-refreshFooterButton = function () {
-  if (iDevicesExpanded == 0) {
-    $("btnStructure").innerHTML = translateKey('footerBtnOpenTree'); //"Baumstruktur<br />&ouml;ffnen";
-  }
-  else {
-    $("btnStructure").innerHTML = translateKey('footerBtnCloseTree'); //  "Baumstruktur schlie�en";
-  }
-};
+  var s = "";
 
-var s = "";
+  s += "<table cellspacing='8'>";
+  s += "<tr>";
+  s += "<td style='text-align:center; vertical-align: middle;'><div class='FooterButton' onclick='WebUI.goBack()'>" + translateKey('footerBtnPageBack') + "</div></td>";
+  s += "<td style='text-align:center; vertical-align: middle;'><div id='btnStructure' class='FooterButton CLASS04312' onclick='collapseAll()'>" + translateKey('footerBtnOpenTree') + "</div></td>";
+  s += "</tr>";
+  s += "</table>";
 
-s += "<table cellspacing='8'>";
-s += "<tr>";
-s += "<td style='text-align:center; vertical-align: middle;'><div class='FooterButton' onclick='WebUI.goBack()'>" + translateKey('footerBtnPageBack') + "</div></td>";
-s += "<td style='text-align:center; vertical-align: middle;'><div id='btnStructure' class='FooterButton CLASS04312' onclick='collapseAll()'>" + translateKey('footerBtnOpenTree') + "</div></td>";
-s += "</tr>";
-s += "</table>";
+  setFooter(s);
 
-setFooter(s);
+  NewDevSort = function (colName) {
+    updateContent("/pages/tabs/admin/views/newdevices.htm", null, "system.SetSessionVar('sessionLS', '" + colName + "');");
+  };
 
-NewDevSort = function (colName) {
-  updateContent("/pages/tabs/admin/views/newdevices.htm", null, "system.SetSessionVar('sessionLS', '" + colName + "');");
-};
+  GetChannelType = function (channel) {
+    return channel.channelType;
+  };
 
-GetChannelType = function (channel) {
-  return channel.channelType;
-};
+  CreateSysVar = function (name, type, value, chnID) {
+    if (typeof chnID === "undefined") {
+      chnID = -1;
+    }
+    switch (type) {
+      case "float" :
+        var minVal = 0,
+          maxVal = (1.7 * Math.pow(10, 308)) - 1; // Double in C++
+        return homematic("SysVar.createFloat", {"name": name, "minValue": minVal, "maxValue": maxVal, "internal": 1, "chnID": chnID}, function() {
+          if ((value != undefined) && (value != "")) {
+            homematic("SysVar.setFloat", {"name" : name, "value" : value});
+          }
+        });
+      case "boolean":
+        return homematic("SysVar.createBool", {"name": name, "init_val": false, "internal": 1, "chnID": chnID}, function() {
+          if ((value != undefined) && (value != "")) {
+            homematic("SysVar.setBool", {"name" : name, "value" : value});
+          }
+        });
+      case "enum":
+        return homematic("SysVar.createEnum", {"name": name, "valList": "val1,val2,val3", "internal": 1, "chnID": chnID}, function() {
+          if ((value != undefined) && (value != "")) {
+            homematic("SysVar.setEnum", {"name" : name, "valueList" : value});
+          }
+        });
+    }
+  };
 
-CreateSysVar = function (name, type, value, chnID) {
-  if (typeof chnID === "undefined") {
-    chnID = -1;
-  }
-  switch (type) {
-    case "float" :
-      var minVal = 0,
-        maxVal = (1.7 * Math.pow(10, 308)) - 1; // Double in C++
-      return homematic("SysVar.createFloat", {"name": name, "minValue": minVal, "maxValue": maxVal, "internal": 1, "chnID": chnID}, function() {
-        if ((value != undefined) && (value != "")) {
-          homematic("SysVar.setFloat", {"name" : name, "value" : value});
-        }
-      });
-    case "boolean":
-      return homematic("SysVar.createBool", {"name": name, "init_val": false, "internal": 1, "chnID": chnID}, function() {
-        if ((value != undefined) && (value != "")) {
-          homematic("SysVar.setBool", {"name" : name, "value" : value});
-        }
-      });
-    case "enum":
-      return homematic("SysVar.createEnum", {"name": name, "valList": "val1,val2,val3", "internal": 1, "chnID": chnID}, function() {
-        if ((value != undefined) && (value != "")) {
-          homematic("SysVar.setEnum", {"name" : name, "valueList" : value});
-        }
-      });
-  }
-};
-
-//Standard EnergyCounter
-CreateSysVarEnergyCounterScript = function(chn) {
-
-  var sysVarIds = getSysVarEnergyCounterIds(chn);
-  var sysVarId = sysVarIds.counterId,
-    sysVarOldValId = sysVarIds.tmpCounterId;
-
-  var updateScript =
-  "object chn = dom.GetObject('"+chn.id+"');\n" +
-  "object oBoot = chn.DPByControl('POWERMETER.BOOT');\n" +
-  "object oEnergyCounter = chn.DPByControl('POWERMETER.ENERGY_COUNTER');\n" +
-  "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
-  "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-
-  "boolean bootFlag = oBoot.Value();\n" +
-  "real devVal = oEnergyCounter.Value();\n" +
-  "real devValMax = oEnergyCounter.ValueMax();\n" +
-  "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
-  "real diffVal = 0.0;\n" +
-  "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
-  "integer tmp_devVal = (devVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-
-
-  "if (oldDevVal <= 0) {\n" +
-    "oSysVarEnergyCounterOldVal.State(devVal);\n" +
-    "oSysVarEnergyCounter.State(devVal);\n" +
-  "} else {\n" +
-    "if ( ( bootFlag == true ) && ( tmp_devVal < tmp_oldDevVal ) ) {\n" +
+  CreateMetaEnergyCounter = function(chn) {
+    /*
+      initialVal
+      Values for the last 30 days. The first 0 is yesterdy......
+      This is being used to store the values of the last 30 days.
+    */
+    var initialVal = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0";
+    homematic("Interface.setMetadata", {
+      "objectId" : chn.id,
+      "dataId" : "energyCounter30Days",
+      "value" : initialVal
+    });
+    homematic("Interface.setMetadata", {"objectId" : chn.id, "dataId" : "energy0","value" : 0}); // Today
+    homematic("Interface.setMetadata", {"objectId" : chn.id, "dataId" : "energy1","value" : 0}); // Yesterday
+    homematic("Interface.setMetadata", {"objectId" : chn.id, "dataId" : "energy7","value" : 0}); // 1 Week
+    homematic("Interface.setMetadata", {"objectId" : chn.id, "dataId" : "energy30","value" : 0}); // 1 Month
+  };
+
+  //Standard EnergyCounter
+  CreateSysVarEnergyCounterScript = function(chn) {
+
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oBoot = chn.DPByControl('POWERMETER.BOOT');\n" +
+      "object oEnergyCounter = chn.DPByControl('POWERMETER.ENERGY_COUNTER');\n" +
+      "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+      "boolean bootFlag = oBoot.Value();\n" +
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 100000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
+
+
+      "if (oldDevVal <= 0) {\n" +
+      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+      "oSysVarEnergyCounter.State(devVal);\n" +
+      "} else {\n" +
+      "if ( ( bootFlag == true ) && ( tmp_devVal < tmp_oldDevVal ) ) {\n" +
       "diffVal = devVal;\n" +
-    "} else {\n" +
+      "} else {\n" +
       "if (tmp_devVal >= tmp_oldDevVal) {\n" +
-        "diffVal = devVal - oldDevVal;\n" +
+      "diffVal = devVal - oldDevVal;\n" +
       "}\n"+
 
       "if ((tmp_devVal > 0) && (tmp_devVal < tmp_oldDevVal)) {\n" +
-        "diffVal = (devVal + devValMax) - oldDevVal;\n" +
+      "diffVal = (devVal + devValMax) - oldDevVal;\n" +
       "}\n" +
-    "}\n"+
-    "if (devVal > 0) {\n" +
+      "}\n"+
+      "if (devVal > 0) {\n" +
       "oSysVarEnergyCounterOldVal.State(devVal);\n" +
-    "}\n" +
-    "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
-  "}\n";
-
-  var script =
-  "var sysVarId = '"+sysVarId+"';\n" +
-  "var channel = dom.GetObject('"+chn.id+"');\n" +
-  "var channelId = channel.ID();\n" +
-  "var paramId = channel.DPByControl('POWERMETER.ENERGY_COUNTER').ID();\n"+
-  "var _script = \""+updateScript+"\";\n" +
-
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
-
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
-
-
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
-
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(9);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtObjectId);"+
-  "singleCondition.LeftVal(paramId);"+
-  "singleCondition.RightVal1ValType(ivtFloat);"+
-  "singleCondition.RightVal1(0.0);"+
-  "singleCondition.RightVal2ValType(ivtFloat);"+
-  "singleCondition.RightVal2(0.0);"+
-
-  "singleCondition.ConditionChannel(channelId);"+
-
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
-
-  "program.Active(true);"+
-  "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-// Current/Gas EnergyCounter
-CreateSysVarEnergyCounterScriptIGL = function (chn, channelType, sensorType) {
-
-  var sysVarIds = (sensorType == "CURRENT") ? getSysVarEnergyCounterIds(chn) : getSysVarEnergyCounterGasIds(chn);
-  var sysVarId = sysVarIds.counterId,
-    sysVarOldValId = sysVarIds.tmpCounterId;
-
-  var counter = (sensorType == "CURRENT") ? "ENERGY_COUNTER" : "GAS_ENERGY_COUNTER";
-  var prgNameExtension = (counter == "ENERGY_COUNTER") ? "" : "GAS";
-
-  var updateScript =
-    "object chn = dom.GetObject('" + chn.id + "');\n" +
-    "object oBoot = chn.DPByControl('" + channelType + ".BOOT');\n" +
-    "object oEnergyCounter = chn.DPByControl('" + channelType + "." + counter + "');\n" +
-    "object oSysVarEnergyCounter = dom.GetObject('" + sysVarId + "');\n" +
-    "object oSysVarEnergyCounterOldVal = dom.GetObject('" + sysVarOldValId + "');\n" +
-    "object oSysVarEnergyCounterResetPressed = dom.GetObject('" + sysVarId + "_RESET');\n" +
-    "object oSysVarEnergyCounterTmpOldVal = dom.GetObject('" + sysVarId + "_TMP_OLDVAL');\n" +
-    "object oSysVarEnergyCounterDeviceReset = dom.GetObject('" + sysVarId + "_DEVICE_RESET');\n" +
-
-    "boolean bootFlag = oBoot.Value();\n" +
-    "real devVal = oEnergyCounter.Value();\n" +
-    "real devValMax = oEnergyCounter.ValueMax();\n" +
-    "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
-    "real tmpOldDevVal = oSysVarEnergyCounterTmpOldVal.Value();\n" +
-    "integer ioldDevVal = (tmpOldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-    "real diffVal = 0.0;\n" +
-    "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
-    "integer tmp_devVal = (devVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-    "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-
-    "if ( oBoot.Value() == true ) {\n" +
-    "   oSysVarEnergyCounterDeviceReset.State(true);\n" +
-    "   if (ioldDevVal <= 0) {\n" +
-    "     oSysVarEnergyCounter.State(0);\n" +
-    "   }\n" +
-    "} else {\n" +
-    "   boolean resetPressed = oSysVarEnergyCounterResetPressed.Value();\n" +
-    "   ! boolean devReset = oSysVarEnergyCounterDeviceReset.Value();\n" +
-    "   if ( (resetPressed == true) && (oSysVarEnergyCounterDeviceReset.Value() == true) ) {\n" +
-    "       oSysVarEnergyCounterTmpOldVal.State(0);\n" +
-    "       tmpOldDevVal = 0;\n" +
-    "   }\n" +
-    "  !Normales Hochzaehlen. Geraetwert > vorheriger Wert\n" +
-    "  if ((tmp_devVal >= tmp_oldDevVal) && (oSysVarEnergyCounterDeviceReset.Value() == false)) {\n" +
-    "   if (resetPressed == false) {\n" +
-    "      diffVal = oEnergyCounter.Value() - oldDevVal;\n" +
-    "    } else {\n" +
-    "      !Reset pressed\n" +
-    "      diffVal = oEnergyCounter.Value() - tmpOldDevVal;\n" +
-    "      if ((diffVal.ToString().ToFloat() * 100000).ToInteger() < 0 ) {\n" +
-    "		     diffVal = oEnergyCounter.Value();\n" +
-    "      }\n" +
-    "      oSysVarEnergyCounterResetPressed.State(0);\n" +
-    "    }\n" +
-    "  } else {\n" +
-    "    !Geraetewert ist kleiner vorheriger Wert\n" +
-    "   !Entweder Ueberlauf, oder Batterietausch\n" +
-    "    if (oSysVarEnergyCounterDeviceReset.Value() == false) {\n" +
-    "      !Normaler Geraeteueberlauf\n" +
-    "      if(tmp_devVal > 0) {\n" +
-    "         diffVal = (oEnergyCounter.Value() + devValMax) - oldDevVal;\n" +
-    "      }\n" +
-    "    } else {\n" +
-    "         !Zaehle Geraetewert zum CCU-Zaehler\n" +
-    "          diffVal = oEnergyCounter.Value();\n" +
-    "          if ((diffVal.ToString().ToFloat() * 100000).ToInteger() == 0) {\n" +
-    "	            oSysVarEnergyCounterDeviceReset.State(true);\n" +
-    "           } else {\n" +
-    "            oSysVarEnergyCounterDeviceReset.State(false);\n" +
-    "          }\n" +
-    "    }\n" +
-    "  }\n" +
-    "  !Erhoehe den CCU-Zaehler\n" +
-    "  oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
-    "  oSysVarEnergyCounterOldVal.State(oEnergyCounter.Value());\n" +
-    "  oSysVarEnergyCounterTmpOldVal.State(oEnergyCounter.Value());\n" +
-    "}\n";
-
-  var script =
-    "var sysVarId = '" + sysVarId + "';\n" +
-    "var channel = dom.GetObject('" + chn.id + "');\n" +
-    "var channelId = channel.ID();\n" +
-    "var paramId = channel.DPByControl('" + channelType + "." + counter + "').ID();\n" +
-    "var _script = \"" + updateScript + "\";\n" +
-
-    "var DP_VALUE_CHECK_UPDATE = 13;" +
-
-    "var programs = dom.GetObject(ID_PROGRAMS);" +
-    "var program  = dom.CreateObject(OT_PROGRAM);" +
-    "program.Name('prgEnergyCounter" + prgNameExtension + "_" + chn.id + "_" + chn.address + "');" +
-    "program.Internal(true);" +
-    "programs.Add(program.ID());" +
-
-
-    "var rule = program.Rule();" +
-    "rule.RuleOperatorType(OPERATOR_NONE);" +
-
-    "var condition = rule.RuleAddCondition();" +
-    "condition.CndOperatorType(OPERATOR_NONE);" +
-
-    "var singleCondition = condition.CndAddSingle();" +
-    "singleCondition.OperatorType(OPERATOR_NONE);" +
-    "singleCondition.ConditionType(9);" +
-    "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);" +
-    "singleCondition.LeftValType(ivtObjectId);" +
-    "singleCondition.LeftVal(paramId);" +
-    "singleCondition.RightVal1ValType(ivtFloat);" +
-    "singleCondition.RightVal1(0.0);" +
-    "singleCondition.RightVal2ValType(ivtFloat);" +
-    "singleCondition.RightVal2(0.0);" +
-
-    "singleCondition.ConditionChannel(channelId);" +
-
-    "var destination = rule.RuleDestination();" +
-    "var action = destination.DestAddSingle();" +
-    "action.DestinationParam(ivtString);" +
-    "action.DestinationValueType(ivtString);" +
-    "action.DestinationValue(_script);" +
-
-    "program.Active(true);" +
-    "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-
-//HmIP-PSM EnergyCounter
-CreateSysVarEnergyCounterScriptPSM = function(chn) {
-
-  var sysVarIds = getSysVarEnergyCounterIds(chn);
-  var sysVarId = sysVarIds.counterId,
-    sysVarOldValId = sysVarIds.tmpCounterId;
-
-  var updateScript =
-  "object chn = dom.GetObject('"+chn.id+"');\n" +
-  "object oOverflow = chn.DPByControl('POWERMETER_PSM.ENERGY_COUNTER_OVERFLOW');\n" +
-  "object oEnergyCounter = chn.DPByControl('POWERMETER_PSM.ENERGY_COUNTER');\n" +
-  "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
-  "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-
-  "boolean overFlowFlag = oOverflow.Value();\n" +
-  "real devVal = oEnergyCounter.Value();\n" +
-  "real devValMax = oEnergyCounter.ValueMax();\n" +
-  "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
-  "real diffVal = 0.0;\n" +
-  "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
-  "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-
-
-  "if (overFlowFlag == false) {\n" +
-    "! Normal conditions\n" +
-    "if (tmp_oldDevVal <= tmp_devVal) {\n" +
-       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-
-    "! Device has rebooted\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
-       "diffVal = devVal;\n" +
-    "}\n"+
-
-  "} else {\n" +
-    "!overFlow is true\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "}\n" +
+      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+      "}\n";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('POWERMETER.ENERGY_COUNTER').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+  // Current/Gas EnergyCounter
+  CreateSysVarEnergyCounterScriptIGL = function (chn, channelType, sensorType) {
+
+    var sysVarIds = (sensorType == "CURRENT") ? getSysVarEnergyCounterIds(chn) : getSysVarEnergyCounterGasIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+
+    var counter = (sensorType == "CURRENT") ? "ENERGY_COUNTER" : "GAS_ENERGY_COUNTER";
+    var prgNameExtension = (counter == "ENERGY_COUNTER") ? "" : "GAS";
+
+    var updateScript =
+      "object chn = dom.GetObject('" + chn.id + "');\n" +
+      "object oBoot = chn.DPByControl('" + channelType + ".BOOT');\n" +
+      "object oEnergyCounter = chn.DPByControl('" + channelType + "." + counter + "');\n" +
+      "object oSysVarEnergyCounter = dom.GetObject('" + sysVarId + "');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('" + sysVarOldValId + "');\n" +
+      "object oSysVarEnergyCounterResetPressed = dom.GetObject('" + sysVarId + "_RESET');\n" +
+      "object oSysVarEnergyCounterTmpOldVal = dom.GetObject('" + sysVarId + "_TMP_OLDVAL');\n" +
+      "object oSysVarEnergyCounterDeviceReset = dom.GetObject('" + sysVarId + "_DEVICE_RESET');\n" +
+
+      "boolean bootFlag = oBoot.Value();\n" +
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real tmpOldDevVal = oSysVarEnergyCounterTmpOldVal.Value();\n" +
+      "integer ioldDevVal = (tmpOldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 100000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
+
+      "if ( oBoot.Value() == true ) {\n" +
+      "   oSysVarEnergyCounterDeviceReset.State(true);\n" +
+      "   if (ioldDevVal <= 0) {\n" +
+      "     oSysVarEnergyCounter.State(0);\n" +
+      "   }\n" +
+      "} else {\n" +
+      "   boolean resetPressed = oSysVarEnergyCounterResetPressed.Value();\n" +
+      "   ! boolean devReset = oSysVarEnergyCounterDeviceReset.Value();\n" +
+      "   if ( (resetPressed == true) && (oSysVarEnergyCounterDeviceReset.Value() == true) ) {\n" +
+      "       oSysVarEnergyCounterTmpOldVal.State(0);\n" +
+      "       tmpOldDevVal = 0;\n" +
+      "   }\n" +
+      "  !Normales Hochzaehlen. Geraetwert > vorheriger Wert\n" +
+      "  if ((tmp_devVal >= tmp_oldDevVal) && (oSysVarEnergyCounterDeviceReset.Value() == false)) {\n" +
+      "   if (resetPressed == false) {\n" +
+      "      diffVal = oEnergyCounter.Value() - oldDevVal;\n" +
+      "    } else {\n" +
+      "      !Reset pressed\n" +
+      "      diffVal = oEnergyCounter.Value() - tmpOldDevVal;\n" +
+      "      if ((diffVal.ToString().ToFloat() * 100000).ToInteger() < 0 ) {\n" +
+      "		     diffVal = oEnergyCounter.Value();\n" +
+      "      }\n" +
+      "      oSysVarEnergyCounterResetPressed.State(0);\n" +
+      "    }\n" +
+      "  } else {\n" +
+      "    !Geraetewert ist kleiner vorheriger Wert\n" +
+      "   !Entweder Ueberlauf, oder Batterietausch\n" +
+      "    if (oSysVarEnergyCounterDeviceReset.Value() == false) {\n" +
+      "      !Normaler Geraeteueberlauf\n" +
+      "      if(tmp_devVal > 0) {\n" +
+      "         diffVal = (oEnergyCounter.Value() + devValMax) - oldDevVal;\n" +
+      "      }\n" +
+      "    } else {\n" +
+      "         !Zaehle Geraetewert zum CCU-Zaehler\n" +
+      "          diffVal = oEnergyCounter.Value();\n" +
+      "          if ((diffVal.ToString().ToFloat() * 100000).ToInteger() == 0) {\n" +
+      "	            oSysVarEnergyCounterDeviceReset.State(true);\n" +
+      "           } else {\n" +
+      "            oSysVarEnergyCounterDeviceReset.State(false);\n" +
+      "          }\n" +
+      "    }\n" +
+      "  }\n" +
+      "  !Erhoehe den CCU-Zaehler\n" +
+      "  oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+      "  oSysVarEnergyCounterOldVal.State(oEnergyCounter.Value());\n" +
+      "  oSysVarEnergyCounterTmpOldVal.State(oEnergyCounter.Value());\n" +
+      "}\n";
+
+    var script =
+      "var sysVarId = '" + sysVarId + "';\n" +
+      "var channel = dom.GetObject('" + chn.id + "');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('" + channelType + "." + counter + "').ID();\n" +
+      "var _script = \"" + updateScript + "\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;" +
+
+      "var programs = dom.GetObject(ID_PROGRAMS);" +
+      "var program  = dom.CreateObject(OT_PROGRAM);" +
+      "program.Name('prgEnergyCounter" + prgNameExtension + "_" + chn.id + "_" + chn.address + "');" +
+      "program.Internal(true);" +
+      "programs.Add(program.ID());" +
+
+
+      "var rule = program.Rule();" +
+      "rule.RuleOperatorType(OPERATOR_NONE);" +
+
+      "var condition = rule.RuleAddCondition();" +
+      "condition.CndOperatorType(OPERATOR_NONE);" +
+
+      "var singleCondition = condition.CndAddSingle();" +
+      "singleCondition.OperatorType(OPERATOR_NONE);" +
+      "singleCondition.ConditionType(9);" +
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);" +
+      "singleCondition.LeftValType(ivtObjectId);" +
+      "singleCondition.LeftVal(paramId);" +
+      "singleCondition.RightVal1ValType(ivtFloat);" +
+      "singleCondition.RightVal1(0.0);" +
+      "singleCondition.RightVal2ValType(ivtFloat);" +
+      "singleCondition.RightVal2(0.0);" +
+
+      "singleCondition.ConditionChannel(channelId);" +
+
+      "var destination = rule.RuleDestination();" +
+      "var action = destination.DestAddSingle();" +
+      "action.DestinationParam(ivtString);" +
+      "action.DestinationValueType(ivtString);" +
+      "action.DestinationValue(_script);" +
+
+      "program.Active(true);" +
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+
+  //HmIP-PSM EnergyCounter
+  CreateSysVarEnergyCounterScriptPSM = function(chn) {
+
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oOverflow = chn.DPByControl('POWERMETER_PSM.ENERGY_COUNTER_OVERFLOW');\n" +
+      "object oEnergyCounter = chn.DPByControl('POWERMETER_PSM.ENERGY_COUNTER');\n" +
+      "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+      "boolean overFlowFlag = oOverflow.Value();\n" +
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+      "real energy0 = chn.MetaData('energy0').ToFloat();\n" +
+
+      "if (overFlowFlag == false) {\n" +
+      "! Normal conditions\n" +
+      "if (tmp_oldDevVal <= tmp_devVal) {\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+      "}\n" +
+
+      "! Device has rebooted\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "diffVal = devVal;\n" +
+      "}\n"+
+
+      "} else {\n" +
+      "!overFlow is true\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
       "! An device overflow has occured\n" +
       "diffVal = (devVal + devValMax) - oldDevVal;\n" +
-    "} else {\n" +
+      "} else {\n" +
       "! Once the overflow flag has been set it will only be false when the device reboots\n"+
       "! Therefore this is the normal condition after an device overflow\n" +
       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-  "}\n" +
-
-  "if (tmp_devVal != 0) {" +
-    "oSysVarEnergyCounterOldVal.State(devVal);\n" +
-    "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
-  "}";
-
-  var script =
-  "var sysVarId = '"+sysVarId+"';\n" +
-  "var channel = dom.GetObject('"+chn.id+"');\n" +
-  "var channelId = channel.ID();\n" +
-  "var paramId = channel.DPByControl('POWERMETER_PSM.ENERGY_COUNTER').ID();\n"+
-  "var _script = \""+updateScript+"\";\n" +
-
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
-
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
-
-
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
-
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(9);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtObjectId);"+
-  "singleCondition.LeftVal(paramId);"+
-  "singleCondition.RightVal1ValType(ivtFloat);"+
-  "singleCondition.RightVal1(0.0);"+
-  "singleCondition.RightVal2ValType(ivtFloat);"+
-  "singleCondition.RightVal2(0.0);"+
-
-  "singleCondition.ConditionChannel(channelId);"+
-
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
-
-  "program.Active(true);"+
-  "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-//POWERMETER_IEC1
-CreateSysVarEnergyCounterScriptIEC = function(chn) {
-
-  var sysVarIds = getSysVarEnergyCounterIECIds(chn);
-  var sysVarId = sysVarIds.counterId,
-    sysVarOldValId = sysVarIds.tmpCounterId;
-
-  var updateScript =
-  "object chn = dom.GetObject('"+chn.id+"');\n" +
-  "object oEnergyCounter = chn.DPByControl('POWERMETER_IEC1.IEC_ENERGY_COUNTER');\n" +
-  "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
-  "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-
-  "real devVal = oEnergyCounter.Value();\n" +
-  "real devValMax = oEnergyCounter.ValueMax();\n" +
-  "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
-  "real diffVal = 0.0;\n" +
-  "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
-  "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-
-
-    "!overFlow is true\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "}\n" +
+      "}\n" +
+
+      "if (tmp_devVal != 0) {" +
+      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+
+      "! Save todays energy consumption\n" +
+      "chn.MetaData('energy0',energy0 + diffVal);\n" +
+
+      "}";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('POWERMETER_PSM.ENERGY_COUNTER').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+  //POWERMETER_IEC1
+  CreateSysVarEnergyCounterScriptIEC = function(chn) {
+
+    var sysVarIds = getSysVarEnergyCounterIECIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oEnergyCounter = chn.DPByControl('POWERMETER_IEC1.IEC_ENERGY_COUNTER');\n" +
+      "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+
+      "!overFlow is true\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
       "! An device overflow has occured\n" +
       "diffVal = (devVal + devValMax) - oldDevVal;\n" +
-    "} else {\n" +
+      "} else {\n" +
       "! This is the normal condition\n" +
       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-
-  "if (tmp_devVal != 0) {" +
-    "oSysVarEnergyCounterOldVal.State(devVal);\n" +
-    "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
-  "}";
-
-  var script =
-  "var sysVarId = '"+sysVarId+"';\n" +
-  "var channel = dom.GetObject('"+chn.id+"');\n" +
-  "var channelId = channel.ID();\n" +
-  "var paramId = channel.DPByControl('POWERMETER_IEC1.IEC_ENERGY_COUNTER').ID();\n"+
-  "var _script = \""+updateScript+"\";\n" +
-
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
-
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgEnergyCounterIEC_"+ chn.id +"_"+chn.address+"');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
-
-
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
-
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(9);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtObjectId);"+
-  "singleCondition.LeftVal(paramId);"+
-  "singleCondition.RightVal1ValType(ivtFloat);"+
-  "singleCondition.RightVal1(0.0);"+
-  "singleCondition.RightVal2ValType(ivtFloat);"+
-  "singleCondition.RightVal2(0.0);"+
-
-  "singleCondition.ConditionChannel(channelId);"+
-
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
-
-  "program.Active(true);"+
-  "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-/*
-"sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
-"tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
-"sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
-"sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
-*/
-
-//HmIP-SWO-B -> (basic)
-CreateHmIPSunshineCounterScript = function(chn) {
-  conInfo("CreateHmIPSunshineCounterScript");
-  var sysVarIds = getSysVarRainSunshineCounterIds(chn, false);
-  var sysVarId = sysVarIds.sunshineCounterId,
-    sysVarOldValId = sysVarIds.tmpSunshineCounterId,
-
-    sysVarCounterTodayId = sysVarIds.sunshineCounterTodayId,
-    sysVarCounterYesterdayId = sysVarIds.sunshineCounterYesterdayId;
-
-  var updateScript =
-  "object chn = dom.GetObject('"+chn.id+"');\n" +
-  "object oOverflow = chn.DPByControl('WEATHER_TRANSMIT.SUNSHINEDURATION_OVERFLOW');\n" +
-  "object oSunshineCounter = chn.DPByControl('WEATHER_TRANSMIT.SUNSHINEDURATION');\n" +
-  "object oSysVarSunshine = dom.GetObject('"+sysVarId+"');\n" +
-  "object oSysVarSunshineOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-  "object oSysVarCounterToday =  dom.GetObject('"+sysVarCounterTodayId+"');\n" +
-  "object oSysVarCounterYesterday =  dom.GetObject('"+sysVarCounterYesterdayId+"');\n" +
-
-
-  "boolean overFlowFlag = oOverflow.Value();\n" +
-  "real devVal = oSunshineCounter.Value();\n" +
-  "real devValMax = oSunshineCounter.ValueMax();\n" +
-  "real oldDevVal = oSysVarSunshineOldVal.Value();\n" +
-  "real diffVal = 0.0;\n" +
-  "real sysVarVal = oSysVarSunshine.Value();\n" +
-
-  "real sysVarTodayVal = oSysVarCounterToday.Value();\n" +
-
-  "real todayTotal = 0.0;\n" +
-
-  "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-
-
-  "if (overFlowFlag == false) {\n" +
-    "! Normal conditions\n" +
-    "if (tmp_oldDevVal <= tmp_devVal) {\n" +
-       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-
-    "! Device has rebooted\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
-       "diffVal = devVal;\n" +
-    "}\n"+
-
-  "} else {\n" +
-    "!overFlow is true\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "}\n" +
+
+      "if (tmp_devVal != 0) {" +
+      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+      "}";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('POWERMETER_IEC1.IEC_ENERGY_COUNTER').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgEnergyCounterIEC_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+  //HmIP-ESI Counter ENERGY
+  CreateSysVarEnergyCounterScriptESI = function(chn) {
+
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oEnergyCounter = chn.DPByControl('POWERMETER_PSM.ENERGY_COUNTER');\n" +
+
+      "object oDevice = dom.GetObject(chn.Device());\n" +
+      "object oChnOne = dom.GetObject(oDevice.Channels().GetAt(1));\n" +
+      "object oChannelOperationMode = oChnOne.DPByControl('POWERMETER_PSM.CHANNEL_OPERATION_MODE');\n" +
+
+      "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+      "integer sensorType = oChannelOperationMode.Value();\n" +
+
+      "integer iecPrgFirstStart = chn.MetaData('iecPrgFirstStart');\n" +
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "real energy0 = chn.MetaData('energy0').ToFloat();\n" +
+
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "! An device overflow has occured\n" +
+      "! diffVal = (devVal + devValMax) - oldDevVal;\n" +
+      "} else {\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+      "}\n" +
+
+      "if (tmp_devVal != 0) {\n" +
+      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+
+      "! sensorType 0 = UNKNOWN, 1 = GAS, 2 = LED, 3 = IEC w/o protocol, > 3 = IEC....\n" +
+      "if ((sensorType > 3) && (iecPrgFirstStart == 1) ){\n" +
+      "chn.MetaData('iecPrgFirstStart', 0);\n" +
+      "chn.MetaData('energy0',0);\n" +
+
+      "string chnAddress = chn.Address();\n" +
+      "integer chnNumber = chnAddress.StrValueByIndex(':',1).ToInteger();\n" +
+      "if (chnNumber == 2) {chn.AddMetaData('startValA',tmp_devVal);}\n" +
+      "if (chnNumber == 3) {chn.AddMetaData('startValB',tmp_devVal);}\n" +
+      "if (chnNumber == 4) {chn.AddMetaData('startValC',tmp_devVal);}\n" +
+
+      "} else {\n" +
+      "! Save todays energy consumption\n" +
+      "if (sensorType != 3)  {\n" +
+      "chn.MetaData('energy0',energy0 + diffVal);\n" +
+      "}\n" +
+
+      "}\n" +
+      "}";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('POWERMETER_PSM.ENERGY_COUNTER').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+  //HmIP-ESI Counter GAS
+  CreateSysVarGasCounterScriptESI = function(chn) {
+
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var sysVarId = sysVarIds.counterId,
+      sysVarOldValId = sysVarIds.tmpCounterId;
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oEnergyCounter = chn.DPByControl('POWERMETER_PSM.GAS_VOLUME');\n" +
+      "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+      "real devVal = oEnergyCounter.Value();\n" +
+      "real devValMax = oEnergyCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+      "real energy0 = chn.MetaData('energy0').ToFloat();\n" +
+
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "! An device overflow has occured\n" +
+      "! diffVal = (devVal + devValMax) - oldDevVal;\n" +
+      "} else {\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+      "}\n" +
+
+      "if (tmp_devVal != 0) {" +
+      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
+
+      "! Save todays energy consumption\n" +
+      "chn.MetaData('energy0',energy0 + diffVal);\n" +
+      "}";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('POWERMETER_PSM.GAS_VOLUME').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgGasCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+
+  /*
+  "sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
+  "tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
+  "sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
+  "sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
+  */
+
+  //HmIP-SWO-B -> (basic)
+  CreateHmIPSunshineCounterScript = function(chn) {
+    conInfo("CreateHmIPSunshineCounterScript");
+    var sysVarIds = getSysVarRainSunshineCounterIds(chn, false);
+    var sysVarId = sysVarIds.sunshineCounterId,
+      sysVarOldValId = sysVarIds.tmpSunshineCounterId,
+
+      sysVarCounterTodayId = sysVarIds.sunshineCounterTodayId,
+      sysVarCounterYesterdayId = sysVarIds.sunshineCounterYesterdayId;
+
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oOverflow = chn.DPByControl('WEATHER_TRANSMIT.SUNSHINEDURATION_OVERFLOW');\n" +
+      "object oSunshineCounter = chn.DPByControl('WEATHER_TRANSMIT.SUNSHINEDURATION');\n" +
+      "object oSysVarSunshine = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarSunshineOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+      "object oSysVarCounterToday =  dom.GetObject('"+sysVarCounterTodayId+"');\n" +
+      "object oSysVarCounterYesterday =  dom.GetObject('"+sysVarCounterYesterdayId+"');\n" +
+
+
+      "boolean overFlowFlag = oOverflow.Value();\n" +
+      "real devVal = oSunshineCounter.Value();\n" +
+      "real devValMax = oSunshineCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarSunshineOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarSunshine.Value();\n" +
+
+      "real sysVarTodayVal = oSysVarCounterToday.Value();\n" +
+
+      "real todayTotal = 0.0;\n" +
+
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+
+      "if (overFlowFlag == false) {\n" +
+      "! Normal conditions\n" +
+      "if (tmp_oldDevVal <= tmp_devVal) {\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+      "}\n" +
+
+      "! Device has rebooted\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "diffVal = devVal;\n" +
+      "}\n"+
+
+      "} else {\n" +
+      "!overFlow is true\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
       "! An device overflow has occured\n" +
       "diffVal = (devVal + devValMax) - oldDevVal;\n" +
-    "} else {\n" +
+      "} else {\n" +
       "! Once the overflow flag has been set it will only be false when the device reboots\n"+
       "! Therefore this is the normal condition after an device overflow\n" +
       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-  "}\n" +
-
-  "if (tmp_devVal != 0) {\n" +
-    "oSysVarSunshineOldVal.State(devVal);\n" +
-    "oSysVarSunshine.State(sysVarVal + diffVal);\n"+
-  "}\n" +
-
-  "todayTotal = sysVarTodayVal + diffVal;\n" +
-  "if (todayTotal >= 1440.0) {todayTotal = 0.0;}\n" +
-  "oSysVarCounterToday.State(todayTotal);\n";
-
-  var script =
-  "var sysVarId = '"+sysVarId+"';\n" +
-  "var channel = dom.GetObject('"+chn.id+"');\n" +
-  "var channelId = channel.ID();\n" +
-  "var paramId = channel.DPByControl('WEATHER_TRANSMIT.ILLUMINATION').ID();\n"+
-  "var _script = \""+updateScript+"\";\n" +
-
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
-
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgSunshineCounter_"+ chn.id +"_"+chn.address+"');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
-
-
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
-
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(9);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtObjectId);"+
-  "singleCondition.LeftVal(paramId);"+
-  "singleCondition.RightVal1ValType(ivtFloat);"+
-  "singleCondition.RightVal1(0.0);"+
-  "singleCondition.RightVal2ValType(ivtFloat);"+
-  "singleCondition.RightVal2(0.0);"+
-
-  "singleCondition.ConditionChannel(channelId);"+
-
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
-
-  "program.Active(true);"+
-  "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-
-//HmIP-SWO-PL/PR -> (plus/pro)
-CreateHmIPRainCounterScript = function(chn) {
-  conInfo("CreateHmIPRainCounterScript");
-  var sysVarIds = getSysVarRainSunshineCounterIds(chn, true);
-  var sysVarId = sysVarIds.rainCounterId,
-    sysVarOldValId = sysVarIds.tmpRainCounterId,
-
-    sysVarCounterTodayId = sysVarIds.rainCounterTodayId,
-    sysVarCounterYesterdayId = sysVarIds.rainCounterYesterdayId;
-
-  var updateScript =
-  "object chn = dom.GetObject('"+chn.id+"');\n" +
-  "object oOverflow = chn.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER_OVERFLOW');\n" +
-  "object oRainCounter = chn.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER');\n" +
-  "object oSysVarRain = dom.GetObject('"+sysVarId+"');\n" +
-  "object oSysVarRainOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-  "object oSysVarCounterToday =  dom.GetObject('"+sysVarCounterTodayId+"');\n" +
-  "object oSysVarCounterYesterday =  dom.GetObject('"+sysVarCounterYesterdayId+"');\n" +
-
-
-  "boolean overFlowFlag = oOverflow.Value();\n" +
-  "real devVal = oRainCounter.Value();\n" +
-  "real devValMax = oRainCounter.ValueMax();\n" +
-  "real oldDevVal = oSysVarRainOldVal.Value();\n" +
-  "real diffVal = 0.0;\n" +
-  "real sysVarVal = oSysVarRain.Value();\n" +
-
-  "real sysVarTodayVal = oSysVarCounterToday.Value();\n" +
-  "real todayTotal = 0.0;\n" +
-
-  "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
-
-
-  "if (overFlowFlag == false) {\n" +
-    "! Normal conditions\n" +
-    "if (tmp_oldDevVal <= tmp_devVal) {\n" +
-       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-
-    "! Device has rebooted\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
-       "diffVal = devVal;\n" +
-    "}\n"+
-
-  "} else {\n" +
-    "!overFlow is true\n" +
-    "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "}\n" +
+      "}\n" +
+
+      "if (tmp_devVal != 0) {\n" +
+      "oSysVarSunshineOldVal.State(devVal);\n" +
+      "oSysVarSunshine.State(sysVarVal + diffVal);\n"+
+      "}\n" +
+
+      "todayTotal = sysVarTodayVal + diffVal;\n" +
+      "if (todayTotal >= 1440.0) {todayTotal = 0.0;}\n" +
+      "oSysVarCounterToday.State(todayTotal);\n";
+
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('WEATHER_TRANSMIT.ILLUMINATION').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgSunshineCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
+
+      "singleCondition.ConditionChannel(channelId);"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+
+  //HmIP-SWO-PL/PR -> (plus/pro)
+  CreateHmIPRainCounterScript = function(chn) {
+    conInfo("CreateHmIPRainCounterScript");
+    var sysVarIds = getSysVarRainSunshineCounterIds(chn, true);
+    var sysVarId = sysVarIds.rainCounterId,
+      sysVarOldValId = sysVarIds.tmpRainCounterId,
+
+      sysVarCounterTodayId = sysVarIds.rainCounterTodayId,
+      sysVarCounterYesterdayId = sysVarIds.rainCounterYesterdayId;
+
+    var updateScript =
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object oOverflow = chn.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER_OVERFLOW');\n" +
+      "object oRainCounter = chn.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER');\n" +
+      "object oSysVarRain = dom.GetObject('"+sysVarId+"');\n" +
+      "object oSysVarRainOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+      "object oSysVarCounterToday =  dom.GetObject('"+sysVarCounterTodayId+"');\n" +
+      "object oSysVarCounterYesterday =  dom.GetObject('"+sysVarCounterYesterdayId+"');\n" +
+
+
+      "boolean overFlowFlag = oOverflow.Value();\n" +
+      "real devVal = oRainCounter.Value();\n" +
+      "real devValMax = oRainCounter.ValueMax();\n" +
+      "real oldDevVal = oSysVarRainOldVal.Value();\n" +
+      "real diffVal = 0.0;\n" +
+      "real sysVarVal = oSysVarRain.Value();\n" +
+
+      "real sysVarTodayVal = oSysVarCounterToday.Value();\n" +
+      "real todayTotal = 0.0;\n" +
+
+      "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+      "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+
+      "if (overFlowFlag == false) {\n" +
+      "! Normal conditions\n" +
+      "if (tmp_oldDevVal <= tmp_devVal) {\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+      "}\n" +
+
+      "! Device has rebooted\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "diffVal = devVal;\n" +
+      "}\n"+
+
+      "} else {\n" +
+      "!overFlow is true\n" +
+      "if (tmp_oldDevVal > tmp_devVal) {\n" +
       "! An device overflow has occured\n" +
       "diffVal = (devVal + devValMax) - oldDevVal;\n" +
-    "} else {\n" +
+      "} else {\n" +
       "! Once the overflow flag has been set it will only be false when the device reboots\n"+
       "! Therefore this is the normal condition after an device overflow\n" +
       "diffVal = devVal - oldDevVal;\n" +
-    "}\n" +
-  "}\n" +
+      "}\n" +
+      "}\n" +
 
-  "if (tmp_devVal != 0) {\n" +
-    "oSysVarRainOldVal.State(devVal);\n" +
-    "oSysVarRain.State(sysVarVal + diffVal);\n"+
-  "}\n" +
+      "if (tmp_devVal != 0) {\n" +
+      "oSysVarRainOldVal.State(devVal);\n" +
+      "oSysVarRain.State(sysVarVal + diffVal);\n"+
+      "}\n" +
 
-  "todayTotal = sysVarTodayVal + diffVal;\n" +
-  "if (todayTotal >= 1440.0) {todayTotal = 0.0;}\n" +
-  "oSysVarCounterToday.State(todayTotal);\n";
+      "todayTotal = sysVarTodayVal + diffVal;\n" +
+      "if (todayTotal >= 1440.0) {todayTotal = 0.0;}\n" +
+      "oSysVarCounterToday.State(todayTotal);\n";
 
-  var script =
-  "var sysVarId = '"+sysVarId+"';\n" +
-  "var channel = dom.GetObject('"+chn.id+"');\n" +
-  "var channelId = channel.ID();\n" +
-  "var paramId = channel.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER').ID();\n"+
-  "var _script = \""+updateScript+"\";\n" +
+    var script =
+      "var sysVarId = '"+sysVarId+"';\n" +
+      "var channel = dom.GetObject('"+chn.id+"');\n" +
+      "var channelId = channel.ID();\n" +
+      "var paramId = channel.DPByControl('WEATHER_TRANSMIT.RAIN_COUNTER').ID();\n"+
+      "var _script = \""+updateScript+"\";\n" +
 
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
 
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgRainCounter_"+ chn.id +"_"+chn.address+"');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgRainCounter_"+ chn.id +"_"+chn.address+"');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
 
 
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
 
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
 
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(9);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtObjectId);"+
-  "singleCondition.LeftVal(paramId);"+
-  "singleCondition.RightVal1ValType(ivtFloat);"+
-  "singleCondition.RightVal1(0.0);"+
-  "singleCondition.RightVal2ValType(ivtFloat);"+
-  "singleCondition.RightVal2(0.0);"+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(9);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtObjectId);"+
+      "singleCondition.LeftVal(paramId);"+
+      "singleCondition.RightVal1ValType(ivtFloat);"+
+      "singleCondition.RightVal1(0.0);"+
+      "singleCondition.RightVal2ValType(ivtFloat);"+
+      "singleCondition.RightVal2(0.0);"+
 
-  "singleCondition.ConditionChannel(channelId);"+
+      "singleCondition.ConditionChannel(channelId);"+
 
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
 
-  "program.Active(true);"+
-  "dom.RTUpdate(0);";
+      "program.Active(true);"+
+      "dom.RTUpdate(0);";
 
-  homematic("ReGa.runScript", {"script": script});
-};
+    homematic("ReGa.runScript", {"script": script});
+  };
 
-CreateHmIPSunRainTodayYesterdayScript = function(chn) {
+  CreateHmIPSunRainTodayYesterdayScript = function(chn) {
 
-  var sysVarIds = getSysVarRainSunshineCounterIds(chn, true);
+    var sysVarIds = getSysVarRainSunshineCounterIds(chn, true);
 
-  var destinationScript =
+    var destinationScript =
 
-    "object chn = dom.GetObject('"+chn.id+"');\n" +
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
 
-    "object oSysVarSunshineCounterToday = dom.GetObject('"+sysVarIds.sunshineCounterTodayId+"');\n" +
-    "object oSysVarSunshineCounterYesterday = dom.GetObject('"+sysVarIds.sunshineCounterYesterdayId+"');\n" +
+      "object oSysVarSunshineCounterToday = dom.GetObject('"+sysVarIds.sunshineCounterTodayId+"');\n" +
+      "object oSysVarSunshineCounterYesterday = dom.GetObject('"+sysVarIds.sunshineCounterYesterdayId+"');\n" +
 
-    "object oSysVarRainCounterToday = dom.GetObject('"+sysVarIds.rainCounterTodayId+"');\n" +
-    "object oSysVarRainCounterYesterday = dom.GetObject('"+sysVarIds.rainCounterYesterdayId+"');\n" +
+      "object oSysVarRainCounterToday = dom.GetObject('"+sysVarIds.rainCounterTodayId+"');\n" +
+      "object oSysVarRainCounterYesterday = dom.GetObject('"+sysVarIds.rainCounterYesterdayId+"');\n" +
 
-    // 07:00 Uhr
-    // Setze Z�hler Sonne f�r Yesterday auf den Wert des Z�hlers f�r Today
-    "if (oSysVarSunshineCounterYesterday && oSysVarSunshineCounterToday) {oSysVarSunshineCounterYesterday.State(oSysVarSunshineCounterToday.Value());}" +
+      // 07:00 Uhr
+      // Setze Z�hler Sonne f�r Yesterday auf den Wert des Z�hlers f�r Today
+      "if (oSysVarSunshineCounterYesterday && oSysVarSunshineCounterToday) {oSysVarSunshineCounterYesterday.State(oSysVarSunshineCounterToday.Value());}" +
 
-    // Setze Tagesz�hler Sonne auf 0
+      // Setze Tagesz�hler Sonne auf 0
       "if (oSysVarSunshineCounterToday) {oSysVarSunshineCounterToday.State(0);}"+
 
-    // Setze Z�hler Regen f�r Yesterday auf den Wert des Z�hlers f�r Today
-    "if (oSysVarRainCounterYesterday && oSysVarRainCounterToday) {oSysVarRainCounterYesterday.State(oSysVarRainCounterToday.Value());}" +
-
-    // Setze Tagesz�hler Regen auf 0
-    "if (oSysVarRainCounterToday) {oSysVarRainCounterToday.State(0);}";
-
-  var script =
-
-  "var _script = \""+destinationScript+"\";\n" +
-
-  "var DP_VALUE_CHECK_UPDATE = 13;"+
-  "var TIMER_DAILY           = 9;"+
-  "var NOT_SET               = 0;"+
-
-  "var programs = dom.GetObject(ID_PROGRAMS);"+
-  "var program  = dom.CreateObject(OT_PROGRAM);"+
-  "program.Name('prgDailySunshineRainCounter_"+ chn.id + "');"+
-  "program.Internal(true);"+
-  "programs.Add(program.ID());"+
-
-  "var rule = program.Rule();"+
-  "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-  "var condition = rule.RuleAddCondition();"+
-  "condition.CndOperatorType(OPERATOR_NONE);"+
-
-  "var timeModule = dom.CreateObject(OT_CALENDARDP);"+
-  "dom.GetObject(ID_CALENDARDPS).Add(timeModule);"+
-  "timeModule.TimerType(TIMER_DAILY);"+
-  "timeModule.Time('2000-01-01 07:00:00');"+
-  "timeModule.CalDuration(NOT_SET);"+
-  "timeModule.CalRepeatTime(NOT_SET);"+
-  "timeModule.Weekdays(NOT_SET);"+
-  "timeModule.Period(NOT_SET);"+
-  "timeModule.CalRepetitionValue(NOT_SET);"+
-  "timeModule.Begin('2000-01-01 00:00:00');"+
-  "timeModule.End(NOT_SET);"+
-  "timeModule.CalRepetitionCount(NOT_SET);"+
-  "timeModule.SunOffsetType(NOT_SET);"+
-
-  "var singleCondition = condition.CndAddSingle();"+
-  "singleCondition.OperatorType(OPERATOR_NONE);"+
-  "singleCondition.ConditionType(3);"+
-  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-  "singleCondition.LeftValType(ivtCurrentDate);"+
-  "singleCondition.RightVal1ValType(ivtObjectId);"+
-  "singleCondition.RightVal1(timeModule.ID());"+
-
-  "var destination = rule.RuleDestination();"+
-  "var action = destination.DestAddSingle();"+
-  "action.DestinationParam(ivtString);"+
-  "action.DestinationValueType(ivtString);"+
-  "action.DestinationValue(_script);"+
-
-  "program.Active(true);"+
-
-  "dom.RTUpdate(0);";
-
-  homematic("ReGa.runScript", {"script": script});
-};
-
-getSysVarEnergyCounterIds = function (chn) {
-  return {"counterId": "svEnergyCounter_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterOldVal_" + chn.id};
-};
-
-getSysVarRainSunshineCounterIds = function (chn, hasRainSensor) {
-  var result;
-
-  if (hasRainSensor) {
-    result = {
-      "rainCounterId": "svHmIPRainCounter_" + chn.id + "_" + chn.address,
-      "tmpRainCounterId": "svHmIPRainCounterOldVal_" + chn.id,
-      "rainCounterYesterdayId": "svHmIPRainCounterYesterday_" + chn.id,
-      "rainCounterTodayId": "svHmIPRainCounterToday_" + chn.id,
-
-      "sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
-      "tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
-      "sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
-      "sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
-    };
-  } else {
-    result = {
-      "sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
-      "tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
-      "sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
-      "sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
-    };
-  }
+      // Setze Z�hler Regen f�r Yesterday auf den Wert des Z�hlers f�r Today
+      "if (oSysVarRainCounterYesterday && oSysVarRainCounterToday) {oSysVarRainCounterYesterday.State(oSysVarRainCounterToday.Value());}" +
+
+      // Setze Tagesz�hler Regen auf 0
+      "if (oSysVarRainCounterToday) {oSysVarRainCounterToday.State(0);}";
+
+    var script =
+
+      "var _script = \""+destinationScript+"\";\n" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+      "var TIMER_DAILY           = 9;"+
+      "var NOT_SET               = 0;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgDailySunshineRainCounter_"+ chn.id + "');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var timeModule = dom.CreateObject(OT_CALENDARDP);"+
+      "dom.GetObject(ID_CALENDARDPS).Add(timeModule);"+
+      "timeModule.TimerType(TIMER_DAILY);"+
+      "timeModule.Time('2000-01-01 07:00:00');"+
+      "timeModule.CalDuration(NOT_SET);"+
+      "timeModule.CalRepeatTime(NOT_SET);"+
+      "timeModule.Weekdays(NOT_SET);"+
+      "timeModule.Period(NOT_SET);"+
+      "timeModule.CalRepetitionValue(NOT_SET);"+
+      "timeModule.Begin('2000-01-01 00:00:00');"+
+      "timeModule.End(NOT_SET);"+
+      "timeModule.CalRepetitionCount(NOT_SET);"+
+      "timeModule.SunOffsetType(NOT_SET);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(3);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtCurrentDate);"+
+      "singleCondition.RightVal1ValType(ivtObjectId);"+
+      "singleCondition.RightVal1(timeModule.ID());"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
 
-  return result;
+  getSysVarEnergyCounterIds = function (chn) {
+    return {"counterId": "svEnergyCounter_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterOldVal_" + chn.id};
+  };
 
-};
+  getSysVarRainSunshineCounterIds = function (chn, hasRainSensor) {
+    var result;
+
+    if (hasRainSensor) {
+      result = {
+        "rainCounterId": "svHmIPRainCounter_" + chn.id + "_" + chn.address,
+        "tmpRainCounterId": "svHmIPRainCounterOldVal_" + chn.id,
+        "rainCounterYesterdayId": "svHmIPRainCounterYesterday_" + chn.id,
+        "rainCounterTodayId": "svHmIPRainCounterToday_" + chn.id,
+
+        "sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
+        "tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
+        "sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
+        "sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
+      };
+    } else {
+      result = {
+        "sunshineCounterId": "svHmIPSunshineCounter_" + chn.id + "_" + chn.address,
+        "tmpSunshineCounterId": "svHmIPSunshineCounterOldVal_" + chn.id,
+        "sunshineCounterYesterdayId": "svHmIPSunshineCounterYesterday_" + chn.id,
+        "sunshineCounterTodayId": "svHmIPSunshineCounterToday_" + chn.id
+      };
+    }
 
-getSysVarEnergyCounterGasIds = function (chn) {
-  return {"counterId": "svEnergyCounterGas_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterGasOldVal_" + chn.id};
-};
+    return result;
 
-getSysVarEnergyCounterIECIds = function (chn) {
-  return {"counterId": "svEnergyCounterIEC_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterIECOldVal_" + chn.id};
-};
+  };
 
-CheckAndCreateSysVarEnergyCounter = function(chn) {
-  var sysVarIds = getSysVarEnergyCounterIds(chn);
-  var SysVarEnergyCounterId = sysVarIds.counterId,
-   SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
+  getSysVarEnergyCounterGasIds = function (chn) {
+    return {"counterId": "svEnergyCounterGas_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterGasOldVal_" + chn.id};
+  };
 
-  var oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
+  getSysVarEnergyCounterIECIds = function (chn) {
+    return {"counterId": "svEnergyCounterIEC_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterIECOldVal_" + chn.id};
+  };
 
-  // SysVar svEnergyCounter_xxxx doesn�t exist
-  if (!oSysVarEnergyCounter) {
-    conInfo("create system variable: " + SysVarEnergyCounterId);
-    CreateSysVar(SysVarEnergyCounterId, "float");
-    CreateSysVar(SysVarEnergyCounterOldValId, "float");
-    if (chn.channelType == "ENERGIE_METER_TRANSMITTER") {
-      conInfo("CreateSysVarEnergyCounterScriptPSM");
-      CreateSysVarEnergyCounterScriptPSM(chn);
-    } else {
-      conInfo("CreateSysVarEnergyCounterScript");
-      CreateSysVarEnergyCounterScript(chn);
-    }
-    readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
-  }
-};
-
-//***
-CheckAndCreateSysVarEnergyCounterIEC = function(chn) {
-  conInfo("CheckAndCreateSysVarEnergyCounterIEC");
-  var sysVarIds = getSysVarEnergyCounterIECIds(chn);
-  var SysVarEnergyCounterId = sysVarIds.counterId,
-   SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
-
-   var oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
-
-  // SysVar svEnergyCounter_xxxx doesn�t exist
-  if (!oSysVarEnergyCounter) {
-    conInfo("create system variable: " + SysVarEnergyCounterId);
-    CreateSysVar(SysVarEnergyCounterId, "float");
-    CreateSysVar(SysVarEnergyCounterOldValId, "float");
-    conInfo("CreateSysVarEnergyCounterScriptIEC");
-    CreateSysVarEnergyCounterScriptIEC(chn);
-    readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
-  }
-};
-
-//***
-CheckAndCreateSysVarEnergyCounterIGL = function (chn, channelType) {
-  conInfo("CheckAndCreateSysVarEnergyCounterIGL");
-  var sysVarIds = getSysVarEnergyCounterIds(chn);
-  var SysVarEnergyCounterId = sysVarIds.counterId,
-    SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
-
-  var oSysVarEnergyCounter = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
-
-  // SysVar svEnergyCounter_xxxx doesn�t exist
-  if (!oSysVarEnergyCounter) {
-    conInfo("create system variable: " + SysVarEnergyCounterId);
-    CreateSysVar(SysVarEnergyCounterId, "float");
-    CreateSysVar(SysVarEnergyCounterOldValId, "float");
-    CreateSysVar(SysVarEnergyCounterId + "_RESET", "boolean");
-    CreateSysVar(SysVarEnergyCounterId + "_TMP_OLDVAL", "float");
-    CreateSysVar(SysVarEnergyCounterId + "_DEVICE_RESET", "boolean");
-    CreateSysVarEnergyCounterScriptIGL(chn, channelType, "CURRENT");
-    readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
-  }
-};
-
-CheckAndCreateSysVarEnergyCounterGasIGL = function (chn, channelType) {
-  conInfo("CheckAndCreateSysVarEnergyCounterGasIGL");
-  var sysVarIds = getSysVarEnergyCounterGasIds(chn);
-  var SysVarEnergyCounterId = sysVarIds.counterId,
-    SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
-
-  var oSysVarEnergyCounterGas = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
-
-  // SysVar svEnergyCounterGas_xxxx doesn�t exist
-  if (!oSysVarEnergyCounterGas) {
-    conInfo("create system variable: " + SysVarEnergyCounterId);
-    CreateSysVar(SysVarEnergyCounterId, "float");
-    CreateSysVar(SysVarEnergyCounterOldValId, "float");
-    CreateSysVar(SysVarEnergyCounterId + "_RESET", "boolean");
-    CreateSysVar(SysVarEnergyCounterId + "_TMP_OLDVAL", "float");
-    CreateSysVar(SysVarEnergyCounterId + "_DEVICE_RESET", "boolean");
-    CreateSysVarEnergyCounterScriptIGL(chn, channelType, "GAS");
-    readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
-  }
-};
+  CheckAndCreateSysVarEnergyCounter = function(chn) {
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var SysVarEnergyCounterId = sysVarIds.counterId,
+      SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
 
+    var oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
 
-CheckAndCreateSysVarHmIPRainSunshineCounter = function(chn, hasRainSensor) {
-  var sysVarIds = getSysVarRainSunshineCounterIds(chn, hasRainSensor);
+    // SysVar svEnergyCounter_xxxx doesn�t exist
+    if (!oSysVarEnergyCounter) {
+      conInfo("create system variable: " + SysVarEnergyCounterId);
+      CreateSysVar(SysVarEnergyCounterId, "float");
+      CreateSysVar(SysVarEnergyCounterOldValId, "float");
+      if (chn.channelType == "ENERGIE_METER_TRANSMITTER") {
 
-  var SysVarSunshineCounterId = sysVarIds.sunshineCounterId,
-    SysVarSunshineCounterOldValId = sysVarIds.tmpSunshineCounterId,
-    SysVarSunshineCounterYesterdayId = sysVarIds.sunshineCounterYesterdayId,
-    SysVarSunshineCounterTodayId = sysVarIds.sunshineCounterTodayId;
+        var chnLabel = "";
 
-  var sysVarSunshineCounter = homematic("SysVar.get", {"id": SysVarSunshineCounterId});
+        var regaScript = "object chn = dom.GetObject('"+chn.id+"');" +
+          "WriteLine(chn.Label());";
 
-  // sysVarSunshineCounter doesn't exist
-  if (!sysVarSunshineCounter) {
-    conInfo("create system variable: " + SysVarSunshineCounterId);
-    CreateSysVar(SysVarSunshineCounterId, "float");
-    conInfo("create system variable: " + SysVarSunshineCounterOldValId);
-    CreateSysVar(SysVarSunshineCounterOldValId, "float");
-    conInfo("create system variable: " + SysVarSunshineCounterYesterdayId);
-    CreateSysVar(SysVarSunshineCounterYesterdayId, "float", 0, chn.id);
-    conInfo("create system variable: " + SysVarSunshineCounterTodayId);
-    CreateSysVar(SysVarSunshineCounterTodayId, "float", 0, chn.id);
+        homematic("ReGa.runScript", {"script": regaScript}, function (response, error) {
+          chnLabel = response;
 
-    CreateHmIPSunshineCounterScript(chn);
+          if (chnLabel.indexOf('HmIP-ESI') !== -1) {
+            conInfo("CreateSysVarEnergyCounterScriptESI");
+            CreateSysVarEnergyCounterScriptESI(chn);
+            CreateSysVarGasCounterScriptESI(chn);
+            //Set the values of the last 31 days at midnight (00:00).
+            if (chn.index != 1) {
+              CreateMetaEnergyCounter(chn);
+              storeEnergyValuesAtMidnight(chn);
+            }
+          } else {
+            conInfo("CreateSysVarEnergyCounterScriptPSM");
+            CreateMetaEnergyCounter(chn);
+            CreateSysVarEnergyCounterScriptPSM(chn);
+            //Set the values of the last 31 days at midnight (00:00).
+            storeEnergyValuesAtMidnight(chn);
+          }
+        });
+      } else {
+        conInfo("CreateSysVarEnergyCounterScript");
+        CreateSysVarEnergyCounterScript(chn);
+      }
+      readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
+    }
+  };
 
-  }
+  //***
+  CheckAndCreateSysVarEnergyCounterIEC = function(chn) {
+    conInfo("CheckAndCreateSysVarEnergyCounterIEC");
+    var sysVarIds = getSysVarEnergyCounterIECIds(chn);
+    var SysVarEnergyCounterId = sysVarIds.counterId,
+      SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
+
+    var oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
+
+    // SysVar svEnergyCounter_xxxx doesn�t exist
+    if (!oSysVarEnergyCounter) {
+      conInfo("create system variable: " + SysVarEnergyCounterId);
+      CreateSysVar(SysVarEnergyCounterId, "float");
+      CreateSysVar(SysVarEnergyCounterOldValId, "float");
+      conInfo("CreateSysVarEnergyCounterScriptIEC");
+      CreateSysVarEnergyCounterScriptIEC(chn);
+      readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
+    }
+  };
 
-  if (hasRainSensor) {
-
-    var SysVarRainCounterId = sysVarIds.rainCounterId,
-      SysVarRainCounterOldValId = sysVarIds.tmpRainCounterId,
-      SysVarRainCounterYesterdayId = sysVarIds.rainCounterYesterdayId,
-      SysVarRainCounterTodayId = sysVarIds.rainCounterTodayId;
-
-    var sysVarRainCounter = homematic("SysVar.get", {"id": SysVarRainCounterId});
-    // sysVarRainCounter doesn't exist
-    if (!sysVarRainCounter) {
-      conInfo("create system variable: " + SysVarRainCounterId);
-      CreateSysVar(SysVarRainCounterId, "float");
-      conInfo("create system variable: " + SysVarRainCounterOldValId);
-      CreateSysVar(SysVarRainCounterOldValId, "float");
-      conInfo("create system variable: " + SysVarRainCounterYesterdayId);
-      CreateSysVar(SysVarRainCounterYesterdayId, "float", 0, chn.id);
-      conInfo("create system variable: " + SysVarRainCounterTodayId);
-      CreateSysVar(SysVarRainCounterTodayId, "float", 0, chn.id);
-      CreateHmIPRainCounterScript(chn);
+  //***
+  CheckAndCreateSysVarEnergyCounterIGL = function (chn, channelType) {
+    conInfo("CheckAndCreateSysVarEnergyCounterIGL");
+    var sysVarIds = getSysVarEnergyCounterIds(chn);
+    var SysVarEnergyCounterId = sysVarIds.counterId,
+      SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
+
+    var oSysVarEnergyCounter = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
+
+    // SysVar svEnergyCounter_xxxx doesn�t exist
+    if (!oSysVarEnergyCounter) {
+      conInfo("create system variable: " + SysVarEnergyCounterId);
+      CreateSysVar(SysVarEnergyCounterId, "float");
+      CreateSysVar(SysVarEnergyCounterOldValId, "float");
+      CreateSysVar(SysVarEnergyCounterId + "_RESET", "boolean");
+      CreateSysVar(SysVarEnergyCounterId + "_TMP_OLDVAL", "float");
+      CreateSysVar(SysVarEnergyCounterId + "_DEVICE_RESET", "boolean");
+      CreateSysVarEnergyCounterScriptIGL(chn, channelType, "CURRENT");
+      readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
     }
-  }
+  };
 
-  CreateHmIPSunRainTodayYesterdayScript(chn);
+  CheckAndCreateSysVarEnergyCounterGasIGL = function (chn, channelType) {
+    conInfo("CheckAndCreateSysVarEnergyCounterGasIGL");
+    var sysVarIds = getSysVarEnergyCounterGasIds(chn);
+    var SysVarEnergyCounterId = sysVarIds.counterId,
+      SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
+
+    var oSysVarEnergyCounterGas = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
+
+    // SysVar svEnergyCounterGas_xxxx doesn�t exist
+    if (!oSysVarEnergyCounterGas) {
+      conInfo("create system variable: " + SysVarEnergyCounterId);
+      CreateSysVar(SysVarEnergyCounterId, "float");
+      CreateSysVar(SysVarEnergyCounterOldValId, "float");
+      CreateSysVar(SysVarEnergyCounterId + "_RESET", "boolean");
+      CreateSysVar(SysVarEnergyCounterId + "_TMP_OLDVAL", "float");
+      CreateSysVar(SysVarEnergyCounterId + "_DEVICE_RESET", "boolean");
+      CreateSysVarEnergyCounterScriptIGL(chn, channelType, "GAS");
+      readEnergyCounter = true; // sorgt daf�r, da� die Liste der EnergyCounter aktualisiert wird.
+    }
+  };
 
-};
 
-CreateSysVarHmIPModRC8 = function(channel) {
+  CheckAndCreateSysVarHmIPRainSunshineCounter = function(chn, hasRainSensor) {
+    var sysVarIds = getSysVarRainSunshineCounterIds(chn, hasRainSensor);
 
-  var sysVarID =  "svHmIPModRC8ChnMode_" + channel.id + "_" + channel.address;
-  // Mode of the channels (not active(0), key(1), switch(2) or shuttercontact(3)
-  // The default is key
-  CreateSysVar(sysVarID, "enum", "1", channel.id);
-};
+    var SysVarSunshineCounterId = sysVarIds.sunshineCounterId,
+      SysVarSunshineCounterOldValId = sysVarIds.tmpSunshineCounterId,
+      SysVarSunshineCounterYesterdayId = sysVarIds.sunshineCounterYesterdayId,
+      SysVarSunshineCounterTodayId = sysVarIds.sunshineCounterTodayId;
 
-createNecessarySysVarsAndPrograms = function (oDevice) {
-  if (oDevice) {
-    ShowWaitAnim();
-    jQuery.each(oDevice.channels, function (index, channel) {
-      var channelType = GetChannelType(channel);
-      if (channelType == "POWERMETER") {
-        CheckAndCreateSysVarEnergyCounter(channel);
-      }
+    var sysVarSunshineCounter = homematic("SysVar.get", {"id": SysVarSunshineCounterId});
 
-      if (channelType == "POWERMETER_IGL") {
-        CheckAndCreateSysVarEnergyCounterIGL(channel, channelType);
-        CheckAndCreateSysVarEnergyCounterGasIGL(channel, channelType);
-      }
+    // sysVarSunshineCounter doesn't exist
+    if (!sysVarSunshineCounter) {
+      conInfo("create system variable: " + SysVarSunshineCounterId);
+      CreateSysVar(SysVarSunshineCounterId, "float");
+      conInfo("create system variable: " + SysVarSunshineCounterOldValId);
+      CreateSysVar(SysVarSunshineCounterOldValId, "float");
+      conInfo("create system variable: " + SysVarSunshineCounterYesterdayId);
+      CreateSysVar(SysVarSunshineCounterYesterdayId, "float", 0, chn.id);
+      conInfo("create system variable: " + SysVarSunshineCounterTodayId);
+      CreateSysVar(SysVarSunshineCounterTodayId, "float", 0, chn.id);
 
-      if (channelType == "ENERGIE_METER_TRANSMITTER") {
-        CheckAndCreateSysVarEnergyCounter(channel);
-      }
+      CreateHmIPSunshineCounterScript(chn);
 
-      if (channelType == "POWERMETER_IEC1") {
-        // IEC Sensor 1
-        CheckAndCreateSysVarEnergyCounterIGL(channel, channelType);
-        CheckAndCreateSysVarEnergyCounterGasIGL(channel, channelType);
-        CheckAndCreateSysVarEnergyCounterIEC(channel);
-      }
+    }
 
-      if ((channelType == "WEATHER_TRANSMIT") && (oDevice.type.toLowerCase() == "hmip-swo-b")) {
-        CheckAndCreateSysVarHmIPRainSunshineCounter(channel, false);
+    if (hasRainSensor) {
+
+      var SysVarRainCounterId = sysVarIds.rainCounterId,
+        SysVarRainCounterOldValId = sysVarIds.tmpRainCounterId,
+        SysVarRainCounterYesterdayId = sysVarIds.rainCounterYesterdayId,
+        SysVarRainCounterTodayId = sysVarIds.rainCounterTodayId;
+
+      var sysVarRainCounter = homematic("SysVar.get", {"id": SysVarRainCounterId});
+      // sysVarRainCounter doesn't exist
+      if (!sysVarRainCounter) {
+        conInfo("create system variable: " + SysVarRainCounterId);
+        CreateSysVar(SysVarRainCounterId, "float");
+        conInfo("create system variable: " + SysVarRainCounterOldValId);
+        CreateSysVar(SysVarRainCounterOldValId, "float");
+        conInfo("create system variable: " + SysVarRainCounterYesterdayId);
+        CreateSysVar(SysVarRainCounterYesterdayId, "float", 0, chn.id);
+        conInfo("create system variable: " + SysVarRainCounterTodayId);
+        CreateSysVar(SysVarRainCounterTodayId, "float", 0, chn.id);
+        CreateHmIPRainCounterScript(chn);
       }
+    }
 
-      if ((channelType == "WEATHER_TRANSMIT") && ((oDevice.type.toLowerCase() == "hmip-swo-pr") || (oDevice.type.toLowerCase() == "hmip-swo-pl"))) {
-        CheckAndCreateSysVarHmIPRainSunshineCounter(channel, true);
-      }
+    CreateHmIPSunRainTodayYesterdayScript(chn);
 
-      /* currently not in use
-      if ((channelType == "KEY_TRANSCEIVER") && (oDevice.type.toLowerCase() == "hmip-mod-rc8")) {
-        CreateSysVarHmIPModRC8(channel);
-      }
-      */
-    });
-    HideWaitAnim();
-  }
-};
-
-changeBlind2Shutter = function(oDevice) {
-  ShowWaitAnim();
-  HideWaitAnimAutomatically();
-  if (oDevice.type == "HmIPW-DRBL4" || oDevice.type == "HmIP-DRBLI4") {
-    var hasChannelOperationMode,
-    devMode = "--";
+  };
+
+  storeEnergyValuesAtMidnight = function(chn) {
+
+    var destinationScript =
+
+      "integer loop = 0;\n" +
+      "string last30Days = '';\n" +
+      "string val;\n" +
+
+      "real energy7 = 0.0;\n" +
+      "real energy30 = 0.0;\n" +
+
+      "object chn = dom.GetObject('"+chn.id+"');\n" +
+
+      "! Retrieve energyCounter30Days\n" +
+      "string energyCounter30Days = chn.MetaData('energyCounter30Days');\n" +
+
+      "! Retrieve todays value\n" +
+      "real energy0 = chn.MetaData('energy0').ToFloat();\n" +
+
+      "! Move the values of the array energyCounter30Days one position to the right\n" +
+      "foreach (val, energyCounter30Days.Split(',')) {\n" +
+
+      "if (loop <= 28 ) {\n" +
+      "last30Days = last30Days + val + ',';\n" +
+      "} else {\n" +
+      "if (loop == 29) {\n" +
+      "last30Days = last30Days + val;\n" +
+      "}\n" +
+      "}\n" +
+
+      "loop = loop + 1;\n" +
+      "}\n" +
+
+      "! Set the first position of the array energyCounter30Days to todays value.\n" +
+      "last30Days = energy0.ToString(1) + ',' + last30Days;\n" +
+
+      "!Store energyCounter30Days as meta data\n" +
+      "chn.MetaData('energyCounter30Days', last30Days);\n" +
+
+      "! Set the meta data of energy1 (yesterday), energy7 (week) and energy30 (months)\n" +
+      "loop = 0;\n" +
+      "foreach (val, last30Days.Split(',')) {\n" +
+      "val = val.ToFloat();\n" +
+      "if (loop == 0) {chn.MetaData('energy1', val);}\n" +
+      "if (loop <= 6) {\n" +
+      "energy7 = energy7 + val;\n" +
+      "}\n" +
+
+      "energy30 = energy30 + val;\n" +
+
+      "loop = loop +1;\n" +
+      "}\n" +
+
+      "chn.MetaData('energy7', energy7);\n" +
+      "chn.MetaData('energy30', energy30);\n" +
+
+      "! Reset energy0 (today) - a new day begins\n" +
+      "chn.MetaData('energy0', 0.0);\n" ;
+
+
+    var script =
+
+      "var _script = \""+destinationScript+"\";" +
+
+      "var DP_VALUE_CHECK_UPDATE = 13;"+
+      "var TIMER_DAILY           = 9;"+
+      "var NOT_SET               = 0;"+
+
+      "var programs = dom.GetObject(ID_PROGRAMS);"+
+      "var program  = dom.CreateObject(OT_PROGRAM);"+
+      "program.Name('prgSetEnergyValuesAtMidnight"+ chn.id + "');"+
+      "program.Internal(true);"+
+      "programs.Add(program.ID());"+
+
+      "var rule = program.Rule();"+
+      "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+      "var condition = rule.RuleAddCondition();"+
+      "condition.CndOperatorType(OPERATOR_NONE);"+
+
+      "var timeModule = dom.CreateObject(OT_CALENDARDP);"+
+      "dom.GetObject(ID_CALENDARDPS).Add(timeModule);"+
+      "timeModule.TimerType(TIMER_DAILY);"+
+      "timeModule.Time('2000-01-01 00:00:00');"+
+      "timeModule.CalDuration(NOT_SET);"+
+      "timeModule.CalRepeatTime(NOT_SET);"+
+      "timeModule.Weekdays(NOT_SET);"+
+      "timeModule.Period(NOT_SET);"+
+      "timeModule.CalRepetitionValue(NOT_SET);"+
+      "timeModule.Begin('2000-01-01 00:00:00');"+
+      "timeModule.End(NOT_SET);"+
+      "timeModule.CalRepetitionCount(NOT_SET);"+
+      "timeModule.SunOffsetType(NOT_SET);"+
+
+      "var singleCondition = condition.CndAddSingle();"+
+      "singleCondition.OperatorType(OPERATOR_NONE);"+
+      "singleCondition.ConditionType(3);"+
+      "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+      "singleCondition.LeftValType(ivtCurrentDate);"+
+      "singleCondition.RightVal1ValType(ivtObjectId);"+
+      "singleCondition.RightVal1(timeModule.ID());"+
+
+      "var destination = rule.RuleDestination();"+
+      "var action = destination.DestAddSingle();"+
+      "action.DestinationParam(ivtString);"+
+      "action.DestinationValueType(ivtString);"+
+      "action.DestinationValue(_script);"+
+
+      "program.Active(true);"+
+
+      "dom.RTUpdate(0);";
+
+    homematic("ReGa.runScript", {"script": script});
+  };
+
+  CreateSysVarHmIPModRC8 = function(channel) {
+
+    var sysVarID =  "svHmIPModRC8ChnMode_" + channel.id + "_" + channel.address;
+    // Mode of the channels (not active(0), key(1), switch(2) or shuttercontact(3)
+    // The default is key
+    CreateSysVar(sysVarID, "enum", "1", channel.id);
+  };
+
+  createNecessarySysVarsAndPrograms = function (oDevice) {
+    if (oDevice) {
+      ShowWaitAnim();
+      jQuery.each(oDevice.channels, function (index, channel) {
+        var channelType = GetChannelType(channel);
+        if (channelType == "POWERMETER") {
+          CheckAndCreateSysVarEnergyCounter(channel);
+        }
+
+        if (channelType == "POWERMETER_IGL") {
+          CheckAndCreateSysVarEnergyCounterIGL(channel, channelType);
+          CheckAndCreateSysVarEnergyCounterGasIGL(channel, channelType);
+        }
+
+        if (channelType == "ENERGIE_METER_TRANSMITTER") {
+          if (oDevice.type.toLowerCase() == "hmip-esi") {
+            if (channel.index == 1) {
+              var arSensorTypes = ['SENSOR_UNKNOWN', 'SENSOR_ES_GAS', 'SENSOR_ES_LED', 'SENSOR_ES_IEC', 'SENSOR_ES_IEC_SML', 'SENSOR_ES_IEC_SML_WH', 'SENSOR_ES_IEC_D0_A', 'SENSOR_ES_IEC_D0_B', 'SENSOR_ES_IEC_D0_C', 'SENSOR_ES_IEC_D0_D'],
+                selfCalResult = homematic("Interface.getValue", {"interface": "HmIP-RF", "address": channel.address, "valueKey": "SELF_CALIBRATION_RESULT"});
+
+              if (selfCalResult == null) {selfCalResult = 0;}
+
+              jQuery.each(oDevice.channels, function (index, chn) {
+                if (chn.channelType != 'MAINTENANCE') {
+                  homematic("Interface.setMetadata", {"objectId": chn.id, "dataId": "iecPrgFirstStart","value": 1});
+
+                  homematic("Interface.setMetadata", {
+                    "objectId": chn.id,
+                    "dataId": "sensor",
+                    "value": arSensorTypes[parseInt(selfCalResult)]
+                  });
+                }
+              });
+            }
+
+            if (channel.index >= 2) {
+              homematic("Interface.setMetadata", {"objectId" : channel.id, "dataId" : "devEnergyCounter","value" : 0});
+              if (channel.index == 2) {
+                homematic("Interface.setMetadata", {"objectId" : channel.id, "dataId" : "devGasVolume","value" : 0});
+              }
+            }
+          }
+          CheckAndCreateSysVarEnergyCounter(channel);
+        }
+
+        if (channelType == "POWERMETER_IEC1") {
+          // IEC Sensor 1
+          CheckAndCreateSysVarEnergyCounterIGL(channel, channelType);
+          CheckAndCreateSysVarEnergyCounterGasIGL(channel, channelType);
+          CheckAndCreateSysVarEnergyCounterIEC(channel);
+        }
+
+        if ((channelType == "WEATHER_TRANSMIT") && (oDevice.type.toLowerCase() == "hmip-swo-b")) {
+          CheckAndCreateSysVarHmIPRainSunshineCounter(channel, false);
+        }
+
+        if ((channelType == "WEATHER_TRANSMIT") && ((oDevice.type.toLowerCase() == "hmip-swo-pr") || (oDevice.type.toLowerCase() == "hmip-swo-pl"))) {
+          CheckAndCreateSysVarHmIPRainSunshineCounter(channel, true);
+        }
+
+        /* currently not in use
+        if ((channelType == "KEY_TRANSCEIVER") && (oDevice.type.toLowerCase() == "hmip-mod-rc8")) {
+          CreateSysVarHmIPModRC8(channel);
+        }
+        */
+
+        if (oDevice.type == "HmIP-RGBW" ) {
+          if (channel.index == 0) {
+            homematic("Interface.setMetadata", {
+              "objectId" : channel.id,
+              "dataId" : "deviceMode",
+              "value" : 0 // Default Modus RGBW
+            });
+          }
+        }
+
+        if ((oDevice.type == "HmIP-RGBW") || (oDevice.type == "HmIP-DRG-DALI")) {
+          if (channel.index == 0) {
+            var defaultEffectName, effectNo;
+            var arDefaultEffectName = ["--", translateKey("optionRainbow"), translateKey("optionSunrise"), translateKey("optionSunset"), "--", translateKey("optionForrest"), "--", "--", translateKey("optionSignalingRed"), translateKey("optionGreenBillow")];
+            jQuery.each(arDefaultEffectName, function (index, value) {
+              effectNo = (index + 1);
+              defaultEffectName = (value == "--") ? translateKey("lblEffect") + " " + effectNo : value;
+              homematic("Interface.setMetadata", {
+                "objectId": oDevice.id,
+                "dataId": "effectName_" + effectNo,
+                "value": defaultEffectName
+              });
+            });
+          }
+        }
+
+        if (oDevice.type == "HmIPW-WGD" ) {
+          if (channel.index == 0) {
+            var screenOrder = "0,1,2,3,4,END";
+            homematic("Interface.setMetadata", {"objectId": oDevice.id, "dataId": "screenOrder", "value": screenOrder});
+          }
+        }
+
+        if (oDevice.type == "HmIPW-WGD-PL" ) {
+          if (channel.index == 0) {
+            var screenOrder = "0,1,2,3,4,5,6,7,8,9,END";
+            homematic("Interface.setMetadata", {"objectId": oDevice.id, "dataId": "screenOrder", "value": screenOrder});
+          }
+        }
+
+        if (oDevice.type == "ELV-SH-BM-S") {
+          if (channelType == "GENERIC_MEASURING_TRANSMITTER") {
+            // Set the default unit for the measurement channels to ''
+            homematic("Interface.setMetadata", {
+              "objectId" : channel.id,
+              "dataId" : "measurementUnit",
+              "value" : '' // Default unit = '' (not set)
+            });
+
+            homematic("Interface.setMetadata", {
+              "objectId" : channel.id,
+              "dataId" : "measurementUnitDecimalPlaces",
+              "value" : 0
+            });
+
+          }
+
+          if (channelType == "MULTI_MODE_INPUT_TRANSMITTER") {
+            homematic("Interface.setMetadata", {
+              "objectId" : channel.id,
+              "dataId" : "channelMode",
+              "value" : 1
+            });
+          }
+        }
+
+      });
+      HideWaitAnim();
+    }
+  };
+
+  changeBlind2Shutter = function(oDevice) {
+    ShowWaitAnim();
+    HideWaitAnimAutomatically(60);
+
+    var channelModes = ["shutter", "blind"],
+      channelOperationMode,
+      devMode = "--";
     jQuery.each(oDevice.channels, function (index, channel) {
       if ((channel.channelType == "BLIND_TRANSMITTER") || (channel.channelType == "BLIND_VIRTUAL_RECEIVER")) {
-        if (typeof hasChannelOperationMode == "undefined") {
-          hasChannelOperationMode = homematic("Interface.getMasterValue", {"interface": "HmIP-RF", "address": channel.address, "valueKey": "CHANNEL_OPERATION_MODE"});
+        if (typeof channelOperationMode == "undefined") {
+          channelOperationMode = homematic("Interface.getMasterValue", {"interface": "HmIP-RF", "address": channel.address, "valueKey": "CHANNEL_OPERATION_MODE"});
         }
-        devMode =  (hasChannelOperationMode) ? "shutter" : "blind";
+
+        devMode = ((channelOperationMode == 0) || (channelOperationMode == 1)) ? channelModes[channelOperationMode] : "blind";
 
         homematic("Interface.setMetadata_crRFD", {
           "interface" : "HmIP-RF",
@@ -1780,102 +2230,102 @@ changeBlind2Shutter = function(oDevice) {
         });
       }
     });
-  }
-  HideWaitAnim();
-};
 
-SetReadyConfigAndHideImgs = function (devId) {
-  var _devId_ = devId;
+    HideWaitAnim();
+  };
 
-  var oDevice = homematic("Device.get", {"id": devId});
+  SetReadyConfigAndHideImgs = function (devId) {
+    var _devId_ = devId;
 
-  //setDevicePos2SystemPos(oDevice);
-  createNecessarySysVarsAndPrograms(oDevice);
+    var oDevice = homematic("Device.get", {"id": devId});
 
-  // This is necessary for HmIPW-Blindactors and the HmIP-DRBLI4 with a firmware version >= 1.6
-  // These devices are coming in with the channel type of BLIND_ but are by default acting as SHUTTER
-  changeBlind2Shutter(oDevice);
+    //setDevicePos2SystemPos(oDevice);
+    createNecessarySysVarsAndPrograms(oDevice);
 
+    // This is necessary for HmIPW-Blindactors and the HmIP-DRBLI4 with a firmware version >= 1.6
+    // These devices are coming in with the channel type of BLIND_ but are by default acting as SHUTTER
+    changeBlind2Shutter(oDevice);
 
 
-  var doSetReady = function () {
-    iNewDevCount--;
-    hideImages(_devId_);
 
-    iseDevices.setReadyConfig(_devId_);
-    if (iNewDevCount == 0) {
-      $("newDevTbl").hide();
-      //$("noNewDevs").innerHTML = "Alle Ger&auml;te wurden konfiguriert.";
-      $("noNewDevs").innerHTML = translateKey("dialogNewDevicesLblAllDevicesConfigured");
-      $("noNewDevs").show();
-    }
-    for (var i = 0; i < arDevices.length; i++) {
-      if (arDevices[i]['id'] == _devId_) {
-        if (arDevices[i]['expanded']) {
-          iDevicesExpanded--;
+    var doSetReady = function () {
+      iNewDevCount--;
+      hideImages(_devId_);
+
+      iseDevices.setReadyConfig(_devId_);
+      if (iNewDevCount == 0) {
+        $("newDevTbl").hide();
+        //$("noNewDevs").innerHTML = "Alle Ger&auml;te wurden konfiguriert.";
+        $("noNewDevs").innerHTML = translateKey("dialogNewDevicesLblAllDevicesConfigured");
+        $("noNewDevs").show();
+      }
+      for (var i = 0; i < arDevices.length; i++) {
+        if (arDevices[i]['id'] == _devId_) {
+          if (arDevices[i]['expanded']) {
+            iDevicesExpanded--;
+          }
         }
       }
-    }
-    refreshFooterButton();
-  };
+      refreshFooterButton();
+    };
 
-  var readyButton = $("readyBtn" + devId);
+    var readyButton = $("readyBtn" + devId);
+
+    // Hiermit kann abgefragt werden, ob schon alle Kan�le konifugiert sind.
+    // Zur Zeit deaktiviert, da von vielen Kunden nicht erw�nscht.
+    /*
+     if (readyButton)
+     {
+     if (readyButton._isReady)
+     {
+     doSetReady();
+     }
+     else
+     {
+     new YesNoDialog("Ger�t fertig konfigurieren", "Es sind noch nicht alle Kan�le fertig konfiguriert. M�chten Sie dennoch fortfahren?", function(result) {
+     if (result == YesNoDialog.RESULT_YES)
+     {
+     doSetReady();
+     }
+     });
+     }
+     }
+     */
+
+    // Hiermit wird verhindert, da� abgefragt wird, ob schon alle Kan�le
+    // konfiguriert sind.
+
+    if (readyButton) {
+      doSetReady();
+    }
 
-  // Hiermit kann abgefragt werden, ob schon alle Kan�le konifugiert sind.
-  // Zur Zeit deaktiviert, da von vielen Kunden nicht erw�nscht.
-  /*
-   if (readyButton)
-   {
-   if (readyButton._isReady)
-   {
-   doSetReady();
-   }
-   else
-   {
-   new YesNoDialog("Ger�t fertig konfigurieren", "Es sind noch nicht alle Kan�le fertig konfiguriert. M�chten Sie dennoch fortfahren?", function(result) {
-   if (result == YesNoDialog.RESULT_YES)
-   {
-   doSetReady();
-   }
-   });
-   }
-   }
-   */
-
-  // Hiermit wird verhindert, da� abgefragt wird, ob schon alle Kan�le
-  // konfiguriert sind.
-
-  if (readyButton) {
-    doSetReady();
-  }
+  };
 
-};
+  specialReloadPage = function () {
+    if (bNecc) {
+      reloadPage();
+    }
+  };
 
-specialReloadPage = function () {
-  if (bNecc) {
-    reloadPage();
-  }
-};
-
-hideImages = function (devId) {
-  var count = arDevices.length;
-  var x = 0;
-  for (var i = 0; i < count; i++) {
-    if (arDevices[i]['id'] == devId) {
-      hide('picDiv' + arDevices[i]['id']);
-      if (arDevices[i]['chns']) {
-        for (x = 0; x < arDevices[i]['chns'].length; x++) {
-          hide('picDiv' + arDevices[i]['chns'][x]['id']);
+  hideImages = function (devId) {
+    var count = arDevices.length;
+    var x = 0;
+    for (var i = 0; i < count; i++) {
+      if (arDevices[i]['id'] == devId) {
+        hide('picDiv' + arDevices[i]['id']);
+        if (arDevices[i]['chns']) {
+          for (x = 0; x < arDevices[i]['chns'].length; x++) {
+            hide('picDiv' + arDevices[i]['chns'][x]['id']);
+          }
         }
-      }
-      if (arDevices[i]['chnsgr']) {
-        for (x = 0; x < arDevices[i]['chnsgr'].length; x++) {
-          collapseGroup(devId, arDevices[i]['chnsgr'][x][0]['id'], arDevices[i]['chnsgr'][x][1]['id'], false);
-          hide('picDiv' + arDevices[i]['chnsgr'][x][0]['id'] + arDevices[i]['chnsgr'][x][1]['id']);
+        if (arDevices[i]['chnsgr']) {
+          for (x = 0; x < arDevices[i]['chnsgr'].length; x++) {
+            collapseGroup(devId, arDevices[i]['chnsgr'][x][0]['id'], arDevices[i]['chnsgr'][x][1]['id'], false);
+            hide('picDiv' + arDevices[i]['chnsgr'][x][0]['id'] + arDevices[i]['chnsgr'][x][1]['id']);
+          }
         }
       }
     }
-  }
-};
-translatePage("#content");
+  };
+  translatePage("#content");
 </script>
diff --git a/home-assistant-addon-dev/config.yaml b/home-assistant-addon-dev/config.yaml
index 7b9dff2b2e..a4543feb9c 100644
--- a/home-assistant-addon-dev/config.yaml
+++ b/home-assistant-addon-dev/config.yaml
@@ -1,6 +1,6 @@
 ---
 name: RaspberryMatic CCU (snapshot)
-version: 3.73.6.20231116-0fb4476
+version: 3.73.9.20231118-bf6c11c
 stage: experimental
 slug: raspberrymatic-dev
 image: ghcr.io/jens-maus/raspberrymatic
@@ -75,6 +75,7 @@ ports:
   2122/tcp: null
   1883/tcp: null
   8883/tcp: null
+  2110/tcp: null
 ports_description:
   22/tcp: SSH access (Extern)
   80/tcp: CCU WebUI HTTP (Extern)
@@ -115,6 +116,7 @@ ports_description:
   2122/tcp: CCU-Jack HTTPS (Extern)
   1883/tcp: CCU-Jack MQTT (Extern)
   8883/tcp: CCU-Jack MQTT-Secure (Extern)
+  2110/tcp: homeputer CL Exec-Engine (Extern)
 environment:
   HM_RUNNING_IN_HA: "1"
   HM_HAPROXY_SRC: 172.30.32.2/32
diff --git a/home-assistant-addon/config.yaml b/home-assistant-addon/config.yaml
index 1e6d2399db..d40ddb2d54 100644
--- a/home-assistant-addon/config.yaml
+++ b/home-assistant-addon/config.yaml
@@ -74,6 +74,7 @@ ports:
   2122/tcp: null
   1883/tcp: null
   8883/tcp: null
+  2110/tcp: null
 ports_description:
   22/tcp: SSH access (Extern)
   80/tcp: CCU WebUI HTTP (Extern)
@@ -114,6 +115,7 @@ ports_description:
   2122/tcp: CCU-Jack HTTPS (Extern)
   1883/tcp: CCU-Jack MQTT (Extern)
   8883/tcp: CCU-Jack MQTT-Secure (Extern)
+  2110/tcp: homeputer CL Exec-Engine (Extern)
 environment:
   HM_RUNNING_IN_HA: "1"
   HM_HAPROXY_SRC: 172.30.32.2/32
diff --git a/release/rpi-imager-dev.json b/release/rpi-imager-dev.json
index d13bda9b1d..c768e223c0 100644
--- a/release/rpi-imager-dev.json
+++ b/release/rpi-imager-dev.json
@@ -1,60 +1,60 @@
 {
   "os_list": [
     {
-      "name": "RaspberryMatic 3.73.6.20231116-0fb447 (Pi 4, Pi 400)",
+      "name": "RaspberryMatic 3.73.9.20231118-bf6c11 (Pi 4, Pi 400)",
       "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",
-      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/snapshots/RaspberryMatic-3.73.6.20231116-0fb447-rpi4.zip",
+      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/snapshots/RaspberryMatic-3.73.9.20231118-bf6c11-rpi4.zip",
       "icon": "https://raw.githubusercontent.com/jens-maus/RaspberryMatic/master/release/rpi-imager-dev.png",
-      "release_date": "2023-11-16",
+      "release_date": "2023-11-18",
       "extract_size": 1345249792,
-      "extract_sha256": "99d741a9a24366824346d99153ab9a9ed93368a1f4eaae99ca9e4992d4ae181f",
-      "image_download_size": 315354537,
-      "image_download_sha256": "2b442d6818576b89bfc9e26c48fde899c59c542cc69be6ca9c108eead26dd4d2",
+      "extract_sha256": "b0ba5032697d99d832d9f999b5f15f1b42f6deaa6ca8c32877a3e46792095fa4",
+      "image_download_size": 317078588,
+      "image_download_sha256": "f3283a1e977b54c5fe1e333c221a1f7b21a92aed0df27d835927fd008cbc1c53",
       "website": "https://github.com/jens-maus/RaspberryMatic/releases/tag/snapshots",
       "devices": [
         "pi4-64bit"
       ]
     },
     {
-      "name": "RaspberryMatic 3.73.6.20231116-0fb447 (Pi 3, Pi Zero 2, ELV-Charly, CCU3)",
+      "name": "RaspberryMatic 3.73.9.20231118-bf6c11 (Pi 3, Pi Zero 2, ELV-Charly, CCU3)",
       "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",
-      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/snapshots/RaspberryMatic-3.73.6.20231116-0fb447-rpi3.zip",
+      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/snapshots/RaspberryMatic-3.73.9.20231118-bf6c11-rpi3.zip",
       "icon": "https://raw.githubusercontent.com/jens-maus/RaspberryMatic/master/release/rpi-imager-dev.png",
-      "release_date": "2023-11-16",
+      "release_date": "2023-11-18",
       "extract_size": 1345249792,
-      "extract_sha256": "1f421ca3ac7e950939919bd5d19f645e997bc5f6abc5e08103d8b21ccff2bbe8",
-      "image_download_size": 313143713,
-      "image_download_sha256": "241daa5cda2634ca15655eb0bc0e9017b816a6afb6c42c0034affcc876efa558",
+      "extract_sha256": "f843e60daf5dda10e7cdd49a11e4f1fc695a5e0c018b78c0370188a67eb9fe19",
+      "image_download_size": 312576498,
+      "image_download_sha256": "f2debb2ab463f1b61c59f689e218bcd4c81ce028b22041b7f497c4101071fc9d",
       "website": "https://github.com/jens-maus/RaspberryMatic/releases/tag/snapshots",
       "devices": [
         "pi3-64bit"
       ]
     },
     {
-      "name": "RaspberryMatic 3.73.6.20231116-0fb447 (Pi 2)",
+      "name": "RaspberryMatic 3.73.9.20231118-bf6c11 (Pi 2)",
       "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",
-      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/snapshots/RaspberryMatic-3.73.6.20231116-0fb447-rpi2.zip",
+      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/snapshots/RaspberryMatic-3.73.9.20231118-bf6c11-rpi2.zip",
       "icon": "https://raw.githubusercontent.com/jens-maus/RaspberryMatic/master/release/rpi-imager-dev.png",
-      "release_date": "2023-11-16",
+      "release_date": "2023-11-18",
       "extract_size": 1345249792,
-      "extract_sha256": "53d53ce0cfc1fbae03b8cb25ba4be61371091f4c7d111ef9eca118df0abadc1d",
-      "image_download_size": 289730227,
-      "image_download_sha256": "8f1627fcdd60dc62aafb0c53ad18670652402fcfb9ebcb7ea604861501342783",
+      "extract_sha256": "9a1c4aaaa2fd5bfa6ed4c029f5c95e9e5f295cf4843b1fda6a7dc5b74676754d",
+      "image_download_size": 289649143,
+      "image_download_sha256": "2bd0a46464b1396fa6401a0dee822fc330a1ceffdd271d8cb2f7eeb72d676214",
       "website": "https://github.com/jens-maus/RaspberryMatic/releases/tag/snapshots",
       "devices": [
         "pi2-32bit"
       ]
     },
     {
-      "name": "RaspberryMatic 3.73.6.20231116-0fb447 (Pi Zero, Pi 1)",
+      "name": "RaspberryMatic 3.73.9.20231118-bf6c11 (Pi Zero, Pi 1)",
       "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",
-      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/snapshots/RaspberryMatic-3.73.6.20231116-0fb447-rpi0.zip",
+      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/snapshots/RaspberryMatic-3.73.9.20231118-bf6c11-rpi0.zip",
       "icon": "https://raw.githubusercontent.com/jens-maus/RaspberryMatic/master/release/rpi-imager-dev.png",
-      "release_date": "2023-11-16",
+      "release_date": "2023-11-18",
       "extract_size": 1345249792,
-      "extract_sha256": "00f83770472a3fc58b9a93888745e043b99cf20920cae476b31887764c51fd68",
-      "image_download_size": 287960807,
-      "image_download_sha256": "2f8b6d1e217cd575bfd015e13afe9bdff9a46bea97152a0907b2f0565d63ca6e",
+      "extract_sha256": "9a9573d466074caf12ebd35c7c027db04bbc3b932ba118561eea27c5c48dfc09",
+      "image_download_size": 292625039,
+      "image_download_sha256": "1398660143a94682c079a1852e5e47b516d70ff73af93b5b9d27d0f875c3cc63",
       "website": "https://github.com/jens-maus/RaspberryMatic/releases/tag/snapshots",
       "devices": [
         "pi1-32bit"