Merge branch 'master' of https://github.com/jens-maus/RaspberryMatic …

…into dev_patch0182_fix1513 * 'master' of https://github.com/jens-maus/RaspberryMatic: snapshot bump [3.73.9.20231118-bf6c11c] Add port 2110 for homeputer Exec-Engine to HA-addon config (jens-maus#2515, @tomquist) updated OCCU to 3.73.9-1 and adapted WebUI patches. explicitly disable the bcm283x serial driver support in the rpi versions of u-boot so that they won't interfere with our rpi-rf-mode dtbo. This should allow to remove the stdout-path workaround to prevent u-boot from crashing in case the rpi-rf-mod.dtbo is enabled in config.txt. (cf. home-assistant/operating-system#2919) snapshot bump [3.73.6.20231117-d250419] added new WebUI 0182-WebUI-Fix-DimmerControl-RemoveButtonRefreshDelay patch which fixes unwanted delay in displaying the correct dimmer status (jens-maus#1513, jens-maus#2513, @jp112sdl)
jp112sdl · Nov 18, 2023 · f8ac876 · f8ac876
2 parents 2424d74 + 0f9e825
commit f8ac876
Show file tree

Hide file tree

Showing 17 changed files with 4,291 additions and 3,401 deletions.
diff --git a/buildroot-external/board/rpi0/uboot.config b/buildroot-external/board/rpi0/uboot.config
@@ -1,3 +1,7 @@
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="RaspberryPi"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0a5c

diff --git a/buildroot-external/board/rpi2/uboot.config b/buildroot-external/board/rpi2/uboot.config
@@ -1,3 +1,7 @@
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="RaspberryPi"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0a5c

diff --git a/buildroot-external/board/rpi3/uboot.config b/buildroot-external/board/rpi3/uboot.config
@@ -1,5 +1,9 @@
 CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
 
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="RaspberryPi"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0a5c

diff --git a/buildroot-external/board/rpi4/uboot.config b/buildroot-external/board/rpi4/uboot.config
@@ -1,3 +1,7 @@
+# disable serial to not interfere
+# CONFIG_BCM283X_MU_SERIAL is not set
+# CONFIG_BCM283X_PL011_SERIAL is not set
+
 CONFIG_CMD_NVME=y
 
 CONFIG_USB_STORAGE=y

diff --git a/buildroot-external/bootloader/uboot.config b/buildroot-external/bootloader/uboot.config
@@ -27,8 +27,8 @@ CONFIG_SPL_SILENT_CONSOLE=y
 CONFIG_TPL_SILENT_CONSOLE=y
 CONFIG_SILENT_U_BOOT_ONLY=y
 CONFIG_DISPLAY_BOARDINFO=y
-CONFIG_NULLDEV_SERIAL=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
+# CONFIG_SERIAL_PRESENT is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y

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  d81c82bfc5af699fed48f8f4fd8d29071aca4855c73ecad37a1b7b1b049eea0a  occu-3.73.6-2.tar.gz
+sha256  d2498d5e9f9527de029f62737b14bf35f75a02345b45909db55248dd7250afef  occu-3.73.9-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.73.6-2
+OCCU_VERSION = 3.73.9-1
 OCCU_SITE = $(call github,jens-maus,occu,$(OCCU_VERSION))
 OCCU_LICENSE = HMSL
 OCCU_LICENSE_FILES = LicenseDE.txt

diff --git a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-rpi1.dts b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-rpi1.dts
@@ -65,14 +65,4 @@
             pivccu,rtc = <&rpi_rf_mod_rtc>;  // RPI-RF-MOD
         };
     };
-
-    // fragement to make sure that stdout-path under chosen
-    // is empty so that the above uart0 fragement does not
-    // interfere with u-boot.
-    fragment@4 {
-        target = <&chosen>;
-        __overlay__ {
-            stdout-path = "";
-        };
-    };
 };
diff --git a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-yellow.dts b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod-yellow.dts
@@ -46,14 +46,4 @@
             pivccu,reset-gpios = <&gpio 18 0>; // HM-MOD-RPI-PCB
         };
     };
