update OCCU to 3.77.1-1 and adapted all our WebUI patches accordingly.

jens-maus · Jun 3, 2024 · 5c15def · 5c15def
1 parent b8c51af
commit 5c15def
Show file tree

Hide file tree

Showing 21 changed files with 316 additions and 16,807 deletions.
diff --git a/buildroot-external/package/occu/occu.hash b/buildroot-external/package/occu/occu.hash
@@ -1,3 +1,3 @@
 # Locally computed
 sha256  e600b8a501a17600d01bd7a4646508f94f3cd3b9df03661babd9f1801e579b36  LicenseDE.txt
-sha256  39efcf5f2c977496fddb1e15a488f38488bf17a65d45e2bf422eb556c190e621  occu-3.75.7-1.tar.gz
+sha256  1d5e7a25db06199f65397e822f325051c936c037dab38bd8808eae1d0c3f85e4  occu-3.77.1-1.tar.gz
diff --git a/buildroot-external/package/occu/occu.mk b/buildroot-external/package/occu/occu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OCCU_VERSION = 3.75.7-1
+OCCU_VERSION = 3.77.1-1
 OCCU_SITE = $(call github,jens-maus,occu,$(OCCU_VERSION))
 OCCU_LICENSE = HMSL
 OCCU_LICENSE_FILES = LicenseDE.txt

diff --git a/buildroot-external/patches/occu/0088-WebUI-Fix-MissingJSONMethods.patch b/buildroot-external/patches/occu/0088-WebUI-Fix-MissingJSONMethods.patch
diff --git a/...ches/occu/0088-WebUI-Fix-MissingJSONMethods/occu/WebUI/www/api/methods/ccu/getversion.tcl b/...ches/occu/0088-WebUI-Fix-MissingJSONMethods/occu/WebUI/www/api/methods/ccu/getversion.tcl
diff --git a/...occu/0088-WebUI-Fix-MissingJSONMethods/occu/WebUI/www/api/methods/ccu/getversion.tcl.orig b/...occu/0088-WebUI-Fix-MissingJSONMethods/occu/WebUI/www/api/methods/ccu/getversion.tcl.orig
diff --git a/...88-WebUI-Fix-MissingJSONMethods/occu/WebUI/www/api/methods/interface/reportvalueusage.tcl b/...88-WebUI-Fix-MissingJSONMethods/occu/WebUI/www/api/methods/interface/reportvalueusage.tcl
diff --git a/...bUI-Fix-MissingJSONMethods/occu/WebUI/www/api/methods/interface/reportvalueusage.tcl.orig b/...bUI-Fix-MissingJSONMethods/occu/WebUI/www/api/methods/interface/reportvalueusage.tcl.orig
diff --git a/buildroot-external/patches/occu/0119-WebUI-Fix-ProofAndSetValue.patch b/buildroot-external/patches/occu/0119-WebUI-Fix-ProofAndSetValue.patch
@@ -147,21 +147,35 @@
    return "$max"
  }
 
-@@ -33,10 +43,10 @@
-   if {([string equal $extraparam "COND_TX_THRESHOLD_LO"] == 1) || ([string equal $extraparam "COND_TX_THRESHOLD_HI"] == 1)} {
-     switch [string tolower $devType] {
-         hmip-psm -
--        hmip-fsm16 {return "3680.0"}
-+        hmip-fsm16 {return "3680.00"}
-         hmip-bsm -
--        hmip-fsm  {return "1150.0"}
--        hmip-usbsm  {return "60.0"}
-+        hmip-fsm  {return "1150.00"}
-+        hmip-usbsm  {return "60.00"}
-        default {return "<span class=\"attention\">max value not available</span>"}
+@@ -24,10 +34,10 @@
+       hmip-psm -
+       hmip-psm-2 -
+       "hmip-psm-2 qhj" -
+-      hmip-fsm16 {return 3680.0}
++      hmip-fsm16 {return 3680.00}
+       hmip-bsm -
+-      hmip-fsm  {return 1150.0}
+-      hmip-usbsm  {return 60.0}
++      hmip-fsm  {return 1150.00}
++      hmip-usbsm  {return 60.00}
+      default {return "<span class=\"attention\">max value not available</span>"}
      }
    }
