Updates

config/configuration.yaml

@@ -29,8 +29,17 @@ frontend:
 # Enables configuration UI
 config:
 
+image_processing:
+  - platform: tensorflow
+    source:
+      - entity_id: camera.webcam
+    model:
+      graph: /config/tensorflow/frozen_inference_graph.pb
+
+emulated_hue:
+      
 octoprint:
-  host: 192.168.1.163
+  host: 192.168.1.126
   port: 5000
   api_key: 4C627EC30E884B1D9B65A7058FC67925
 
@@ -75,14 +84,7 @@ input_number:
 
 device_tracker:
   - platform: fritz
-    host: 192.168.2.1
-    new_device_defaults:
-      track_new_devices: False
-      hide_if_away: False
-  - platform: luci
     host: 192.168.1.1
-    username: !secret luci_username
-    password: !secret luci_password
     new_device_defaults:
       track_new_devices: False
       hide_if_away: False
@@ -109,13 +111,28 @@ sensor:
       - temperature
       - humidity
   - platform: fritzbox_callmonitor
-    host: 192.168.2.1
+    host: 192.168.1.1
     name: Phone
     username: homeassistant
     password: !secret fritz_password
     phonebook: 0
     prefixes:
       - '+49'
+  - platform: mqtt  
+    state_topic: "bruh/sensordht"  
+    name: "SN1 Humidity"  
+    unit_of_measurement: "%"  
+    value_template: '{{ value_json.humidity | round(1) }}'  
+  - platform: mqtt  
+    state_topic: "bruh/sensordht"  
+    name: "SN1 Temperature"  
+    unit_of_measurement: "°F"  
+    value_template: '{{ value_json.temperature | round(1) }}'  
+  - platform: mqtt
+    state_topic: "bruh/sensordht"
+    name: "SN1 Real Feel"
+    unit_of_measurement: "°F"
+    value_template: '{{ value_json.heatIndex | round(1) }}'
 
 binary_sensor:
   - platform: rpi_gpio
@@ -148,8 +165,6 @@ history_graph:
       - sensor.octoprint_target_bed_temp
       - sensor.octoprint_target_tool0_temp
     hours_to_show: 1
-  
-  
 
 lock:
   - platform: template
@@ -167,10 +182,15 @@ lock:
 light:
   - platform: flux_led
     devices:
-      192.168.1.185:
+      192.168.1.105:
         name: Led Strip
-      192.168.1.131:
+      192.168.1.123:
         name: Led Strip Bed
+  - platform: group
+    name: LED Strips
+    entities: 
+      - light.led_strip
+      - light.led_strip_bed
   - platform: template
     lights:
       hdmi:
@@ -187,7 +207,7 @@ light:
         turn_off:
           service: switch.turn_off
           entity_id: switch.lightrelay
-  - platform: mqtt_json
+  - platform: mqtt
     name: "WS2812B Strip"
     state_topic: "bruh/porch"
     command_topic: "bruh/porch/set"
@@ -221,9 +241,19 @@ switch:
   - platform: wake_on_lan
     name: Desktop
     mac_address: "4C-ED-FB-94-9D-24"
-    host: 192.168.1.3
+    host: 192.168.1.10
     turn_off:
       service: shell_command.turn_off_desktop
+  - platform: mqtt
+    name: "Bedroom Switch"
+    state_topic: "bruh/wifirelay"
+    command_topic: "bruh/wifirelay/set"
+    payload_on: "ON"
+    payload_off: "OFF"
+    state_on: "ON"
+    state_off: "OFF"
+    optimistic: true
+    qos: 0
   - platform: rpi_rf
     gpio: 24
     switches:
@@ -266,9 +296,9 @@ cover:
           service: script.coverstop
 
 shell_command:
