From 79ead0e37856cc560969951b5859ab3acf6271ac Mon Sep 17 00:00:00 2001 From: Tomas Widsell Date: Mon, 15 Jan 2018 19:38:55 +0100 Subject: [PATCH] changes --- .HA_VERSION | 2 +- .tradfri_psk.conf | 6 ++ .vscode/settings.json | 12 +++ automations.yaml | 13 +-- configuration.yaml | 44 ++++++--- configuration.yaml.save | 102 ------------------- configuration.yaml.save.1 | 116 ---------------------- sensors.yaml | 14 +-- zwcfg_0xf1df11fc.xml.bak1 | 203 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 260 insertions(+), 252 deletions(-) create mode 100644 .tradfri_psk.conf create mode 100644 .vscode/settings.json delete mode 100644 configuration.yaml.save delete mode 100644 configuration.yaml.save.1 create mode 100644 zwcfg_0xf1df11fc.xml.bak1 diff --git a/.HA_VERSION b/.HA_VERSION index ad0b33d..821e2d6 100644 --- a/.HA_VERSION +++ b/.HA_VERSION @@ -1 +1 @@ -0.57.2 \ No newline at end of file +0.61.0 \ No newline at end of file diff --git a/.tradfri_psk.conf b/.tradfri_psk.conf new file mode 100644 index 0000000..5e9faad --- /dev/null +++ b/.tradfri_psk.conf @@ -0,0 +1,6 @@ +{ + "192.168.1.251": { + "identity": "f40f299503c040b7986bcbe24d94726f", + "key": "Bvy7zpCRadg2Odby" + } +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..58e6572 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,12 @@ +{ + "logViewer.watch": [ + { + "title": "Home Assistant", + "pattern": "Z:\\home-assistant.log" + }, + { + "title": "Z-Wave Log", + "pattern": "Z:\\OZW_Log.txt" + } + ], +} \ No newline at end of file diff --git a/automations.yaml b/automations.yaml index 74d2dc5..216f4a1 100644 --- a/automations.yaml +++ b/automations.yaml @@ -93,15 +93,6 @@ - service: switch.turn_off entity_id: switch.handdukstork_49 -- id: Bevattning - alias: Bevattning - trigger: - - platform: time - at: '19:00:00' - action: - - service: switch.turn_on - entity_id: switch.vattenpump_94 - - id: Bevattning Auto Off alias: Bevattning Automatisk Avstängning trigger: @@ -118,8 +109,8 @@ alias: Handdukstork Auto På (Luftfuktighet) trigger: - platform: numeric_state - entity_id: sensor.bathroom_humidity_delta - above: 15 + entity_id: sensor.temphumidity_bathroom_sensor_stats_mean + above: 11 action: - service: switch.turn_on entity_id: switch.handdukstork_49 diff --git a/configuration.yaml b/configuration.yaml index 27978e2..92fa119 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -20,6 +20,12 @@ frontend: # Enables configuration UI config: + +recorder: + purge_interval: 1 + purge_keep_days: 30 + db_url: !secret mssqldb_url + logger: default: warning @@ -46,6 +52,8 @@ http: ssl_certificate: /etc/letsencrypt/live/home.widsell.nu/fullchain.pem ssl_key: /etc/letsencrypt/live/home.widsell.nu/privkey.pem base_url: home.widsell.nu + ip_ban_enabled: True + login_attempts_threshold: 5 # Checks for available updates # Note: This component will send some information about your system to @@ -112,21 +120,13 @@ notify: gcm_api_key: 'AAAAutnjaPk:APA91bEj3RCns7KJSytQvrcv4t5Uwjpr8U9whcvscIdrXiI_ziUkP8nEccD13JTK7B_3QM_fBVBHzStuY0qKSOWvMb1ekRbJx9BeXWKTbhSCDDSoFbzhhfDjy5NhK59Od2wf6h22v8-P' gcm_sender_id: '802519476473' -influxdb: - username: "hass" - password: !secret influxdb_pw - database: "db_widsnet" - default_measurement: state - exclude: - domains: - - automation - -#device_tracker: -# - platform: asuswrt -# host: 192.168.1.1 -# protocol: telnet -# username: admin -# password: !secret default_password +device_tracker: + - platform: owntracks_http + - platform: asuswrt + host: 192.168.1.1 + protocol: telnet + username: admin + password: !secret default_password mqtt: broker: localhost @@ -134,6 +134,9 @@ mqtt: username: homeassistant password: !secret mosquitto +#light: +# platform: hue +# host: 192.168.1.171 panel_iframe: grafana: @@ -141,5 +144,16 @@ panel_iframe: icon: 'mdi:chart-bar' url: 'https://home.widsell.nu:3000/dashboard/db/home-assistant?orgId=1' +influxdb: + username: "hass" + host: 192.168.1.10 + password: !secret influxdb_pw + max_retries: 3 + database: "db_widsnet" + default_measurement: state + exclude: + domains: + - automation + group: !include groups.yaml automation: !include automations.yaml diff --git a/configuration.yaml.save b/configuration.yaml.save deleted file mode 100644 index 42e64b9..0000000 --- a/configuration.yaml.save +++ /dev/null @@ -1,102 +0,0 @@ -homeassistant: - # Name of the location where Home Assistant is running - name: Home - # Location required to calculate the time the sun rises and sets - latitude: 59.2618127 - longitude: 18.0431841 - # Impacts weather/sunrise data (altitude above sea level in meters) - elevation: 11 - # metric for Metric, imperial for Imperial - unit_system: metric - # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones - time_zone: Europe/Stockholm - -# Show links to resources in log and frontend -introduction: - -# Enables the frontend -frontend: - -# Enables configuration UI -config: - -logger: - -camera: - - platform: onvif - host: 192.168.1.153 - port: 10080 -http: - # Uncomment this to add a password (recommended!) - api_password: Gangst3r - # Uncomment this if you are using SSL or running in Docker etc - # base_url: example.duckdns.org:8123 - -# Checks for available updates -# Note: This component will send some information about your system to -# the developers to assist with development of Home Assistant. -# For more information, please see: -# https://home-assistant.io/blog/2016/10/25/explaining-the-updater/ -updater: - -# Discover some devices automatically -discovery: - -# Allows you to issue voice commands from the frontend in enabled browsers -conversation: - -# Enables support for tracking state changes over time. -history: - -# View all events in a logbook -logbook: - -# Track the sun -sun: - -# Weather Prediction -sensor: - - platform: yr - - - platform: dht - sensor: DHT22 - pin: 4 - monitored_conditions: - - temperature - - humidity - -# 433mhz -switch: - - platform: rpi_rf - gpio: 5 - switches: - balcony_light: - pulselength: 410 - code_on: 2814979 - code_off: 2814977 - -# Text to speech -tts: - platform: google - -tradfri: - host: 192.168.1.252 - api_key: 46WXFSI3dAN7UwxQ - -vera: - vera_controller_url: http://192.168.1.127:3480/ - -notify: - - platform: pushbullet - name: pushbullet - api_key: o.IrUpL7RBwALWWf0axjkjb4uZLDAJjKZE - -device_tracker: - - platform: asuswrt - host: 192.168.1.1 - protocol: telnet - username: admin - password: Gangst3r - -group: !include groups.yaml -automation: !include automations.yaml diff --git a/configuration.yaml.save.1 b/configuration.yaml.save.1 deleted file mode 100644 index a041cd1..0000000 --- a/configuration.yaml.save.1 +++ /dev/null @@ -1,116 +0,0 @@ -/etc/letsencrypt/live/home.widsell.nu/fullchain.pemhomeassistant: - # Name of the location where Home Assistant is running - name: Home - # Location required to calculate the time the sun rises and sets - latitude: 59.2618127 - longitude: 18.0431841 - # Impacts weather/sunrise data (altitude above sea level in meters) - elevation: 11 - # metric for Metric, imperial for Imperial - unit_system: metric - # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones - time_zone: Europe/Stockholm - -# Show links to resources in log and frontend -introduction: - -# Enables the frontend -frontend: - -# Enables configuration UI -config: - -logger: - -camera: - - platform: onvif - host: 192.168.1.153 - -http: - # Uncomment this to add a password (recommended!) - api_password: Gangst3r - # Uncomment this if you are using SSL or running in Docker etc - # base_url: example.duckdns.org:8123 - #ssl_certificate: /etc/letsencrypt/live/home.widsell.nu/fullchain.pem - #ssl_key: /etc/letsencrypt/live/home.widsell.nu/privkey.pem - base_url: home.widsell.nu - -# Checks for available updates -# Note: This component will send some information about your system to -# the developers to assist with development of Home Assistant. -# For more information, please see: -# https://home-assistant.io/blog/2016/10/25/explaining-the-updater/ -updater: - -# Discover some devices automatically -discovery: - -# Allows you to issue voice commands from the frontend in enabled browsers -conversation: - -# Enables support for tracking state changes over time. -history: - -# View all events in a logbook -logbook: - -# Track the sun -sun: - -# Weather Prediction -sensor: - - platform: yr - - - platform: dht - sensor: DHT22 - pin: 4 - monitored_conditions: - - temperature - - humidity - - - platform: miflora - name: Fikus - mac: C4:7C:8D:65:57:8D - median: 3 - monitored_conditions: - - temperature - - light - - moisture - - conductivity - - battery - -# 433mhz -switch: - - platform: rpi_rf - gpio: 5 - switches: - balcony_light: - pulselength: 410 - code_on: 2814979 - code_off: 2814977 - -# Text to speech -tts: - platform: google - -tradfri: - host: 192.168.1.252 - api_key: 46WXFSI3dAN7UwxQ - -vera: - vera_controller_url: http://192.168.1.127:3480/ - -notify: - - platform: pushbullet - name: pushbullet - api_key: o.IrUpL7RBwALWWf0axjkjb4uZLDAJjKZE - -device_tracker: - - platform: asuswrt - host: 192.168.1.1 - protocol: telnet - username: admin - password: Gangst3r - -group: !include groups.yaml -automation: !include automations.yaml diff --git a/sensors.yaml b/sensors.yaml index 6f4e6c3..0f44672 100644 --- a/sensors.yaml +++ b/sensors.yaml @@ -1,11 +1,11 @@ - platform: yr -- platform: dht - sensor: DHT22 - pin: 4 - monitored_conditions: - - temperature - - humidity +#- platform: dht +# sensor: DHT22 +# pin: 4 +# monitored_conditions: +# - temperature +# - humidity - platform: miflora name: Fikus @@ -27,6 +27,6 @@ sensors: bathroom_humidity_delta: friendly_name: "Bathroom Humidity Delta" - value_template: "{{ states.sensor.temphumidity_bathroom_sensor_stats_mean.attributes.max_value | float - states.sensor.temphumidity_bathroom_sensor_stats_mean.attributes.min_value | float }}" + value_template: "{{ states.sensor.temphumidity_bathroom_sensor_stats_mean.attributes.change | float }}" entity_id: sensor.temphumidity_bathroom_sensor_stats_mean unit_of_measurement: "Δ" \ No newline at end of file diff --git a/zwcfg_0xf1df11fc.xml.bak1 b/zwcfg_0xf1df11fc.xml.bak1 new file mode 100644 index 0000000..6f18323 --- /dev/null +++ b/zwcfg_0xf1df11fc.xml.bak1 @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This parameter defines Disable/Enable meter report measure data to controller. + + + + + This parameter defines interval time (in seconds) that Meter report data to main controller. + + + This parameter defines maximum current (in Amperes) the plug can provide to load that be connected to plug. If the current consumed by load is greater than maximum current, the plug will cut off power, and send NOTIFICATION_EVENT_POWER_MANAGEMENT_OVER_LOAD_DETECTED to associated devices in lifeline. Red Led will blink every seconds until current is normal (less than Parameter #3). You must remove the loader and turn on the Plug (press the button once) to enable current monitor and clear NOTIFICATION ALARM. This parameter value must be great than #4. If user set this parameter to default by Configure CC, the parameter #4 will be set to default value. + + + This parameter defines maximum current (in Amperes), if the current plug provide to load is greater than this parameter, the plug will send over-current notification to the controller and the LED will turn RED, but plug cannot cut-off power. This parameter value must be less than parameter #3. If user set this parameter to default by Configure CC, the parameter #3 will be set to default value. + + + This parameter defines the LED indication Function ON/OFF. If disabled, then LED indication Function and will always be turn-off, while enabled means LED Function is on. + + + + + This parameter defines by how much power consumed must change to be reported to the Z-Wave Controller or Z-Wave Gateway, in percents. If the rate of power consumed change ratio is greater than this parameter, the plug will report the results, voltage, current, power and energy, that plug measure to Z-Wave Controller or Z-Wave Gateway + + + This parameter defined the relay status if remember or not. If remembered, the plug will restore the relay status last power off when the plug supply power next time. + + + + + This parameter defines the timer function Enable/Disable. If disabled, then time switch function is not available. The time period will be defined in parameter #9. If enabled, and when turn the plug relay on, the timer in plug start run with time period defined in parameter #9 and the plug will turn the relay off. + + + + + This parameter defines the time period that plug time switch off. This parameter can be configured 1 - 65535(in minutes). If Parameter #9 is enabled, and relay is turn-on, the relay will be turn-off after delay this parameter. + + + This parameter defines the button on/off function is enabled or not on the top of the wall plug. If enabled, users can turn on and off the wall plug by pressing the button on the top of the wall plug. If disabled, the wall plug cannot be turned on and off by pressing the button. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +