Full switch from fhem to homematic ccu + frontend cleanup

This commit is contained in:
Martin Bauer
2021-09-19 08:36:59 +00:00
parent 33356fa8ca
commit a0e498edeb
23 changed files with 1921 additions and 1815 deletions

View File

@@ -1,106 +0,0 @@
light:
- name: Schlafzimmer Deckenlampe
dimmer: True
fhem_ids:
- Schlafzimmer_Deckenlampe_Sw
- Schlafzimmer_Deckenlampe
- Schlafzimmer_Deckenlampe_Sw1_V_01
- Schlafzimmer_Deckenlampe_Sw1_V_02
groups:
- bedroom
- name: Arbeitszimmer Deckenlampe
dimmer: True
fhem_ids:
- Arbeitszimmer_Deckenlampe_Sw
- Arbeitszimmer_Deckenlampe
- Arbeitszimmer_Deckenlampe_Sw1_V_01
- Arbeitszimmer_Deckenlampe_Sw1_V_02
groups:
- office
- name: Kinderzimmer Deckenlampe
dimmer: True
fhem_ids:
- Kinderzimmer_Deckenlampe_Sw
- Kinderzimmer_Deckenlampe
- Kinderzimmer_Deckenlampe_Sw1_V_01
- Kinderzimmer_Deckenlampe_Sw1_V_02
groups:
- kids_room
- name: Mobile Steckdosen Dimmer
dimmer: True
fhem_ids:
- Steckdose_Dimmer
cover:
- name: Arbeitszimmer Rollo
fhem_ids:
- Arbeitszimmer_Rollo
groups:
- office
- name: Schlafzimmer Rollo klein
fhem_ids:
- Schlafzimmer_RolloKlein
groups:
- bedroom
- name: Schlafzimmer Rollo groß
fhem_ids:
- Schlafzimmer_RolloGross
groups:
- bedroom
- name: Kinderzimmer Rollo
fhem_ids:
- Kinderzimmer_Rollo
groups:
- kids_room
switch:
- name: Bad Lüfter
fhem_ids:
- Bad_Luefter
- name: Mobile Steckdose Schalter 1
fhem_ids:
- MobileSteckdoseSchalter1_Sw
- MobileSteckdoseSchalter1
- name: Mobile Steckdose Schalter 2
fhem_ids:
- MobileSteckdoseSchalter2_Sw
- MobileSteckdoseSchalter2
binary_sensor:
- name: Arbeitszimmer Bewegungsmelder Batterie
fhem_ids:
- Arbeitszimmer_Bewegungsmelder
fhem_sensor_type: battery
- name: Arbeitszimmer Bewegungsmelder Bewegung
fhem_ids:
- Arbeitszimmer_Bewegungsmelder
fhem_sensor_type: motion
sensor:
- name: Arbeitszimmer Bewegungsmelder Helligkeit
fhem_ids:
- Arbeitszimmer_Bewegungsmelder
fhem_sensor_type: brightness
#- name: Pool Pumpe Verbrauch
# fhem_sensor_type: power
# fhem_ids:
# - SteckdosenSchalter_Pwr
# - SteckdosenSchalter

View File

@@ -1,4 +1,4 @@
# Add only entities here that are auto-discovered (not FHEM and KNX devices)
# Add only entities here that are auto-discovered (not KNX devices)
#default_view:
# view: true

View File

@@ -164,19 +164,6 @@ def add_knx_devices(devices, groups):
return template_sensors
def add_fhem_devices(devices, groups):
fhem_yaml_path = os.path.join(script_path, 'fhem.yaml')
fhem_yaml = yaml.load(open(fhem_yaml_path, encoding="utf-8"))
for device_type, device_list in fhem_yaml.items():
if device_type not in devices:
devices[device_type] = []
for device in device_list:
device['platform'] = 'fhem'
if 'groups' in device:
add_to_group(groups, device['groups'], device['name'], device_type)
del device['groups']
devices[device_type].append(device)
def add_meta_groups(groups):
all_devices = set()
@@ -278,12 +265,13 @@ def create_config(target_directory, development=False):
all_devices = {}
all_devices.update(template_sensors)
add_fhem_devices(all_devices, group_dict)
with open(os.path.join(target_directory, 'configuration.yaml'), 'w', encoding="utf-8") as output:
output.write("# Dont' edit manually! this is generated!\n\n")
for key in ['sensor', 'switch', 'light', 'cover', 'binary_sensor']:
if key in manual_config_dict:
if key not in all_devices:
all_devices[key] = []
all_devices[key].extend(manual_config_dict[key])
del manual_config_dict[key]
yaml.dump(manual_config_dict, output)

View File

@@ -2,6 +2,8 @@
# Configure a default setup of Home Assistant (frontend, api, etc)
#default_config:
frontend:
themes: !include_dir_merge_named themes
mobile_app:
person:
sun:
@@ -18,7 +20,6 @@ timer:
# Uncomment this if you are using SSL/TLS, running in Docker container, etc.
http:
base_url: https://ha.bauer.tech
use_x_forwarded_for: true
trusted_proxies:
192.168.178.80
@@ -106,7 +107,6 @@ influxdb:
ios:
shopping_list:
octoprint:
@@ -262,13 +262,12 @@ long_click:
- switch.eingang_szene_4
- switch.eingang_szene_5
logger:
default: info
logs:
custom_components.fhem: debug
#custom_components: debug
#custom_components.reconnecting_client: debug
#logger:
# default: info
# logs:
# #custom_components: debug
# #custom_components.reconnecting_client: debug
#
# Sensors
#sensor:
# Weather prediction
@@ -476,11 +475,6 @@ homematic:
username: homeassistant
password: !secret homematic_pw
fhem:
host: localhost
port: 7072
cul_device_name: CUL_HM
zwave:
usb_path: /dev/serial/by-id/usb-0658_0200-if00
network_key: "0xE0, 0x64, 0x50, 0x55, 0x20, 0x63, 0xC7, 0x05, 0x62, 0xD3, 0xEA, 0x91, 0x87, 0xE0, 0x1E, 0x74"