Skip to content

Commit 6778015

Browse files
jp112sdljp112sdl
authored
Merge pull request #63 from jp112sdl/dev_6.0
Dev 6.0
2 parents ed69771 + 0edc720 commit 6778015

22 files changed

+493
-3472
lines changed

‎build.sh‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ ADDON_NAME=jp-hb-devices
44

55
file=./patchsource/www/rega/esp/functions.fn
66
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
7-
file=./patchsource/www/rega/esp/controls/rhs.fn
8-
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
97
file=./patchsource/www/pda/eq3/controls/rhs.tcl
108
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
119
file=./patchsource/www/webui/webui.js
@@ -40,13 +38,14 @@ file=./patchsource/www/webui/js/lang/de/translate.lang.stringtable.js
4038
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
4139
file=./patchsource/www/webui/js/lang/en/translate.lang.stringtable.js
4240
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} >> ./src/addon/patch/common/`basename ${file}`.patch
43-
4441
file=./patchsource/www/rega/pages/tabs/admin/views/programs.htm
45-
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/le_343/`basename ${file}`.patch
46-
diff -u --label=${file}.orig --label=${file} ${file}.orig-3.45 ${file}-3.45 > ./src/addon/patch/ge_345/`basename ${file}`.patch
42+
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
4743
file=./patchsource/www/rega/esp/side.inc
48-
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/le_343/`basename ${file}`.patch
49-
diff -u --label=${file}.orig --label=${file} ${file}.orig-3.45 ${file}-3.45 > ./src/addon/patch/ge_345/`basename ${file}`.patch
44+
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/common/`basename ${file}`.patch
45+
46+
file=./patchsource/www/rega/esp/controls/rhs.fn
47+
diff -u --label=${file}.orig --label=${file} ${file}.orig ${file} > ./src/addon/patch/le_363/`basename ${file}`.patch
48+
diff -u --label=${file}.orig --label=${file} ${file}.orig-3.65 ${file}-3.65 > ./src/addon/patch/ge_365/`basename ${file}`.patch
5049

5150
echo "Patch created."
5251