-  turn_off_desktop: 'echo net rpc shutdown --ipaddress 192.168.1.3 --user Joshu%CYNTWyZkRBFik | ssh pi@192.168.1.2'
-  turn_on_hdmi: 'echo vcgencmd display_power 1 | ssh pi@192.168.1.179'
-  turn_off_hdmi: 'echo vcgencmd display_power 0 | ssh pi@192.168.1.179'
+  turn_off_desktop: 'echo net rpc shutdown --ipaddress 192.168.1.10 --user Joshu%CYNTWyZkRBFik | ssh pi@192.168.1.2'
+  turn_on_hdmi: 'echo vcgencmd display_power 1 | ssh pi@192.168.1.4'
+  turn_off_hdmi: 'echo vcgencmd display_power 0 | ssh pi@192.168.1.4'
 
 api:
 
@@ -287,11 +317,12 @@ alexa:
       
 http:
   api_password: !secret http_password
-  base_url: https://home.rutschmann.tech
-  server_port: 443
-  ssl_profile: intermediate
-  ssl_certificate: /config/ssl/fullchain.pem
-  ssl_key: /config/ssl/privkey.pem
+  base_url: http://localhost:8123
+  #base_url: https://home.rutschmann.tech
+  #server_port: 443
+  #ssl_profile: intermediate
+  #ssl_certificate: /config/ssl/fullchain.pem
+  #ssl_key: /config/ssl/privkey.pem
 
 ifttt:
   key: !secret webhooks_key

config/known_devices.yaml

@@ -366,3 +366,115 @@ d0a637864f63:
   name: 600194b39ebb
   picture:
   track: false
+
+3095e3088e72:
+  hide_if_away: false
+  icon:
+  mac: 30:95:E3:08:8E:72
+  name: 3095e3088e72
+  picture:
+  track: false
+
+600194b3a6b9:
+  hide_if_away: false
+  icon:
+  mac: 60:01:94:B3:A6:B9
+  name: 600194b3a6b9
+  picture:
+  track: false
+
+8866a5db8007:
+  hide_if_away: false
+  icon:
+  mac: 88:66:A5:DB:80:07
+  name: 8866a5db8007
+  picture:
+  track: false
+
+archerc7:
+  hide_if_away: false
+  icon:
+  mac: 0C:80:63:E7:04:08
+  name: Archer-C7
+  picture:
+  track: false
+
+openwrt_2:
+  hide_if_away: false
+  icon:
+  mac: 0C:80:63:E7:04:07
+  name: OpenWrt
+  picture:
+  track: false
+
+pc1921681107:
+  hide_if_away: false
+  icon:
+  mac: F8:D1:11:8A:A2:D4
+  name: PC-192-168-1-107
+  picture:
+  track: false
+
+iphonelj:
+  hide_if_away: false
+  icon:
+  mac: 74:8D:08:C2:80:C7
+  name: iPhone-LJ
+  picture:
+  track: false
+
+pc_192_168_1_2:
+  hide_if_away: false
+  icon:
+  mac: 2E:95:18:52:3B:2A
+  name: PC-192-168-1-2
+  picture:
+  track: false
+
+esp_96f94f:
+  hide_if_away: false
+  icon:
+  mac: 84:0D:8E:96:F9:4F
+  name: ESP-96F94F
+  picture:
+  track: false
+
+esp_96d07a:
+  hide_if_away: false
+  icon:
+  mac: 84:0D:8E:96:D0:7A
+  name: ESP-96D07A
+  picture:
+  track: false
+
+pc_bc_6c_21_73_25_de:
+  hide_if_away: false
+  icon:
+  mac: BC:6C:21:73:25:DE
+  name: PC-BC-6C-21-73-25-DE
+  picture:
+  track: false
+
+huawei_p20_lite_2146e034c:
+  hide_if_away: false
+  icon:
+  mac: B4:CD:27:F4:B8:A3
+  name: HUAWEI-P20-lite-2146e034c
+  picture:
+  track: false
+
+desktop_g2k41f0:
+  hide_if_away: false
+  icon:
+  mac: 00:22:68:4A:24:9C
+  name: DESKTOP-G2K41F0
+  picture:
+  track: false
+
+pc_a4_d9_31_69_4b_eb:
+  hide_if_away: false
+  icon:
+  mac: A4:D9:31:69:4B:EB
+  name: PC-A4-D9-31-69-4B-EB
+  picture:
+  track: false

config/www/circle-sensor-card.js

