Skip to content

Commit

Permalink
ccu firmware version specific 3.65
Browse files Browse the repository at this point in the history
  • Loading branch information
jp112sdl committed Jun 26, 2022
1 parent fd618af commit c9e553b
Show file tree
Hide file tree
Showing 4 changed files with 171 additions and 0 deletions.
75 changes: 75 additions & 0 deletions patchsource/www/rega/esp/controls/rhs.fn-3.65
Original file line number Diff line number Diff line change
@@ -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("<td>");
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"OpenH' >");
WriteLine("<tr>");
WriteLine("<td class='CLASS02513'>");
WriteLine("<div align='center'>");
WriteLine("<img src='/ise/img/window/open_h.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
WriteLine("</div>");
WriteLine("</td>");
WriteLine("</tr>");
WriteLine("<tr><td>${actionStatusControlOpenA}</td></tr>");
WriteLine("</table>");
WriteLine("</td>");
WriteLine("<td>");
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"OpenV' >");
WriteLine("<tr>");
WriteLine("<td class='CLASS02513'>");
WriteLine("<div align='center'>");
WriteLine("<img src='/ise/img/window/open_v.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
WriteLine("</div>");
WriteLine("</td>");
WriteLine("</tr>");
WriteLine("<tr><td>${actionStatusControlTilted}</td></tr>");
WriteLine("</table>");
WriteLine("</td>");
WriteLine("<td>");
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"Closed' >");
WriteLine("<tr>");
WriteLine("<td class='CLASS02513'>");
WriteLine("<div align='center'>");
WriteLine("<img src='/ise/img/window/closed.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
WriteLine("</div>");
WriteLine("</td>");
WriteLine("</tr>");
WriteLine("<tr><td>"#locked#"</td></tr>");
WriteLine("</table>");
WriteLine("</td>");

if (objVoltage) {
WriteLine("<td>");
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"Extra' >");
WriteLine("<tr>");
WriteLine("<td class='CLASS02513'>");
WriteLine("<div align='center'>");
WriteLine("<img src='/ise/img/window/closed.png' width='80' height='80' />");
WriteLine("</div>");
WriteLine("</td>");
WriteLine("</tr>");
WriteLine("<tr><td>Extra-Status</td></tr>");
WriteLine("</table>");
WriteLine("</td>");

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>");
} else {
WriteLine("<td></td><td></td>");
}

object objState = cObj.DPByControl("RHS.STATE");
WriteLine("<script type='text/javascript'>");
WriteLine("ibw"#cObj.ID()#" = new iseButtonsWindowHB("#chnId#", "#objState.Value()#");");
WriteLine("</script>");
return;
}
56 changes: 56 additions & 0 deletions patchsource/www/rega/esp/controls/rhs.fn.orig-3.65
Original file line number Diff line number Diff line change
@@ -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("<td>");
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"OpenH' >");
WriteLine("<tr>");
WriteLine("<td class='CLASS02513'>");
WriteLine("<div align='center'>");
WriteLine("<img src='/ise/img/window/open_h.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
WriteLine("</div>");
WriteLine("</td>");
WriteLine("</tr>");
WriteLine("<tr><td>${actionStatusControlOpenA}</td></tr>");
WriteLine("</table>");
WriteLine("</td>");
WriteLine("<td>");
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"OpenV' >");
WriteLine("<tr>");
WriteLine("<td class='CLASS02513'>");
WriteLine("<div align='center'>");
WriteLine("<img src='/ise/img/window/open_v.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
WriteLine("</div>");
WriteLine("</td>");
WriteLine("</tr>");
WriteLine("<tr><td>${actionStatusControlTilted}</td></tr>");
WriteLine("</table>");
WriteLine("</td>");
WriteLine("<td>");
WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"Closed' >");
WriteLine("<tr>");
WriteLine("<td class='CLASS02513'>");
WriteLine("<div align='center'>");
WriteLine("<img src='/ise/img/window/closed.png' width='80' height='80' style='mix-blend-mode:multiply;' />");
WriteLine("</div>");
WriteLine("</td>");
WriteLine("</tr>");
WriteLine("<tr><td>"#locked#"</td></tr>");
WriteLine("</table>");
WriteLine("</td>");

object objState = cObj.DPByControl("RHS.STATE");
WriteLine("<td></td><td></td>");
WriteLine("<script type='text/javascript'>");
WriteLine("ibw"#cObj.ID()#" = new iseButtonsWindow("#chnId#", "#objState.Value()#");");
WriteLine("</script>");
return;
}
40 changes: 40 additions & 0 deletions src/addon/patch/ge_365/rhs.fn.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
--- ./patchsource/www/rega/esp/controls/rhs.fn.orig
+++ ./patchsource/www/rega/esp/controls/rhs.fn
@@ -1,4 +1,5 @@
function ::CreateWndRotSensor() {
+ object objVoltage = cObj.DPByHssDP("OPERATING_VOLTAGE");

object ch = dom.GetObject(chnId);

@@ -47,10 +48,28 @@
WriteLine("</table>");
WriteLine("</td>");

+ if (objVoltage) {
+ WriteLine("<td>");
+ WriteLine("<table class='ControlBtnOff CLASS02514' id='"#chnId#"Extra' >");
+ WriteLine("<tr>");
+ WriteLine("<td class='CLASS02513'>");
+ WriteLine("<div align='center'>");
+ WriteLine("<img src='/ise/img/window/closed.png' width='80' height='80' />");
+ WriteLine("</div>");
+ WriteLine("</td>");
+ WriteLine("</tr>");
+ WriteLine("<tr><td>Extra-Status</td></tr>");
+ WriteLine("</table>");
+ WriteLine("</td>");
+
+ 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>");
+ } else {
+ WriteLine("<td></td><td></td>");
+ }
+
object objState = cObj.DPByControl("RHS.STATE");
- WriteLine("<td></td><td></td>");
WriteLine("<script type='text/javascript'>");
- WriteLine("ibw"#cObj.ID()#" = new iseButtonsWindow("#chnId#", "#objState.Value()#");");
+ WriteLine("ibw"#cObj.ID()#" = new iseButtonsWindowHB("#chnId#", "#objState.Value()#");");
WriteLine("</script>");
return;
}
\ No newline at end of file
File renamed without changes.

0 comments on commit c9e553b

Please sign in to comment.