uwap/mqtt-control-map
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflicts

Browse source
This commit is contained in:
uwap 2018-06-24 16:46:29 +02:00 • committed by GitHub
parent a34ca7c25c
commit aad1b59a96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
config/rzl.js
View file

@ -308,14 +308,14 @@ const config : Config = {
olymp_printer: { olymp_printer: {
name: "Drucker", name: "Drucker",
position: [335, 90], position: [335, 90],
icon: "printer", icon: mdi("printer"),
iconColor: ({olymp_printer}) => olymp_printer == "on" ? hex("#00FF00") : hex("#000000"), iconColor: ({olymp_printer}) => olymp_printer == "on" ? hex("#00FF00") : hex("#000000"),
ui: [ ui: [
{ {
type: "toggle", type: "toggle",
text: "Drucker", text: "Drucker",
topic: "olymp_printer", topic: "olymp_printer",
icon: "power" icon: mdi("power")
}, },
{ {
type: "link", type: "link",
@ -711,7 +711,7 @@ const config : Config = {
kitchen_counter_light: { kitchen_counter_light: {
name: "Deckenlicht Theke", name: "Deckenlicht Theke",
position: [400, 440], position: [400, 440],
icon: "ceiling-light", icon: mdi("ceiling-light"),
ui: [ ui: [
{ {
type: "section", type: "section",
@ -722,7 +722,7 @@ const config : Config = {
min: 0, min: 0,
max: 100, max: 100,
text: "Helligkeit", text: "Helligkeit",
icon: "brightness-7", icon: mdi("brightness-7"),
topic: floalt.brightness("65544"), topic: floalt.brightness("65544"),
delayedApply: true delayedApply: true
}, },
@ -731,7 +731,7 @@ const config : Config = {
min: 0, min: 0,
max: 100, max: 100,
text: "Farbtemperatur", text: "Farbtemperatur",
icon: "weather-sunset-down", icon: mdi("weather-sunset-down"),
topic: floalt.color("65544"), topic: floalt.color("65544"),
delayedApply: true delayedApply: true
}, },
@ -744,7 +744,7 @@ const config : Config = {
min: 0, min: 0,
max: 100, max: 100,
text: "Helligkeit", text: "Helligkeit",
icon: "brightness-7", icon: mdi("brightness-7"),
topic: floalt.brightness("65543"), topic: floalt.brightness("65543"),
delayedApply: true delayedApply: true
}, },
@ -753,7 +753,7 @@ const config : Config = {
min: 0, min: 0,
max: 100, max: 100,
text: "Farbtemperatur", text: "Farbtemperatur",
icon: "weather-sunset-down", icon: mdi("weather-sunset-down"),
topic: floalt.color("65543"), topic: floalt.color("65543"),
delayedApply: true delayedApply: true
} }