@@ -0,0 +1,249 @@
+import {
+  LitElement, html
+} from 'https://unpkg.com/@polymer/lit-element@^0.5.2/lit-element.js?module';
+
+class CircleSensorCard extends LitElement {
+  static get properties() {
+    return {
+      hass: Object,
+      config: Object,
+      state: Object,
+      dashArray: String
+    }
+  }
+
+  _render({ state, dashArray, config }) {
+    return html`
+      <style>
+          :host {
+            cursor: pointer;
+          }
+
+          .container {
+            position: relative;
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+          }
+
+          .labelContainer {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+          }
+          
+          #label {
+            display: flex;
+            line-height: 1;
+          }
+          
+          #label.bold {
+            font-weight: bold;
+          }
+          
+          #label, #name {
+            margin: 1% 0;
+          }
+
+          .text, #name {
+            font-size: 100%;
+          }
+          
+          .unit {
+            font-size: 75%;
+          }
+
+      </style>
+      <div class="container" id="container" on-click="${() => this._click()}">
+        <svg viewbox="0 0 200 200" id="svg">
+          <circle id="circle" cx="50%" cy="50%" r="45%"
+            fill$="${config.fill || 'rgba(255, 255, 255, .75)'}"
+            stroke$="${config.stroke_color || '#03a9f4'}"
+            stroke-dasharray$="${dashArray}"
+            stroke-width$="${config.stroke_width || 6}" 
+            transform="rotate(-90 100 100)"/>
+        </svg>
+        <span class="labelContainer">
+          ${config.name != null ? html`<span id="name">${config.name}</span>` : ''}
+          <span id="label" class$="${!!config.name ? 'bold' : ''}">
+            <span class="text">
+              ${config.attribute ? state.attributes[config.attribute] : state.state}
+            </span>
+            <span class="unit">
+              ${config.show_max
+                ? html`&nbsp/ ${config.attribute_max ? state.attributes[config.attribute_max] : config.max}`
+                : (config.units ? config.units : state.attributes.unit_of_measurement)}
+            </span>
+          </span>
+        </span>
+      </div>
+    `;
+  }
+
+  _createRoot() {
+    const shadow = this.attachShadow({ mode: 'open' })
+    if (!this.config.show_card) {
+      return shadow;
+    }
+    const card = document.createElement('ha-card');
+    shadow.appendChild(card);
+    return card;
+  }
+
+  _didRender() {
+    this.circle = this._root.querySelector('#circle');
+    if (this.config) {
+      this._updateConfig();
+    }
+  }
+
+  setConfig(config) {
+    if (!config.entity) {
+      throw Error('No entity defined')
+    }
+    this.config = config;
+    if (this.circle) {
+      this._updateConfig();
+    }
+  }
+
+  getCardSize() {
+    return 3;
+  }
+
+  _updateConfig() {
+    const container = this._root.querySelector('.labelContainer');
+    container.style.color = 'var(--primary-text-color)';
+
+    if (this.config.font_style) {
+      Object.keys(this.config.font_style).forEach((prop) => {
+        container.style.setProperty(prop, this.config.font_style[prop]);
+      });
+    }
+  }
+
+  set hass(hass) {
+    this.state = hass.states[this.config.entity];
+
+    if (this.config.attribute) {
+      if (!this.state.attributes[this.config.attribute] ||
+          isNaN(this.state.attributes[this.config.attribute])) {
+        console.error(`Attribute [${this.config.attribute}] is not a number`);
+        return;
+      }
+    } else {
+      if (!this.state || isNaN(this.state.state)) {
+        console.error(`State is not a number`);
+        return;
+      }
+    }
+
+    const state = this.config.attribute
+      ? this.state.attributes[this.config.attribute]
+      : this.state.state;
+    const r = 200 * .45;
+    const min = this.config.min || 0;
+    const max = this.config.attribute_max
+      ? this.state.attributes[this.config.attribute_max]
+      : (this.config.max || 100);
+    const val = this._calculateValueBetween(min, max, state);
+    const score = val * 2 * Math.PI * r;
+    const total = 10 * r;
+    this.dashArray = `${score} ${total}`;
+
+    let colorStops = {};
+    colorStops[min] = this.config.stroke_color || '#03a9f4';
+    if (this.config.color_stops) {
+      Object.keys(this.config.color_stops).forEach((key) => {
+        colorStops[key] = this.config.color_stops[key];
+      });
+    }
+
+    if (this.circle) {
+      const stroke = this._calculateStrokeColor(state, colorStops);
+      this.circle.setAttribute('stroke', stroke);
+    }
+  }
+
+  _click() {
+    this._fire('hass-more-info', { entityId: this.config.entity });
+  }
+
+  _calculateStrokeColor(state, stops) {
+    const sortedStops = Object.keys(stops).map(n => Number(n)).sort((a, b) => a - b);
+    let start, end, val;
+    const l = sortedStops.length;
+    if (state <= sortedStops[0]) {
+      return stops[sortedStops[0]];
+    } else if (state >= sortedStops[l - 1]) {
+      return stops[sortedStops[l - 1]];
+    } else {
+      for (let i = 0; i < l - 1; i++) {
+        const s1 = sortedStops[i];
+        const s2 = sortedStops[i + 1];
+        if (state >= s1 && state < s2) {
+          [start, end] = [stops[s1], stops[s2]];
+          if (!this.config.gradient) {
+            return start;
+          }
+          val = this._calculateValueBetween(s1, s2, state);
+          break;
+        }
+      }
+    }
+    return this._getGradientValue(start, end, val);
+  }
+
+  _calculateValueBetween(start, end, val) {
+    return (val - start) / (end - start);
+  }
+
+  _getGradientValue(colorA, colorB, val) {
+    const v1 = 1 - val;
+    const v2 = val;
+    const decA = this._hexColorToDecimal(colorA);
+    const decB = this._hexColorToDecimal(colorB);
+    const rDec = Math.floor((decA[0] * v1) + (decB[0] * v2));
+    const gDec = Math.floor((decA[1] * v1) + (decB[1] * v2));
+    const bDec = Math.floor((decA[2] * v1) + (decB[2] * v2));
+    const rHex = this._padZero(rDec.toString(16));
+    const gHex = this._padZero(gDec.toString(16));
+    const bHex = this._padZero(bDec.toString(16));
+    return `#${rHex}${gHex}${bHex}`;
+  }
+
+  _hexColorToDecimal(color) {
+    let c = color.substr(1);
+    if (c.length === 3) {
+      c = `${c[0]}${c[0]}${c[1]}${c[1]}${c[2]}${c[2]}`;
+    }
+
+    const [r, g, b] = c.match(/.{2}/g);
+    return [parseInt(r, 16), parseInt(g, 16), parseInt(b, 16)];
+  }
+
+  _padZero(val) {
+    if (val.length < 2) {
+      val = `0${val}`;
+    }
+    return val.substr(0, 2);
+  }
+
+  _fire(type, detail) {
+    const event = new Event(type, {
+      bubbles: true,
+      cancelable: false,
+      composed: true
+    });
+    event.detail = detail || {};
+    this.shadowRoot.dispatchEvent(event);
+    return event;
+  }
+}
+customElements.define('circle-sensor-card', CircleSensorCard);