-
-    // fragement to make sure that stdout-path under chosen
-    // is empty so that the above uart0 fragement does not
-    // interfere with u-boot.
-    fragment@3 {
-        target = <&chosen>;
-        __overlay__ {
-            stdout-path = "";
-        };
-    };
 };
diff --git a/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dts b/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dts
@@ -84,14 +84,4 @@
             pivccu,rtc = <&rpi_rf_mod_rtc>;       // RPI-RF-MOD
         };
     };
-
-    // fragement to make sure that stdout-path under chosen
-    // is empty so that the above uart0 fragement does not
-    // interfere with u-boot.
-    fragment@4 {
-        target = <&chosen>;
-        __overlay__ {
-            stdout-path = "";
-        };
-    };
 };
diff --git a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk
@@ -11,7 +11,7 @@
 #
 ################################################################################
 
-RPI_RF_MOD_VERSION = 1.13.1
+RPI_RF_MOD_VERSION = 1.13.2
 RPI_RF_MOD_SITE = $(BR2_EXTERNAL_EQ3_PATH)/package/rpi-rf-mod
 RPI_RF_MOD_SITE_METHOD = local
 RPI_RF_MOD_LICENSE = Apache-2.0

diff --git a/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches.patch b/buildroot-external/patches/occu/0039-WebUI-Fix-Style-Glitches.patch
@@ -1191,119 +1191,119 @@
 +++ occu/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm
 @@ -63,43 +63,43 @@
  <div class="CLASS04301">
