Fixed detection of RPI-RF-MOD on some new charges

alexreinert · Mar 13, 2020 · abf4862 · abf4862
1 parent 6dd552b
commit abf4862
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/create_debmatic.sh b/create_debmatic.sh
@@ -9,7 +9,7 @@ OCCU_DOWNLOAD_URL="https://github.com/eq-3/occu/archive/$ARCHIVE_TAG.tar.gz"
 CCU_DOWNLOAD_SPLASH_URL="https://www.eq-3.de/service/downloads.html"
 CCU_DOWNLOAD_URL="https://www.eq-3.de/downloads/software/firmware/ccu3-firmware/ccu3-$CCU_VERSION.tgz"
 
-PKG_BUILD=42
+PKG_BUILD=43
 
 CURRENT_DIR=$(pwd)
 WORK_DIR=$(mktemp -d)

diff --git a/debmatic/usr/share/debmatic/bin/detect_hardware.inc b/debmatic/usr/share/debmatic/bin/detect_hardware.inc
@@ -59,7 +59,7 @@ do
 
     HM_HMRF_ADDRESS=`/bin/eq3configcmd read-default-rf-address -f /dev/$UART_DEV -h 2>&1 | grep "^0x"`
 
-    if [ -z "$HM_HMRF_ADDRESS" ] || [ "$HM_HMRF_ADDRESS" == "0x00ffff" ] || [ "$RADIO_MAC" == "0xa9ffff" ]; then
+    if [ -z "$HM_HMRF_ADDRESS" ] || [[ "$HM_HMRF_ADDRESS" =~ ^0x..ffff$ ]]; then
       RF_RPI_MOD_INFO=`timeout 20 /usr/bin/java $JAVA_ARGS -Dgnu.io.rxtx.SerialPorts=/dev/$UART_DEV -jar /opt/HmIP/hmip-copro-update.jar -p /dev/$UART_DEV -v -a 2>&1`
       HM_HMRF_ADDRESS=`echo "$RF_RPI_MOD_INFO" | sed -n 's/.*Radio address = \([0-9A-Fa-f]\{6\}\).*/0x\1/p'`
       HM_HMIP_SGTIN=`echo "$RF_RPI_MOD_INFO" | sed -n 's/.*SGTIN = \([0-9A-Fa-f]\{24\}\).*/\1/p' | tr '[:lower:]' '[:upper:]'`