aljaz/addons
1
0
Fork 0
mirror of https://github.com/aljazceru/addons.git synced 2026-02-02 11:45:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

homematic add-on to use Bashio #725 (#743)

Browse Source 
*  homematic add-on to use Bashio #725

* uppercase to lowercase correction

* Update change log and version

* Updated logging to bashio
This commit is contained in:
Zapfmeister
2019-12-10 15:59:29 +01:00
committed by Pascal Vizeli
parent f71edff3fa
commit bf24cd0d76
2 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
homematic/CHANGELOG.md
View File

@@ -1,5 +1,9 @@
# Changelog
## 9.3
- Update from bash to bashio
## 9.2
- Update OCCU to 3.47.22-3

50
homematic/data/run.sh
View File

@@ -1,15 +1,7 @@
#!/bin/bash
#!/usr/bin/env bashio
# shellcheck disable=SC1091
set -e
CONFIG_PATH=/data/options.json
RF_ENABLE=$(jq --raw-output '.rf_enable' $CONFIG_PATH)
RF_DEVICES=$(jq --raw-output '.rf | length' $CONFIG_PATH)
WIRED_ENABLE=$(jq --raw-output '.wired_enable' $CONFIG_PATH)
WIRED_DEVICES=$(jq --raw-output '.wired | length' $CONFIG_PATH)
HMIP_ENABLE=$(jq --raw-output '.hmip_enable' $CONFIG_PATH)
HMIP_DEVICES=$(jq --raw-output '.hmip | length' $CONFIG_PATH)
WAIT_PIDS=()
# Init folder
@@ -32,16 +24,18 @@ touch /data/homematic.regadom
. /usr/lib/hm-interface.sh
# Setup Interfaces
init_interface_list "$RF_ENABLE" "$HMIP_ENABLE" "$WIRED_ENABLE"
init_interface_list "$(bashio::config 'rf_enable')" \
"$(bashio::config 'hmip_enable')" \
"$(bashio::config 'wired_enable')"
# RF support
if [ "$RF_ENABLE" == "true" ]; then
for (( i=0; i < "$RF_DEVICES"; i++ )); do
TYPE=$(jq --raw-output ".rf[$i].type" $CONFIG_PATH)
if bashio::config.true 'rf_enable'; then
for rf_device in $(bashio::config 'rf|keys'); do
TYPE=$(bashio::config "rf[${rf_device}].type")
# Update config
if [ "$TYPE" == "CCU2" ]; then
DEVICE=$(jq --raw-output ".rf[$i].device" $CONFIG_PATH)
DEVICE=$(bashio::config "rf[${rf_device}].device")
(
echo "[Interface $1]"
echo "Type = CCU2"
@@ -74,11 +68,11 @@ if [ "$RF_ENABLE" == "true" ]; then
fi
# Wired support
if [ "$WIRED_ENABLE" == "true" ]; then
for (( i=0; i < "$WIRED_DEVICES"; i++ )); do
SERIAL=$(jq --raw-output ".wired[$i].serial" $CONFIG_PATH)
KEY=$(jq --raw-output ".wired[$i].key" $CONFIG_PATH)
IP=$(jq --raw-output ".wired[$i].ip" $CONFIG_PATH)
if bashio::config.true 'wired_enable'; then
for wired_device in $(bashio::config 'wired|keys'); do
SERIAL=$(bashio::config "wired[${wired_device}].serial")
KEY=$(bashio::config "wired[${wired_device}].key")
IP=$(bashio::config "wired[${wired_device}].ip")
# Update config
(
@@ -99,17 +93,17 @@ if [ "$WIRED_ENABLE" == "true" ]; then
fi
# HMIP support
if [ "$HMIP_ENABLE" == "true" ]; then
if bashio::config.true 'hmip_enable'; then
# Restore data
if [ -f /data/hmip_address.conf ]; then
cp -f /data/hmip_address.conf /etc/config/
fi
# Setup settings
for (( i=0; i < "$HMIP_DEVICES"; i++ )); do
TYPE=$(jq --raw-output ".hmip[$i].type" $CONFIG_PATH)
DEVICE=$(jq --raw-output ".hmip[$i].device" $CONFIG_PATH)
ADAPTER=$((i+1))
for hmip_device in $(bashio::config 'hmip|keys'); do
TYPE=$(bashio::config "hmip[${hmip_device}].type")
DEVICE=$(bashio::config "hmip[${hmip_device}].device")
ADAPTER=$((hmip_device+1))
# Update Firmware
firmware_update_hmip "${DEVICE}"
@@ -137,10 +131,10 @@ fi
# Register stop
function stop_homematic() {
echo "Kill Processes..."
bashio::log.info "Kill Processes..."
kill -15 "${WAIT_PIDS[@]}"
wait "${WAIT_PIDS[@]}"
echo "Done."
bashio::log.info "Done."
}
trap "stop_homematic" SIGTERM SIGHUP
@@ -156,11 +150,11 @@ lighttpd-angel -D -f /opt/hm/etc/lighttpd/lighttpd.conf &
WAIT_PIDS+=($!)
# Sync time periodically
if [ "$RF_ENABLE" == "true" ]; then
if bashio::config.true 'rf_enable'; then
while true
do
sleep 30m
echo "$(date '+%Y-%m-%d %H:%M:%S.%3N') Run SetInterfaceClock now."
bashio::log.info "$(date '+%Y-%m-%d %H:%M:%S.%3N') Run SetInterfaceClock now."
"$HM_HOME/bin/SetInterfaceClock" 127.0.0.1:2001
done
fi