Skip to content

Commit

Permalink
Merge pull request #63 from jp112sdl/dev_6.0
Browse files Browse the repository at this point in the history 
Dev 6.0
  • Loading branch information
@jp112sdl
jp112sdl authored Jul 6, 2022
2 parents ed69771 + 0edc720 commit 6778015
Show file tree
Hide file tree
Showing 22 changed files with 493 additions and 3,472 deletions.
13 changes: 6 additions & 7 deletions build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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."

Expand Down
75 changes: 75 additions & 0 deletions patchsource/www/rega/esp/controls/rhs.fn-3.65
View file
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
View file
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;
}
6 changes: 3 additions & 3 deletions patchsource/www/rega/esp/datapointconfigurator.fn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.";
Expand All @@ -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;

Expand Down
Loading

0 comments on commit 6778015

Please sign in to comment.