config/www/surveillance-card.js

@@ -0,0 +1,179 @@
+import {
+  LitElement, html
+} from 'https://unpkg.com/@polymer/lit-element@^0.5.2/lit-element.js?module';
+
+import { repeat } from 'https://unpkg.com/lit-html@0.10.2/lib/repeat.js?module';
+
+class SurveillanceCard extends LitElement {
+  /* eslint-disable indent,object-curly-newline */
+  _render({ imageSources, currentCamera, lastMotion, updateInterval }) {
+    const accessToken = currentCamera && this._hass.states[currentCamera].attributes.access_token;
+    const template = html`
+    <style>
+      .container {
+        height: 100%;
+        width: 100%;
+        display: flex;
+        align-items: stretch;
+        position: absolute;
+        background: #000;
+      }
+
+      .thumbs {
+        flex: 1;
+        overflow-y: auto;
+        position:relative;
+      }
+
+      .thumb > img {
+        width: 100%;
+        height: auto;
+        border: 1px solid var(--primary-color);
+      }
+
+      .thumb {
+        width: calc(100% - 9px);
+        padding: 2px 4px;
+        position: relative;
+      }
+
+      .thumb.motion > img {
+        border-color: var(--accent-color);
+      }
+
+      img {
+        display: block;
+      }
+
+      .mainImage {
+        flex: 3;
+        height: 100%;
+        position: relative;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        overflow: hidden;
+      }
+
+      .mainImage > img {
+        display: inline-block;
+        max-width: 100%;
+        max-height: 100%;
+      }
+
+      .loading {
+        color: #FFF;
+        text-align: center;
+        font-size: 1.2rem;
+        margin-top: 3rem;
+      }
+    </style>
+    <div class="container">
+      <div class="thumbs">
+        ${imageSources ? repeat(this.cameras, (camera) => {
+          const thumbClass = lastMotion && lastMotion === camera.motion ? 'thumb motion' : 'thumb';
+          const source = this.imageSources[camera.entity];
+          return html`
+            <div class$="${thumbClass}" on-click="${() => { this.currentCamera = camera.entity; }}">
+              <img src="${source || ''}" />
+            </div>
+          `;
+        }) : html`<div class="loading">Loading Cameras...</div>`}
+      </div>
+      <div class="mainImage">
+        <img src$="${currentCamera ? `/api/camera_proxy_stream/${currentCamera}?token=${accessToken}&interval=${updateInterval}` : ''}" />
+      </div>
+    </div>
+    `;
+
+    return template;
+  }
+  /* eslint-enable indent,object-curly-newline */
+
+  static get properties() {
+    return {
+      _hass: Object,
+      cameras: Array,
+      currentCamera: String,
+      imageSources: Object,
+      lastMotion: String,
+      thumbInterval: Number,
+      updateInterval: Number
+    };
+  }
+
+  setConfig(config) {
+    this.cameras = config.cameras.map(c => ({
+      entity: c.entity,
+      motion: c.motion_entity
+    }));
+    this.currentCamera = this.cameras[0].entity;
+    this.thumbInterval = (config.thumb_interval || 10) * 1000;
+    this.updateInterval = config.update_interval || 1;
+    this.focusMotion = config.focus_motion !== false;
+  }
+
+  set hass(hass) {
+    this._hass = hass;
+
+    for (const cam of this.cameras) {
+      const { motion } = cam;
+      if ((motion in hass.states) && hass.states[motion].state === 'on') {
+        if (this.focusMotion && this.lastMotion !== motion) {
+          this.currentCamera = cam.entity;
+        }
+        this.lastMotion = motion;
+        return;
+      }
+    }
+    this.lastMotion = null;
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+    this.thumbUpdater = setInterval(() => this._updateThumbs(), this.thumbInterval);
+  }
+
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    clearInterval(this.thumbUpdater);
+    this.imageSources = null;
+    this.currentCamera = '';
+  }
+
+  _firstRendered() {
+    this._updateThumbs();
+  }
+
+  async _updateCameraImageSrc(entity) {
+    try {
+      const { content_type: contentType, content } = await this._hass.callWS({
+        type: 'camera_thumbnail',
+        entity_id: entity,
+      });
+
+      return {
+        entityId: entity,
+        src: `data:${contentType};base64, ${content}`
+      };
+    } catch (err) {
+      return {
+        entityId: entity,
+        src: null
+      };
+    }
+  }
+
+  _updateThumbs() {
+    const sources = {};
+    const promises = this.cameras.map(camera => this._updateCameraImageSrc(camera.entity));
+    Promise.all(promises).then((vals) => {
+      this.cameras.forEach((camera) => {
+        const target = vals.find(val => val.entityId === camera.entity);
+        sources[camera.entity] = target.src;
+      });
+      this.imageSources = sources;
+    });
+  }
+}
+customElements.define('surveillance-card', SurveillanceCard);

docker-compose.yml

@@ -2,7 +2,7 @@ version: '2.0'
 services:
   homeassistant:
     container_name: home-assistant
-    image: homeassistant/raspberrypi3-homeassistant
+    image: homeassistant/raspberrypi3-homeassistant:0.85.1
     restart: always
     devices:
       - /dev/video0:/dev/video0