re-ordered for compatibility reasons

jp112sdl · Dec 16, 2019 · a1d37a9 · a1d37a9
1 parent 649b9a6
commit a1d37a9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/patchsource/www/rega/esp/functions.fn b/patchsource/www/rega/esp/functions.fn
@@ -326,12 +326,6 @@ function ::showHideRFChannel() {
     bShowChannel = false;
   }
 
-  ! Status Display EPaper
-  if(( (oDevHssType == "HM-Dis-EP-WM55") ) && (chNumber == 3)) {
-    ! Hide channel 3 of this device
-    bShowChannel = false;
-  }
-
   ! HB Status Display EPaper 42BW
   if(( (oDevHssType == "HB-DIS-EP-42BW") || (oDevHssType == "HB-DIS-EP-42BW-MAINS") ) && (chNumber == 11)) {
     ! Hide channel 11 of this device
@@ -344,6 +338,11 @@ function ::showHideRFChannel() {
     bShowChannel = false;
   }
 
+  ! Status Display EPaper
+  if(( (oDevHssType == "HM-Dis-EP-WM55") ) && (chNumber == 3)) {
+    ! Hide channel 3 of this device
+    bShowChannel = false;
+  }
 }
 
 function ::showHideHmIPChannel() {

diff --git a/src/addon/patch/common/functions.fn.patch b/src/addon/patch/common/functions.fn.patch
@@ -1,10 +1,9 @@
 --- ./patchsource/www/rega/esp/functions.fn.orig
 +++ ./patchsource/www/rega/esp/functions.fn
-@@ -331,6 +331,19 @@
-     ! Hide channel 3 of this device
+@@ -326,6 +326,18 @@
      bShowChannel = false;
    }
-+  
+
 +  ! HB Status Display EPaper 42BW
 +  if(( (oDevHssType == "HB-DIS-EP-42BW") || (oDevHssType == "HB-DIS-EP-42BW-MAINS") ) && (chNumber == 11)) {
 +    ! Hide channel 11 of this device
@@ -17,6 +16,6 @@
 +    bShowChannel = false;
 +  }
 +  
- }
-
- function ::showHideHmIPChannel() {
+   ! Status Display EPaper
+   if(( (oDevHssType == "HM-Dis-EP-WM55") ) && (chNumber == 3)) {
+     ! Hide channel 3 of this device
diff --git a/src/addon/patch/revoke/common/0014-functions.fn.patch b/src/addon/patch/revoke/common/0014-functions.fn.patch
@@ -0,0 +1,22 @@
+--- ./patchsource/www/rega/esp/functions.fn.orig
++++ ./patchsource/www/rega/esp/functions.fn
+@@ -331,6 +331,19 @@
+     ! Hide channel 3 of this device
+     bShowChannel = false;
+   }
++  
++  ! HB Status Display EPaper 42BW
++  if(( (oDevHssType == "HB-DIS-EP-42BW") || (oDevHssType == "HB-DIS-EP-42BW-MAINS") ) && (chNumber == 11)) {
++    ! Hide channel 11 of this device
++    bShowChannel = false;
++  }
++
++  ! HB Status Display EPaper 75BW
++  if(( (oDevHssType == "HB-DIS-EP-75BW") || (oDevHssType == "HB-DIS-EP-75BW-MAINS") ) && (chNumber == 9)) {
++    ! Hide channel 9 of this device
++    bShowChannel = false;
++  }
++  
+ }
+
+ function ::showHideHmIPChannel() {