From d749e8107ac908dba5b5817df0c92c7c557f42f3 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 21 Jun 2018 17:02:28 +0000 Subject: [PATCH 1/2] chore(package): update flow-bin to version 0.75.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b269e53..bbfa7f0 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "eslint-plugin-react": "^7.6.1", "file-loader": "^1.1.5", "flow": "^0.2.3", - "flow-bin": "^0.70.0", + "flow-bin": "^0.75.0", "flow-typed": "^2.3.0", "html-webpack-plugin": "^3.1.0", "husky": "^0.14.3", From 2df52f75be860b299a12331cf5ea872c42a80b26 Mon Sep 17 00:00:00 2001 From: Ranlvor Date: Sun, 24 Jun 2018 14:24:42 +0200 Subject: [PATCH 2/2] Rechner und Drucker aufgeteilt auf 2 Funkdosen. Fixes #14 --- config/rzl.js | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/config/rzl.js b/config/rzl.js index b9a8e7b..7736479 100644 --- a/config/rzl.js +++ b/config/rzl.js @@ -48,6 +48,12 @@ const config : Config = { defaultValue: "OFF", values: { on: "ON", off: "OFF" } }, + olymp_printer: { + state: "stat/sonoff2/POWER", + command: "cmnd/sonoff2/power", + defaultValue: "OFF", + values: { on: "ON", off: "OFF" } + }, flyfry: { state: "/service/openhab/out/wifi_flyfry/state", command: "/service/openhab/in/wifi_flyfry/command", @@ -274,19 +280,38 @@ const config : Config = { ] }, olymp_pc: { - name: "Rechner und Drucker", + name: "Rechner", position: [297, 90], icon: "desktop-classic", iconColor: ({olymp_pc}) => olymp_pc == "on" ? hex("#00FF00") : hex("#000000"), ui: [ { type: "toggle", - text: "Rechner und Drucker", + text: "Rechner", topic: "olymp_pc", icon: "power" } ] }, + olymp_printer: { + name: "Drucker", + position: [335, 90], + icon: "printer", + iconColor: ({olymp_printer}) => olymp_printer == "on" ? hex("#00FF00") : hex("#000000"), + ui: [ + { + type: "toggle", + text: "Drucker", + topic: "olymp_printer", + icon: "power" + }, + { + type: "link", + link: "http://annette.rzl/", + text: "Open Annette" + } + ] + }, flyfry: { name: "FliegenbratgerÃĪt", position: [450, 590],