From 3eeb58c0fd80fd642d3efdc090165b24c1d54124 Mon Sep 17 00:00:00 2001 From: CCOSTAN Date: Fri, 7 Jul 2017 18:38:20 +0000 Subject: [PATCH] Closes #213 - Added in Fire Tablet Sensors from WallPanel. --- configuration.yaml | 1 + floorplan.yaml | 1 + packages/fire_tablet.yaml | 37 +++++++++++++++++++++++ www/custom_ui/floorplan/ha-floorplan.html | 24 ++++++++++++--- 4 files changed, 58 insertions(+), 5 deletions(-) create mode 100755 packages/fire_tablet.yaml diff --git a/configuration.yaml b/configuration.yaml index 14a0542a..95b7cbf2 100755 --- a/configuration.yaml +++ b/configuration.yaml @@ -84,6 +84,7 @@ logbook: entities: - automation.detect_lights_and_adjust_the_brightness_when_turned_on_based_on_time - automation.cuckoo_clock + - binary_sensor.office_motion - group.garage_doors - media_player.LivingRoomCC - py.warnings diff --git a/floorplan.yaml b/floorplan.yaml index 647efb6f..112f8822 100755 --- a/floorplan.yaml +++ b/floorplan.yaml @@ -2,6 +2,7 @@ name: Alarm Panel image: /local/custom_ui/floorplan/floorplan.svg stylesheet: /local/custom_ui/floorplan/floorplan.css pan_zoom: +warnings: groups: diff --git a/packages/fire_tablet.yaml b/packages/fire_tablet.yaml new file mode 100755 index 00000000..daa390d1 --- /dev/null +++ b/packages/fire_tablet.yaml @@ -0,0 +1,37 @@ +#------------------------------------------- +# Fire Tablet Alarm Panel - http://www.vmwareinfo.com/2017/07/visualizing-smart-home-using-home.html +#------------------------------------------- +# +# homeassistant: +# customize: +# binary_sensor.office_motion: +# icon: mdi:sensor +# friendly_name: Office Motion Sensor +# emulated_hue: False +# hidden: False + +#---Sensor for Fire Tablet----------------------------- +binary_sensor: + - platform: mqtt + state_topic: "wallpanel/alarm 1/sensor/battery" + name: "Alarm Panel 1 Battery Level" + value_template: '{{ value_json.value }}' + unit_of_measurement: '%' + device_class: power + + - platform: mqtt + state_topic: "wallpanel/alarm 1/sensor/battery" + name: "Alarm Panel 1 Plugged In" + value_template: '{{ value_json.acPlugged }}' + unit_of_measurement: '%' + device_class: power + + - platform: mqtt + state_topic: "wallpanel/alarm 1/sensor/motion" + name: "Alarm Panel 1 Motion" + device_class: motion + + - platform: mqtt + state_topic: "wallpanel/alarm 1/state" + name: "Alarm Panel 1 Screen" + value_template: '{{ value_json.screenOn }}' diff --git a/www/custom_ui/floorplan/ha-floorplan.html b/www/custom_ui/floorplan/ha-floorplan.html index e29d8258..1930d8d5 100755 --- a/www/custom_ui/floorplan/ha-floorplan.html +++ b/www/custom_ui/floorplan/ha-floorplan.html @@ -1,6 +1,6 @@ - + @@ -278,7 +278,7 @@ $(newSvgShape).attr('title', 'test'); - if (this.IsPanZoomEnabled) { + if (this.instance.IsPanZoomEnabled) { // Touch screen friendlyness! //var mc = new Hammer(newSvgShape[0]); //went for the custom recognizers var mc = new Hammer.Manager(newSvgShape[0]); @@ -329,8 +329,8 @@ } // Enable pan / zoom if enabled in config - if (this.IsPanZoomEnabled) { - svgPanZoom($(newSvg)[0], { + if (this.instance.IsPanZoomEnabled) { + var panZoom = window.panZoom = svgPanZoom($(newSvg)[0], { zoomEnabled: true, controlIconsEnabled: true, fit: true, @@ -338,6 +338,20 @@ dblClickZoomEnabled: false, customEventsHandler: this.instance.getHammerEventHandlers(), }); + + $(window).resize(function () { + panZoom.resize(); + panZoom.fit(); + panZoom.center(); + }); + + document.addEventListener('transitionend', function (event) { + if (event.propertyName == 'left') { + panZoom.resize(); + panZoom.fit(); + panZoom.center(); + } + }); } this.callback(); @@ -799,7 +813,7 @@ warn(message) { if (this.IsWarningsEnabled) { var warnings = Polymer.dom(this.$.warnings).node; - $(warnings).find('ul').append('
  • ${message}
  • ') + $(warnings).find('ul').append(`
  • ${message}
  • `); $(warnings).css('display', 'block'); } },