diff --git a/build.sh b/build.sh
index c5c8d46b..f862ae4f 100755
--- a/build.sh
+++ b/build.sh
@@ -4,8 +4,6 @@ ADDON_NAME=jp-hb-devices
file=./patchsource/www/rega/esp/functions.fn
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
-file=./patchsource/www/rega/esp/controls/rhs.fn
-diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
file=./patchsource/www/pda/eq3/controls/rhs.tcl
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
file=./patchsource/www/webui/webui.js
@@ -40,13 +38,14 @@ file=./patchsource/www/webui/js/lang/de/translate.lang.stringtable.js
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
file=./patchsource/www/webui/js/lang/en/translate.lang.stringtable.js
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} >> ./src/addon/patch/common/`basename ${file}`.patch
-
file=./patchsource/www/rega/pages/tabs/admin/views/programs.htm
-diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/le_343/`basename ${file}`.patch
-diff -u --label=${file}.orig --label=${file} ${file}.orig-3.45 ${file}-3.45 > ./src/addon/patch/ge_345/`basename ${file}`.patch
+diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
file=./patchsource/www/rega/esp/side.inc
-diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/le_343/`basename ${file}`.patch
-diff -u --label=${file}.orig --label=${file} ${file}.orig-3.45 ${file}-3.45 > ./src/addon/patch/ge_345/`basename ${file}`.patch
+diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
+
+file=./patchsource/www/rega/esp/controls/rhs.fn
+diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/le_363/`basename ${file}`.patch
+diff -u --label=${file}.orig --label=${file} ${file}.orig-3.65 ${file}-3.65 > ./src/addon/patch/ge_365/`basename ${file}`.patch
echo "Patch created."
diff --git a/patchsource/www/rega/esp/controls/rhs.fn-3.65 b/patchsource/www/rega/esp/controls/rhs.fn-3.65
new file mode 100755
index 00000000..33b113be
--- /dev/null
+++ b/patchsource/www/rega/esp/controls/rhs.fn-3.65
@@ -0,0 +1,75 @@
+function ::CreateWndRotSensor() {
+ object objVoltage = cObj.DPByHssDP("OPERATING_VOLTAGE");
+
+ object ch = dom.GetObject(chnId);
+
+ ! Locked
+ string locked = "${actionStatusControlLockedA}";
+
+ if (ch.Label() == "HmIP-MOD-WD-VK") {
+ ! Closed
+ locked = "${actionStatusControlLockedB}";
+ }
+
+ WriteLine("
");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("  ");
+ WriteLine(" ");
+ WriteLine(" | ");
+ WriteLine(" ");
+ WriteLine("${actionStatusControlOpenA} | ");
+ WriteLine(" ");
+ WriteLine(" | ");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("  ");
+ WriteLine(" ");
+ WriteLine(" | ");
+ WriteLine(" ");
+ WriteLine("${actionStatusControlTilted} | ");
+ WriteLine(" ");
+ WriteLine(" | ");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("  ");
+ WriteLine(" ");
+ WriteLine(" | ");
+ WriteLine(" ");
+ WriteLine(""#locked#" | ");
+ WriteLine(" ");
+ WriteLine(" | ");
+
+ if (objVoltage) {
+ WriteLine("");
+ WriteLine("");
+ WriteLine(" | ");
+
+ WriteLine("Betriebsspannung in V:"#objVoltage.Value().ToString(1)#"V | ");
+ } else {
+ WriteLine(" | | ");
+ }
+
+ object objState = cObj.DPByControl("RHS.STATE");
+ WriteLine("");
+ return;
+}
\ No newline at end of file
diff --git a/patchsource/www/rega/esp/controls/rhs.fn.orig-3.65 b/patchsource/www/rega/esp/controls/rhs.fn.orig-3.65
new file mode 100755
index 00000000..86415e75
--- /dev/null
+++ b/patchsource/www/rega/esp/controls/rhs.fn.orig-3.65
@@ -0,0 +1,56 @@
+function ::CreateWndRotSensor() {
+
+ object ch = dom.GetObject(chnId);
+
+ ! Locked
+ string locked = "${actionStatusControlLockedA}";
+
+ if (ch.Label() == "HmIP-MOD-WD-VK") {
+ ! Closed
+ locked = "${actionStatusControlLockedB}";
+ }
+
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("  ");
+ WriteLine(" ");
+ WriteLine(" | ");
+ WriteLine(" ");
+ WriteLine("${actionStatusControlOpenA} | ");
+ WriteLine(" ");
+ WriteLine(" | ");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("  ");
+ WriteLine(" ");
+ WriteLine(" | ");
+ WriteLine(" ");
+ WriteLine("${actionStatusControlTilted} | ");
+ WriteLine(" ");
+ WriteLine(" | ");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("");
+ WriteLine("  ");
+ WriteLine(" ");
+ WriteLine(" | ");
+ WriteLine(" ");
+ WriteLine(""#locked#" | ");
+ WriteLine(" ");
+ WriteLine(" | ");
+
+ object objState = cObj.DPByControl("RHS.STATE");
+ WriteLine(" | | ");
+ WriteLine("");
+ return;
+}
\ No newline at end of file
diff --git a/patchsource/www/rega/esp/datapointconfigurator.fn b/patchsource/www/rega/esp/datapointconfigurator.fn
index 05c35ac9..a52eb990 100755
--- a/patchsource/www/rega/esp/datapointconfigurator.fn
+++ b/patchsource/www/rega/esp/datapointconfigurator.fn
@@ -148,6 +148,9 @@ function ::dcCreate()
var CN_WIN_SC_SENSOR = "WIN_SC_SENSOR.";
var CN_WINDOW = "WINDOW.";
+ var CN_EVENT_INTERFACE = "EVENT_INTERFACE.";
+ var CN_NOT_ACTIVE = "CHANNEL_NOT_ACTIVE";
+
var CN_RFID_BUTTON = "RFIDBTN.";
var CN_IRRC_BUTTON = "IRRCBTN.";
var CN_IBTN_BUTTON = "IBTN.";
@@ -162,9 +165,6 @@ function ::dcCreate()
var CN_PWRSC = "PWRSC.";
var CN_CONDSC = "CONDSC.";
- var CN_EVENT_INTERFACE = "EVENT_INTERFACE.";
- var CN_NOT_ACTIVE = "CHANNEL_NOT_ACTIVE";
-
var isInvisible = false;
var isKnownControl = false;
diff --git a/patchsource/www/rega/esp/side.inc b/patchsource/www/rega/esp/side.inc
index 685859b1..cadaccca 100755
--- a/patchsource/www/rega/esp/side.inc
+++ b/patchsource/www/rega/esp/side.inc
@@ -1,5 +1,7 @@
<%
+ boolean showChannelParam = true;
+
integer iDP = oSD.DestinationDP();
integer iCH = oSD.DestinationChannel();
integer iP = oSD.DestinationParam();
@@ -8,24 +10,25 @@
integer iVP = oSD.DestinationValueParam();
integer iVPT = oSD.DestinationValueParamType();
- string hm_ouled16 = "HM-OU-LED16";
- string hm_oucfm = "HM-OU-CFM-Pl";
- string hm_oucfmTW = "HM-OU-CFM-TW";
- string hm_oucmpcb = "HM-OU-CM-PCB";
string hb_oump3led = "HB-OU-MP3-LED";
string hb_rc6led = "HB-RC-6-PBU-LED";
string hb_fxled = "HB-OU-RGBW-LED-FX";
- string hm_partyDialog = "HM-CC-RT-DN HM-TC-IT-WM-W-EU HM-CC-VG-1";
- string hm_statusDisplay = "HM-Dis-WM55";
- string hm_statusDisplayEPaper = "HM-Dis-EP-WM55";
string hb_statusDisplayEPaper = "HB-DIS-EP-42BW";
string hb_statusDisplayEPaperMains = "HB-DIS-EP-42BW-MAINS";
string hb_statusDisplayEPaper75 = "HB-DIS-EP-75BW";
string hb_statusDisplayEPaper75Mains = "HB-DIS-EP-75BW-MAINS";
+ string hm_ouled16 = "HM-OU-LED16";
+ string hm_oucfm = "HM-OU-CFM-Pl";
+ string hm_oucfmTW = "HM-OU-CFM-TW";
+ string hm_oucmpcb = "HM-OU-CM-PCB";
+ string hm_partyDialog = "HM-CC-RT-DN HM-TC-IT-WM-W-EU HM-CC-VG-1";
+ string hm_statusDisplay = "HM-Dis-WM55";
+ string hm_statusDisplayEPaper = "HM-Dis-EP-WM55";
string hm_rgbw_controller = "HM-LC-RGBW-WM";
string hm_jalousieActor = "HM-LC-Ja1PBU";
- string heatingClimateControlTransceiver = "HEATING_CLIMATECONTROL_TRANSCEIVER";
+ string hmip_wrcd = "HmIP-WRCD";
+ string heatingClimateControlTransceiver = "HEATING_CLIMATECONTROL_TRANSCEIVER";
string s_vir_lg_rgb_dim = "VIR-LG-RGB-DIM";
string s_vir_lg_rgbw_dim = "VIR-LG-RGBW-DIM";
string s_vir_lg_white_dim = "VIR-LG-WHITE-DIM";
@@ -161,7 +164,7 @@
if( oCH.Label().Find(s_vir_lg_onoff) != -1 ) {
isVirLG_ONOFF = true;
}
- Write( '