From 481c4fdcd7de0152b5cd4f2e78d8f08f7fcc5581 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Thu, 19 Dec 2019 19:01:18 +0100
Subject: [PATCH] Update HM to 9.4 (#920)

---
 homematic/CHANGELOG.md           | 6 ++++++
 homematic/Dockerfile             | 3 +--
 homematic/build.json             | 2 +-
 homematic/config.json            | 2 +-
 homematic/data/config/crRFD.conf | 5 +++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/homematic/CHANGELOG.md b/homematic/CHANGELOG.md
index 30b42c2..f95d96e 100644
--- a/homematic/CHANGELOG.md
+++ b/homematic/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 9.4
+
+- Update OCCU to 3.49.17-2
+- Use new gcc8 binary for armhf
+- Don't use regahss-beta
+
 ## 9.3
 
 - Update from bash to bashio
diff --git a/homematic/Dockerfile b/homematic/Dockerfile
index f2b1074..c346be7 100644
--- a/homematic/Dockerfile
+++ b/homematic/Dockerfile
@@ -34,7 +34,7 @@ RUN curl -SL https://github.com/jens-maus/occu/archive/${OCCU_VERSION}.tar.gz |
     \
     && if [ "${BUILD_ARCH}" = "armv7" ]; \
         then \
-            cd arm-gnueabihf; \
+            cd arm-gnueabihf-gcc8; \
         else \
             cd X86_32_Debian_Wheezy; \
         fi \
@@ -50,7 +50,6 @@ RUN curl -SL https://github.com/jens-maus/occu/archive/${OCCU_VERSION}.tar.gz |
     && cp -R packages-eQ-3/WebUI/lib /opt/hm/ \
     && rm -rf packages-eQ-3/WebUI/etc/config* packages-eQ-3/WebUI/ect/rega.conf \
     && cp -R packages-eQ-3/WebUI/etc/* /opt/hm/etc/ \
-    && cp -R packages-eQ-3/WebUI-Beta/bin /opt/hm/ \
     && rm -f packages/lighttpd/etc/lighttpd/lighttpd_ssl.conf \
     && cp -R packages/lighttpd/etc/lighttpd /opt/hm/etc/ \
     && cd ../ \
diff --git a/homematic/build.json b/homematic/build.json
index aa55693..4ef8742 100644
--- a/homematic/build.json
+++ b/homematic/build.json
@@ -4,6 +4,6 @@
     "i386": "homeassistant/i386-base-debian:buster"
   },
   "args": {
-    "OCCU_VERSION": "3.47.22-3"
+    "OCCU_VERSION": "3.49.17-2"
   }
 }
diff --git a/homematic/config.json b/homematic/config.json
index 7e55401..10e313c 100644
--- a/homematic/config.json
+++ b/homematic/config.json
@@ -1,6 +1,6 @@
 {
   "name": "HomeMatic CCU",
-  "version": "9.3",
+  "version": "9.4",
   "slug": "homematic",
   "description": "HomeMatic central based on OCCU",
   "url": "hhttps://github.com/home-assistant/hassio-addons/tree/master/homematic",
diff --git a/homematic/data/config/crRFD.conf b/homematic/data/config/crRFD.conf
index 591418a..82b1063 100644
--- a/homematic/data/config/crRFD.conf
+++ b/homematic/data/config/crRFD.conf
@@ -22,8 +22,8 @@ Legacy.SendUDPServiceMessages=true
 Legacy.Port=2010
 Legacy.VirtualRemoteControl.Enabled=true
 Legacy.CallDeleteDevicesForChangedDevices=false
-Legacy.Client.Connection.Timeout=300000
-Legacy.Client.Socket.Timeout=300000
+Legacy.Client.Connection.Timeout=600000
+Legacy.Client.Socket.Timeout=600000
 
 # HmIP-Routing
 Adapter.Remote.Enabled=true
@@ -34,6 +34,7 @@ IPServices.Firmware.Update.URL=http://drap-update.homematic.com:80/firmware/hap/
 CyclicTimeout.TimerStartMaxDelay=90
 CyclicTimeout.TimerCycleTime=600
 Legacy.Parameter.ReplaceEnumValueWithOrdinal=true
+AED.Enabled=true
 
 ### Configuration for Inclusion with key server (internet) or local key (offline)
 KeyServer.Mode=KEYSERVER_LOCAL