- <div id="noNewDevs" class="CLASS04302" style="display:none;">${noDeviceInPostBox}</div>
- <table id="newDevTbl" class="tblList CLASS04303" cellpadding="0" cellspacing="0"
--       style="display:none; width:97%; margin:1%;">
-+       style="display:none;">
- <colgroup>
--  <col style="width:2%;"  width="2%"/>
-+  <col style="width:25px;" />
-   <!-- Plus/Minus Device-->
--  <col style="width:2%;"/>
-+  <col style="width:25px;" />
-   <!-- Plus/Minus Group -->
--  <col style="width:2%;"/>
-+  <col />
-   <!-- Leere Zelle vor GroupMember -->
--  <col style="width:1%;"/>
--  <col style="width:3%;"/>
--  <col style="width:7%;"/>
--  <col style="width:7%;"/>
--  <col style="width:9%;"/>
--  <col style="width:7%;"/>
--  <col style="width:7%;"/>
--  <col style="width:7%;"/>
--  <col style="width:7%;"/>
--  <col style="width:7%;"/>
--  <col style="width:15%;"/>
--  <col style="width:7%;"/>
-+  <col />
-+  <col style="width:50px;" />
-+  <col />
-+  <col />
-+  <col />
-+  <col />
-+  <col />
-+  <col />
-+  <col />
-+  <col />
-+  <col style="width:100px;"/>
-+  <col style="width:100px;"/>
- </colgroup>
- <tbody id="tblNewDevices">
- <tr id="tblNewDevicesHeader">
-   <th id="tblListFold"></th>
-
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('type')" colspan='3'><b>${thTypeDescriptor}</b></th>
--  <th class="Sort CLASS04304 border1px"><b>${thPicture}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('desc')"><b>${thDescriptor}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('sn')"><b>${thSerialNumber}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('iface')"><b>${thInterfaceCategory}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('trans')"><b>${thTransmitMode}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('name')"><b>${thName}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('func')"><b>${thFunc}</b></th>
--  <th class="Sort CLASS04304 border1px" onclick="NewDevSort('room')"><b>${thRoom}</b></th>
--  <th class="Sort CLASS04304 border1px"><b>${thFunctionTest}</b></th>
--  <th class="Sort CLASS04304 border1px"><b>${thAction}</b></th>
--  <th class="Sort CLASS04304 border1px"><b>${thReady}</b></th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('type')" colspan='3'>${thTypeDescriptor}</th>
-+  <th class="DeviceListHead">${thPicture}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('desc')">${thDescriptor}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('sn')">${thSerialNumber}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('iface')">${thInterfaceCategory}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('trans')">${thTransmitMode}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('name')">${thName}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('func')">${thFunc}</th>
-+  <th class="DeviceListHead clickable" onclick="NewDevSort('room')">${thRoom}</th>
-+  <th class="DeviceListHead">${thFunctionTest}</th>
-+  <th class="DeviceListHead">${thAction}</th>
-+  <th class="DeviceListHead">${thReady}</th>
- </tr>
-
- <script type="text/javascript">
+   <div id="noNewDevs" class="CLASS04302" style="display:none;">${noDeviceInPostBox}</div>
+   <table id="newDevTbl" class="tblList CLASS04303" cellpadding="0" cellspacing="0"
+-         style="display:none; width:97%; margin:1%;">
++         style="display:none;">
+     <colgroup>
+-      <col style="width:2%;"  width="2%"/>
++      <col style="width:25px;"/>
+       <!-- Plus/Minus Device-->
+-      <col style="width:2%;"/>
++      <col style="width:25px;"/>
+       <!-- Plus/Minus Group -->
+-      <col style="width:2%;"/>
++      <col />
+       <!-- Leere Zelle vor GroupMember -->
+-      <col style="width:1%;"/>
+-      <col style="width:3%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:9%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:7%;"/>
+-      <col style="width:15%;"/>
+-      <col style="width:7%;"/>
++      <col />
++      <col style="width:50px;"/>
++      <col />
++      <col />
++      <col />
++      <col />
++      <col />
++      <col />
++      <col />
++      <col />
++      <col style="width:100px;"/>
++      <col style="width:100px;"/>
+     </colgroup>
+     <tbody id="tblNewDevices">
+     <tr id="tblNewDevicesHeader">
+       <th id="tblListFold"></th>
+
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('type')" colspan='3'><b>${thTypeDescriptor}</b></th>
+-      <th class="Sort CLASS04304 border1px"><b>${thPicture}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('desc')"><b>${thDescriptor}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('sn')"><b>${thSerialNumber}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('iface')"><b>${thInterfaceCategory}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('trans')"><b>${thTransmitMode}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('name')"><b>${thName}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('func')"><b>${thFunc}</b></th>
+-      <th class="Sort CLASS04304 border1px" onclick="NewDevSort('room')"><b>${thRoom}</b></th>
+-      <th class="Sort CLASS04304 border1px"><b>${thFunctionTest}</b></th>
+-      <th class="Sort CLASS04304 border1px"><b>${thAction}</b></th>
+-      <th class="Sort CLASS04304 border1px"><b>${thReady}</b></th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('type')" colspan='3'>${thTypeDescriptor}</th>
++      <th class="DeviceListHead">${thPicture}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('desc')">${thDescriptor}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('sn')">${thSerialNumber}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('iface')">${thInterfaceCategory}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('trans')">${thTransmitMode}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('name')">${thName}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('func')">${thFunc}</th>
++      <th class="DeviceListHead clickable" onclick="NewDevSort('room')">${thRoom}</th>
++      <th class="DeviceListHead">${thFunctionTest}</th>
++      <th class="DeviceListHead">${thAction}</th>
++      <th class="DeviceListHead">${thReady}</th>
+     </tr>
+
+     <script type="text/javascript">
 @@ -381,7 +381,7 @@