-@@ -82,7 +92,7 @@
+@@ -37,10 +47,10 @@
+       hmip-psm -
+       hmip-psm-2 -
+       "hmip-psm-2 qhj" -
+-      hmip-fsm16 {return "3680.0"}
++      hmip-fsm16 {return "3680.00"}
+       hmip-bsm -
+-      hmip-fsm  {return "1150.0"}
+-      hmip-usbsm  {return "60.0"}
++      hmip-fsm  {return "1150.00"}
++      hmip-usbsm  {return "60.00"}
+      default {return "<span class=\"attention\">max value not available</span>"}
+     }
+   }
+@@ -86,7 +96,7 @@
 
    # Limit float to 1 decimal places
    if {([llength [split $min "."]] == 2) || ([llength [split $max "."]] == 2)} {
@@ -170,7 +184,7 @@
        set min [format {%1.1f} $min]
        set max [format {%1.1f} $max]
      } else {
-@@ -178,7 +188,7 @@
+@@ -187,7 +197,7 @@
        hmip-usbsm
         {
          if {$param == "TX_THRESHOLD_POWER"} {return "W (0.0 - [getUserDefinedMaxValue $devType $param])"}
@@ -179,7 +193,7 @@
        }
        default {return "<span class=\"attention\">missing description</span>"}
     }
-@@ -234,6 +244,9 @@
+@@ -243,6 +253,9 @@
        set maxValue "stringUTF8"
        set maxLength "maxLength=16"
        set sizeTextfield 16
@@ -189,7 +203,7 @@
      }
    }
 
-@@ -256,7 +269,7 @@
+@@ -265,7 +278,7 @@
 
    # Limit float to 2 decimal places
    if {[llength [split $value "."]] == 2} {
@@ -198,7 +212,7 @@
        catch {set value [format {%1.1f} $value]}
      } else {
        catch {set value [format {%1.2f} $value]}
-@@ -339,7 +352,7 @@
+@@ -348,7 +361,7 @@
    }
 
    set s "<input id=$elemIdTmp type=\"text\" size=\"5\" value=[format %.0f [expr $value * 100]] name=$param\_tmp onblur="

