Merge branch 'master' of github.com:uwap/mqtt-control-map

This commit is contained in:
uwap 2018-06-24 16:35:42 +02:00
commit 8bcc3a6908
2 changed files with 28 additions and 3 deletions

View file

@ -49,6 +49,12 @@ const config : Config = {
defaultValue: "OFF", defaultValue: "OFF",
values: { on: "ON", off: "OFF" } values: { on: "ON", off: "OFF" }
}, },
olymp_printer: {
state: "stat/sonoff2/POWER",
command: "cmnd/sonoff2/power",
defaultValue: "OFF",
values: { on: "ON", off: "OFF" }
},
flyfry: { flyfry: {
state: "/service/openhab/out/wifi_flyfry/state", state: "/service/openhab/out/wifi_flyfry/state",
command: "/service/openhab/in/wifi_flyfry/command", command: "/service/openhab/in/wifi_flyfry/command",
@ -276,19 +282,38 @@ const config : Config = {
] ]
}, },
olymp_pc: { olymp_pc: {
name: "Rechner und Drucker", name: "Rechner",
position: [297, 90], position: [297, 90],
icon: mdi("desktop-classic"), icon: mdi("desktop-classic"),
iconColor: ({olymp_pc}) => olymp_pc == "on" ? hex("#00FF00") : hex("#000000"), iconColor: ({olymp_pc}) => olymp_pc == "on" ? hex("#00FF00") : hex("#000000"),
ui: [ ui: [
{ {
type: "toggle", type: "toggle",
text: "Rechner und Drucker", text: "Rechner",
topic: "olymp_pc", topic: "olymp_pc",
icon: mdi("power") icon: mdi("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: { flyfry: {
name: "Fliegenbratgerät", name: "Fliegenbratgerät",
position: [450, 590], position: [450, 590],

View file

@ -39,7 +39,7 @@
"eslint-plugin-react": "^7.6.1", "eslint-plugin-react": "^7.6.1",
"file-loader": "^1.1.5", "file-loader": "^1.1.5",
"flow": "^0.2.3", "flow": "^0.2.3",
"flow-bin": "^0.70.0", "flow-bin": "^0.75.0",
"flow-typed": "^2.3.0", "flow-typed": "^2.3.0",
"html-webpack-plugin": "^3.1.0", "html-webpack-plugin": "^3.1.0",
"husky": "^0.14.3", "husky": "^0.14.3",