-   var img = Builder.node('img', {src: "/ise/img/plus.png", id: "img" + arDevices[i]['id'], alt: "plus", onclick: "expandDevice(" + arDevices[i]['id'] + "," + i + ")"});
-   td.appendChild(img);
-   tr.appendChild(td);
--  td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, strCut(arDevices[i]['type'], true));
-+  td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, arDevices[i]['type']);
-   tr.appendChild(td);
-   td = Builder.node('td', {className: 'WhiteBkgPic CLASS04314 border1px'}, [
-     Builder.node('div', {id: 'picDiv' + arDevices[i]['id'], className: "CLASS04305",
+         var img = Builder.node('img', {src: "/ise/img/plus.png", id: "img" + arDevices[i]['id'], alt: "plus", onclick: "expandDevice(" + arDevices[i]['id'] + "," + i + ")"});
+         td.appendChild(img);
+         tr.appendChild(td);
+-        td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, strCut(arDevices[i]['type'], true));
++        td = Builder.node('td', {className: 'GrayBkg border1px', colSpan: 3}, arDevices[i]['type']);
+         tr.appendChild(td);
+         td = Builder.node('td', {className: 'WhiteBkgPic CLASS04314 border1px'}, [
+           Builder.node('div', {id: 'picDiv' + arDevices[i]['id'], className: "CLASS04305",
 @@ -391,7 +391,7 @@
-   td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['desc'] );
-   td.innerHTML = translateKey(arDevices[i]['desc']);
-   tr.appendChild(td);
--  td = Builder.node('td', {className: 'GrayBkg border1px'}, strCut(arDevices[i]['sn']));
-+  td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['sn']);
-   tr.appendChild(td);
-   td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['iface']);
-   tr.appendChild(td);
+         td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['desc'] );
+         td.innerHTML = translateKey(arDevices[i]['desc']);
+         tr.appendChild(td);
+-        td = Builder.node('td', {className: 'GrayBkg border1px'}, strCut(arDevices[i]['sn']));
++        td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['sn']);
+         tr.appendChild(td);
+         td = Builder.node('td', {className: 'GrayBkg border1px'}, arDevices[i]['iface']);
+         tr.appendChild(td);
 @@ -401,13 +401,13 @@
 
-   if (NAV_IE) {
-     td = Builder.node('td', {className: 'WhiteBkg border1px'},
--      [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true)) ]);
-+      [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']) ]);
-     tr.appendChild(td);
-   }
-   else {
-     if (isDevTypeHmIPW(arDevices[i]['type'])) {
-       td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px'});
--      divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, strCut(arDevices[i]['name'].replace(/:/g, ":<br/>"), false));
-+      divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, arDevices[i]['name'].replace(/:/g, ":<br/>"));
-       divB = Builder.node('div', {
-         id: 'btnRename_' + arDevices[i]["id"],
-         className: 'TestButton colorGradient borderRadius2px hidden',
+         if (NAV_IE) {
+           td = Builder.node('td', {className: 'WhiteBkg border1px'},
+-            [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true)) ]);
++          [Builder.node('div', {id: 'tdn' + arDevices[i]['id'], className: "CLASS04306", onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']) ]);
+           tr.appendChild(td);
+         }
+         else {
+           if (isDevTypeHmIPW(arDevices[i]['type'])) {
+             td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px'});
+-            divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, strCut(arDevices[i]['name'].replace(/:/g, ":<br/>"), false));
++            divA = Builder.node('div', {id: 'tdn' + arDevices[i]['id']}, arDevices[i]['name'].replace(/:/g, ":<br/>"));
+             divB = Builder.node('div', {
+               id: 'btnRename_' + arDevices[i]["id"],
+               className: 'TestButton colorGradient borderRadius2px hidden',
 @@ -417,7 +417,7 @@
-       td.appendChild(divA);
-       td.appendChild(divB);
-     } else {
--      td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true));
-+      td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']);
-     }
-
-     tr.appendChild(td);
+             td.appendChild(divA);
+             td.appendChild(divB);
+           } else {
+-            td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0, CALL_STRCUT)'}, strCut(arDevices[i]['name'], true));
++            td = Builder.node('td', {className: 'WhiteBkg CLASS04307 border1px', id: 'tdn' + arDevices[i]['id'], onclick: 'textEdit(id, ' + arDevices[i]['id'] + ', false, 0)'}, arDevices[i]['name']);
+           }
+
+           tr.appendChild(td);
 --- occu/WebUI/www/rega/pages/tabs/admin/views/programlist.htm.orig
 +++ occu/WebUI/www/rega/pages/tabs/admin/views/programlist.htm
 @@ -57,9 +57,16 @@