‎patchsource/www/rega/esp/controls/rhs.fn-3.65‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
function ::CreateWndRotSensor() {
2+
object objVoltage = cObj.DPByHssDP("OPERATING_VOLTAGE");
3+
4+
object ch = dom.GetObject(chnId);
5+
6+
! Locked
7+
string locked = "${actionStatusControlLockedA}";
8+
9+
if (ch.Label() == "HmIP-MOD-WD-VK") {
10+
! Closed
11+
locked = "${actionStatusControlLockedB}";
12+
}
13+
14+
WriteLine("<td>");
15+
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"OpenH' >");
16+
WriteLine("<tr>");
17+
WriteLine("<td class='CLASS02513'>");
18+
WriteLine("<div align='center'>");
19+
WriteLine("<img src='/ise/img/window/open_h.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
20+
WriteLine("</div>");
21+
WriteLine("</td>");
22+
WriteLine("</tr>");
23+
WriteLine("<tr><td>${actionStatusControlOpenA}</td></tr>");
24+
WriteLine("</table>");
25+
WriteLine("</td>");
26+
WriteLine("<td>");
27+
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"OpenV' >");
28+
WriteLine("<tr>");
29+
WriteLine("<td class='CLASS02513'>");
30+
WriteLine("<div align='center'>");
31+
WriteLine("<img src='/ise/img/window/open_v.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
32+
WriteLine("</div>");
33+
WriteLine("</td>");
34+
WriteLine("</tr>");
35+
WriteLine("<tr><td>${actionStatusControlTilted}</td></tr>");
36+
WriteLine("</table>");
37+
WriteLine("</td>");
38+
WriteLine("<td>");
39+
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"Closed' >");
40+
WriteLine("<tr>");
41+
WriteLine("<td class='CLASS02513'>");
42+
WriteLine("<div align='center'>");
43+
WriteLine("<img src='/ise/img/window/closed.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
44+
WriteLine("</div>");
45+
WriteLine("</td>");
46+
WriteLine("</tr>");
47+
WriteLine("<tr><td>"#locked#"</td></tr>");
48+
WriteLine("</table>");
49+
WriteLine("</td>");
50+
51+
if (objVoltage) {
52+
WriteLine("<td>");
53+
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"Extra' >");
54+
WriteLine("<tr>");
55+
WriteLine("<td class='CLASS02513'>");
56+
WriteLine("<div align='center'>");
57+
WriteLine("<img src='/ise/img/window/closed.png' width='80' height='80' />");
58+
WriteLine("</div>");
59+
WriteLine("</td>");
60+
WriteLine("</tr>");
61+
WriteLine("<tr><td>Extra-Status</td></tr>");
62+
WriteLine("</table>");
63+
WriteLine("</td>");
64+
65+
WriteLine("<td><div class='ControlBtnInfo CLASS02532'><span class='_CLASS02533'><span class='CLASS02534 j_translate' style='display: inline;'>Betriebsspannung in V:</span><span class='CLASS02535' style='color:white'>"#objVoltage.Value().ToString(1)#"V</span></span></div></td>");
66+
} else {
67+
WriteLine("<td></td><td></td>");
68+
}
69+
70+
object objState = cObj.DPByControl("RHS.STATE");
71+
WriteLine("<script type='text/javascript'>");
72+
WriteLine("ibw"#cObj.ID()#" = new iseButtonsWindowHB("#chnId#", "#objState.Value()#");");
73+
WriteLine("</script>");
74+
return;
75+
}

‎patchsource/www/rega/esp/controls/rhs.fn.orig-3.65‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
function ::CreateWndRotSensor() {
2+
3+
object ch = dom.GetObject(chnId);
4+
5+
! Locked
6+
string locked = "${actionStatusControlLockedA}";
7+
8+
if (ch.Label() == "HmIP-MOD-WD-VK") {
9+
! Closed
10+
locked = "${actionStatusControlLockedB}";
11+
}
12+
13+
WriteLine("<td>");
14+
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"OpenH' >");
15+
WriteLine("<tr>");
16+
WriteLine("<td class='CLASS02513'>");
17+
WriteLine("<div align='center'>");
18+
WriteLine("<img src='/ise/img/window/open_h.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
19+
WriteLine("</div>");
20+
WriteLine("</td>");
21+
WriteLine("</tr>");
22+
WriteLine("<tr><td>${actionStatusControlOpenA}</td></tr>");
23+
WriteLine("</table>");
24+
WriteLine("</td>");
25+
WriteLine("<td>");
26+
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"OpenV' >");
27+
WriteLine("<tr>");
28+
WriteLine("<td class='CLASS02513'>");
29+
WriteLine("<div align='center'>");
30+
WriteLine("<img src='/ise/img/window/open_v.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
31+
WriteLine("</div>");
32+
WriteLine("</td>");
33+
WriteLine("</tr>");
34+
WriteLine("<tr><td>${actionStatusControlTilted}</td></tr>");
35+
WriteLine("</table>");
36+
WriteLine("</td>");
37+
WriteLine("<td>");
38+
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"Closed' >");
39+
WriteLine("<tr>");
40+
WriteLine("<td class='CLASS02513'>");
41+
WriteLine("<div align='center'>");
42+
WriteLine("<img src='/ise/img/window/closed.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
43+
WriteLine("</div>");
44+
WriteLine("</td>");
45+
WriteLine("</tr>");
46+
WriteLine("<tr><td>"#locked#"</td></tr>");
47+
WriteLine("</table>");
48+
WriteLine("</td>");
49+
50+
object objState = cObj.DPByControl("RHS.STATE");
51+
WriteLine("<td></td><td></td>");
52+
WriteLine("<script type='text/javascript'>");
53+
WriteLine("ibw"#cObj.ID()#" = new iseButtonsWindow("#chnId#", "#objState.Value()#");");
54+
WriteLine("</script>");
55+
return;
56+
}

‎patchsource/www/rega/esp/datapointconfigurator.fn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ function ::dcCreate()
148148
var CN_WIN_SC_SENSOR = "WIN_SC_SENSOR.";
149149
var CN_WINDOW = "WINDOW.";
150150

151+
var CN_EVENT_INTERFACE = "EVENT_INTERFACE.";
152+
var CN_NOT_ACTIVE = "CHANNEL_NOT_ACTIVE";
153+
151154
var CN_RFID_BUTTON = "RFIDBTN.";
152155
var CN_IRRC_BUTTON = "IRRCBTN.";
153156
var CN_IBTN_BUTTON = "IBTN.";
@@ -162,9 +165,6 @@ function ::dcCreate()
162165
var CN_PWRSC = "PWRSC.";
163166
var CN_CONDSC = "CONDSC.";
164167

165-
var CN_EVENT_INTERFACE = "EVENT_INTERFACE.";
166-
var CN_NOT_ACTIVE = "CHANNEL_NOT_ACTIVE";
167-
168168
var isInvisible = false;
169169
var isKnownControl = false;
170170

0 commit comments

Comments
 (0)