diff --git a/...s/occu/0119-WebUI-Fix-ProofAndSetValue/occu/WebUI/www/config/easymodes/etc/uiElements.tcl b/...s/occu/0119-WebUI-Fix-ProofAndSetValue/occu/WebUI/www/config/easymodes/etc/uiElements.tcl
@@ -31,23 +31,27 @@ proc getMaxValue {param} {
 proc getUserDefinedMaxValue {devType {extraparam ""}} {
   if {[string equal $extraparam "TX_THRESHOLD_POWER"] == 1} {
     switch [string tolower $devType] {
-        hmip-psm -
-        hmip-fsm16 {return 3680.0}
-        hmip-bsm -
-        hmip-fsm  {return 1150.0}
-        hmip-usbsm  {return 60.0}
-       default {return "<span class=\"attention\">max value not available</span>"}
+      hmip-psm -
+      hmip-psm-2 -
+      "hmip-psm-2 qhj" -
+      hmip-fsm16 {return 3680.00}
+      hmip-bsm -
+      hmip-fsm  {return 1150.00}
+      hmip-usbsm  {return 60.00}
+     default {return "<span class=\"attention\">max value not available</span>"}
     }
   }
 
   if {([string equal $extraparam "COND_TX_THRESHOLD_LO"] == 1) || ([string equal $extraparam "COND_TX_THRESHOLD_HI"] == 1)} {
     switch [string tolower $devType] {
-        hmip-psm -
-        hmip-fsm16 {return "3680.00"}
-        hmip-bsm -
-        hmip-fsm  {return "1150.00"}
-        hmip-usbsm  {return "60.00"}
-       default {return "<span class=\"attention\">max value not available</span>"}
+      hmip-psm -
+      hmip-psm-2 -
+      "hmip-psm-2 qhj" -
+      hmip-fsm16 {return "3680.00"}
+      hmip-bsm -
+      hmip-fsm  {return "1150.00"}
+      hmip-usbsm  {return "60.00"}
+     default {return "<span class=\"attention\">max value not available</span>"}
     }
   }
 
@@ -164,7 +168,10 @@ proc getUnit {param} {
 
 proc getCondTXThresholdUnit {devType chn} {
    switch [string tolower $devType] {
-        hmip-stho  {
+        hmip-stho
+        hmip-stho-a
+        elv-sh-cth
+        {
           if {$chn == "2"} {return "°C"}
           if {$chn == "3"} {return "%"}
         }
@@ -182,6 +189,8 @@ proc getCondTXThresholdUnit {devType chn} {
 proc getUserDefinedCondTXThresholdUnitMinMaxDescr {devType param} {
    switch [string tolower $devType] {
       hmip-psm -
+      hmip-psm-2 -
+      "hmip-psm-2 qhj" -
       hmip-fsm16 -
       hmip-bsm -
       hmip-fsm -
@@ -533,6 +542,8 @@ proc getHelpIcon {topic {x 0} {y 0}} {
    "DIM_LEVEL_LOWEST" {set x 450; set y 125}
    "DIM_STEP" {set x 500; set y 150}
    "DISABLE_DEVICE_ALIVE_SIGNAL" {set x 500; set y 75 }
+   "DISPLAY_MODE" {set x 500; set y 200 }
+   "DISPLAY_INVERTED_COLORS" {set x 550; set y 60 }
    "DURATION_5MIN" {set x 500; set y 160}
    "ENABLE_ROUTING" {set x 500; set y 120}
    "EVENT_FILTER_NUMBER_motionDetect" {set x 400; set y 60}

diff --git a/...u/0119-WebUI-Fix-ProofAndSetValue/occu/WebUI/www/config/easymodes/etc/uiElements.tcl.orig b/...u/0119-WebUI-Fix-ProofAndSetValue/occu/WebUI/www/config/easymodes/etc/uiElements.tcl.orig
@@ -21,23 +21,27 @@ proc getMaxValue {param} {
 proc getUserDefinedMaxValue {devType {extraparam ""}} {
   if {[string equal $extraparam "TX_THRESHOLD_POWER"] == 1} {
     switch [string tolower $devType] {
-        hmip-psm -
-        hmip-fsm16 {return 3680.0}
-        hmip-bsm -
-        hmip-fsm  {return 1150.0}
-        hmip-usbsm  {return 60.0}
-       default {return "<span class=\"attention\">max value not available</span>"}
+      hmip-psm -
+      hmip-psm-2 -
+      "hmip-psm-2 qhj" -
+      hmip-fsm16 {return 3680.0}
+      hmip-bsm -
+      hmip-fsm  {return 1150.0}
+      hmip-usbsm  {return 60.0}
+     default {return "<span class=\"attention\">max value not available</span>"}
     }
   }
 
   if {([string equal $extraparam "COND_TX_THRESHOLD_LO"] == 1) || ([string equal $extraparam "COND_TX_THRESHOLD_HI"] == 1)} {
     switch [string tolower $devType] {
-        hmip-psm -
-        hmip-fsm16 {return "3680.0"}
-        hmip-bsm -
-        hmip-fsm  {return "1150.0"}
-        hmip-usbsm  {return "60.0"}
-       default {return "<span class=\"attention\">max value not available</span>"}
+      hmip-psm -
+      hmip-psm-2 -
+      "hmip-psm-2 qhj" -
+      hmip-fsm16 {return "3680.0"}
+      hmip-bsm -
+      hmip-fsm  {return "1150.0"}
+      hmip-usbsm  {return "60.0"}
+     default {return "<span class=\"attention\">max value not available</span>"}
     }
   }
 
@@ -154,7 +158,10 @@ proc getUnit {param} {
 
 proc getCondTXThresholdUnit {devType chn} {
    switch [string tolower $devType] {
-        hmip-stho  {
+        hmip-stho
+        hmip-stho-a
+        elv-sh-cth
+        {
           if {$chn == "2"} {return "�C"}
           if {$chn == "3"} {return "%"}
         }
@@ -172,6 +179,8 @@ proc getCondTXThresholdUnit {devType chn} {
 proc getUserDefinedCondTXThresholdUnitMinMaxDescr {devType param} {
    switch [string tolower $devType] {
       hmip-psm -
+      hmip-psm-2 -
+      "hmip-psm-2 qhj" -
       hmip-fsm16 -
       hmip-bsm -
       hmip-fsm -
@@ -520,6 +529,8 @@ proc getHelpIcon {topic {x 0} {y 0}} {
    "DIM_LEVEL_LOWEST" {set x 450; set y 125}
    "DIM_STEP" {set x 500; set y 150}
    "DISABLE_DEVICE_ALIVE_SIGNAL" {set x 500; set y 75 }
+   "DISPLAY_MODE" {set x 500; set y 200 }
+   "DISPLAY_INVERTED_COLORS" {set x 550; set y 60 }
    "DURATION_5MIN" {set x 500; set y 160}
    "ENABLE_ROUTING" {set x 500; set y 120}
    "EVENT_FILTER_NUMBER_motionDetect" {set x 400; set y 60}

diff --git a/buildroot-external/patches/occu/0129-WebUI-Fix-RemoveHeatGroupDebug.patch b/buildroot-external/patches/occu/0129-WebUI-Fix-RemoveHeatGroupDebug.patch