Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev patch0182 fix1513 #2516

Merged
merged 3 commits into from
Nov 18, 2023
+805 −98,813
Merged

Dev patch0182 fix1513 #2516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2424d74
fixes #1513
jp112sdl Nov 16, 2023
f8ac876
Merge branch 'master' of https://github.com/jens-maus/RaspberryMatic …
jp112sdl Nov 18, 2023
591ccce
revert timeout changes in webui.js
jp112sdl Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions ...root-external/patches/occu/0182-WebUI-Fix-DimmerControl-InitButtonsWithChannelState.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
--- occu/WebUI/www/rega/esp/controls/dimmer.fn.orig
+++ occu/WebUI/www/rega/esp/controls/dimmer.fn
@@ -65,8 +65,10 @@

WriteLine("<td class='CLASS02529'>");
WriteLine("<table width='100%' height='100%' cellspacing='10'>");
- WriteLine("<tr><td><div id='"#chnId#"On' class='ControlBtnOn CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
- WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtnOff CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
+ string BtnOnState="On"; string BtnOffState="Off";
+ if (iState == 0) { BtnOnState="Off"; BtnOffState="On"; }
+ WriteLine("<tr><td><div id='"#chnId#"On' class='ControlBtn"#BtnOnState#" CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
+ WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtn"#BtnOffState#" CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
WriteLine("</table>");
WriteLine("</td>");

@@ -215,8 +217,10 @@

WriteLine("<td class='CLASS02529'>");
WriteLine("<table width='100%' height='100%' cellspacing='10'>");
- WriteLine("<tr><td><div id='"#chnId#"On' class='ControlBtnOn CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
- WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtnOff CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
+ string BtnOnState="On"; string BtnOffState="Off";
+ if (iState == 0) { BtnOnState="Off"; BtnOffState="On"; }
+ WriteLine("<tr><td><div id='"#chnId#"On' class='ControlBtn"#BtnOnState#" CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
+ WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtn"#BtnOffState#" CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
WriteLine("</table>");
WriteLine("</td>");

@@ -297,8 +301,10 @@

WriteLine("<td class='CLASS02529'>");
WriteLine("<table width='100%' height='100%' cellspacing='10'>");
- WriteLine("<tr><td><div id='"#chnId#"On' class='ControlBtnOn CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
- WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtnOff CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
+ string BtnOnState="On"; string BtnOffState="Off";
+ if (iState == 0) { BtnOnState="Off"; BtnOffState="On"; }
+ WriteLine("<tr><td><div id='"#chnId#"On' class='ControlBtn"#BtnOnState#" CLASS02545 j_translate'>${actionStatusControlLblOn}</div></td></tr>");
+ WriteLine("<tr><td><div id='"#chnId#"Off' class='ControlBtn"#BtnOffState#" CLASS02545 j_translate'>${actionStatusControlLblOff}</div></td></tr>");
WriteLine("</table>");
WriteLine("</td>");

Loading
Loading