wn/dispatcher_ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scenes at the end

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2018-07-01 11:42:00 +02:00
parent 28fa32d48d
commit 4fb1311e7a
4 changed files with 138 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
dist/main.js vendored
View File

@ -274,41 +274,6 @@ let thermostatBedroom1stCron = new Cron_1.Cron('thermostatBedroom1stCron', therm
]); ]);
thermostatBedroom1stCron.start(); thermostatBedroom1stCron.start();
// --------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------
let dayLightScene = new Scene_1.LightScene('Gnd', 'Szenen', 'DayLight', 'DayLight', [
kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayStandLight, hallwayWardrobeLight,
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomLargeLight, livingRoomSmallLight, livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
], []);
dayLightScene.start();
allLabeledItems.push(dayLightScene);
allLightScenes.push(dayLightScene);
let ecoLightScene = new Scene_1.LightScene('Gnd', 'Szenen', 'EcoLight', 'EcoLight', [
kitchenWindowLight, hallwayDeskLight, hallwayWardrobeLight,
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
], [
kitchenCeilingLight, hallwayStandLight,
livingRoomLargeLight, livingRoomSmallLight
]);
ecoLightScene.start();
allLabeledItems.push(ecoLightScene);
allLightScenes.push(ecoLightScene);
let ecoSwitch = new MaxEcoSwitch_1.MaxEcoSwitch('Gnd', 'Szenen', 'EcoSwitch', 'EcoSwitch', 6, dayLightScene, ecoLightScene);
ecoSwitch.start();
let morningLightScene = new Scene_1.LightScene('Gnd', 'Szenen', 'MorningLight', 'MorningLight', [
kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayWardrobeLight,
hallwayStandLight
], [
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomStars, livingRoomStandLight, livingRoomLargeLight, livingRoomSmallLight, diningRoomNaehkaestchenLight
]);
morningLightScene.start();
allLabeledItems.push(morningLightScene);
allLightScenes.push(morningLightScene);
let sceneOfAllLights = new Scene_1.LightScene('Gnd', 'Szenen', 'AllLights', 'Alle Lampen', allLights, []);
sceneOfAllLights.start();
allLightScenes.push(sceneOfAllLights);
// ----------------------------------------------------------------------------------------------------------
let windowContactBathroomGnd = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Bathroom', 'WindowContact', 'Bad unten', 7); let windowContactBathroomGnd = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Bathroom', 'WindowContact', 'Bad unten', 7);
windowContactBathroomGnd.start(); windowContactBathroomGnd.start();
allLabeledItems.push(windowContactBathroomGnd); allLabeledItems.push(windowContactBathroomGnd);
@ -464,6 +429,41 @@ testForwarder.start();
let testScene = new Scene_1.LightScene('Gnd', 'Flur', 'TestScene', 'TestScene', [aquariumLight, annaBedLight], [matthiasStandLights, matthiasBedLight]); let testScene = new Scene_1.LightScene('Gnd', 'Flur', 'TestScene', 'TestScene', [aquariumLight, annaBedLight], [matthiasStandLights, matthiasBedLight]);
testScene.start(); testScene.start();
// ---------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------
let dayLightScene = new Scene_1.LightScene('Gnd', 'Szenen', 'DayLight', 'DayLight', [
kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayStandLight, hallwayWardrobeLight,
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomLargeLight, livingRoomSmallLight, livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
], []);
dayLightScene.start();
allLabeledItems.push(dayLightScene);
allLightScenes.push(dayLightScene);
let ecoLightScene = new Scene_1.LightScene('Gnd', 'Szenen', 'EcoLight', 'EcoLight', [
kitchenWindowLight, hallwayDeskLight, hallwayWardrobeLight,
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
], [
kitchenCeilingLight, hallwayStandLight,
livingRoomLargeLight, livingRoomSmallLight
]);
ecoLightScene.start();
allLabeledItems.push(ecoLightScene);
allLightScenes.push(ecoLightScene);
let ecoSwitch = new MaxEcoSwitch_1.MaxEcoSwitch('Gnd', 'Szenen', 'EcoSwitch', 'EcoSwitch', 6, dayLightScene, ecoLightScene);
ecoSwitch.start();
let morningLightScene = new Scene_1.LightScene('Gnd', 'Szenen', 'MorningLight', 'MorningLight', [
kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayWardrobeLight,
hallwayStandLight
], [
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomStars, livingRoomStandLight, livingRoomLargeLight, livingRoomSmallLight, diningRoomNaehkaestchenLight
]);
morningLightScene.start();
allLabeledItems.push(morningLightScene);
allLightScenes.push(morningLightScene);
let sceneOfAllLights = new Scene_1.LightScene('Gnd', 'Szenen', 'AllLights', 'Alle Lampen', allLights, []);
sceneOfAllLights.start();
allLightScenes.push(sceneOfAllLights);
// ----------------------------------------------------------------------------------------------------------
// heartbeat // heartbeat
let heartbeatCounter = 0; let heartbeatCounter = 0;
let heartbeatTimer = setInterval(() => { let heartbeatTimer = setInterval(() => {

102
homekit.json
View File

@ -564,57 +564,6 @@
}, },
"payload": {} "payload": {}
}, },
"Gnd_Szenen_DayLight": {
"id": "Gnd_Szenen_DayLight",
"name": "DayLight",
"service": "Lightbulb",
"topic": {
"setOn": "dispatcher_ng/items/Gnd/Szenen/DayLight/state",
"statusOn": "dispatcher_ng/items/Gnd/Szenen/DayLight/state/feedback"
},
"payload": {
"onTrue": "ON",
"onFalse": "OFF",
"brightnessFactor": "",
"hueFactor": "",
"saturationFactor": ""
},
"config": {}
},
"Gnd_Szenen_EcoLight": {
"id": "Gnd_Szenen_EcoLight",
"name": "EcoLight",
"service": "Lightbulb",
"topic": {
"setOn": "dispatcher_ng/items/Gnd/Szenen/EcoLight/state",
"statusOn": "dispatcher_ng/items/Gnd/Szenen/EcoLight/state/feedback"
},
"payload": {
"onTrue": "ON",
"onFalse": "OFF",
"brightnessFactor": "",
"hueFactor": "",
"saturationFactor": ""
},
"config": {}
},
"Gnd_Szenen_MorningLight": {
"id": "Gnd_Szenen_MorningLight",
"name": "MorningLight",
"service": "Lightbulb",
"topic": {
"setOn": "dispatcher_ng/items/Gnd/Szenen/MorningLight/state",
"statusOn": "dispatcher_ng/items/Gnd/Szenen/MorningLight/state/feedback"
},
"payload": {
"onTrue": "ON",
"onFalse": "OFF",
"brightnessFactor": "",
"hueFactor": "",
"saturationFactor": ""
},
"config": {}
},
"Gnd_Bathroom_WindowContact": { "Gnd_Bathroom_WindowContact": {
"id": "Gnd_Bathroom_WindowContact", "id": "Gnd_Bathroom_WindowContact",
"name": "Bad unten", "name": "Bad unten",
@ -776,5 +725,56 @@
"saturationFactor": "" "saturationFactor": ""
}, },
"config": {} "config": {}
},
"Gnd_Szenen_DayLight": {
"id": "Gnd_Szenen_DayLight",
"name": "DayLight",
"service": "Lightbulb",
"topic": {
"setOn": "dispatcher_ng/items/Gnd/Szenen/DayLight/state",
"statusOn": "dispatcher_ng/items/Gnd/Szenen/DayLight/state/feedback"
},
"payload": {
"onTrue": "ON",
"onFalse": "OFF",
"brightnessFactor": "",
"hueFactor": "",
"saturationFactor": ""
},
"config": {}
},
"Gnd_Szenen_EcoLight": {
"id": "Gnd_Szenen_EcoLight",
"name": "EcoLight",
"service": "Lightbulb",
"topic": {
"setOn": "dispatcher_ng/items/Gnd/Szenen/EcoLight/state",
"statusOn": "dispatcher_ng/items/Gnd/Szenen/EcoLight/state/feedback"
},
"payload": {
"onTrue": "ON",
"onFalse": "OFF",
"brightnessFactor": "",
"hueFactor": "",
"saturationFactor": ""
},
"config": {}
},
"Gnd_Szenen_MorningLight": {
"id": "Gnd_Szenen_MorningLight",
"name": "MorningLight",
"service": "Lightbulb",
"topic": {
"setOn": "dispatcher_ng/items/Gnd/Szenen/MorningLight/state",
"statusOn": "dispatcher_ng/items/Gnd/Szenen/MorningLight/state/feedback"
},
"payload": {
"onTrue": "ON",
"onFalse": "OFF",
"brightnessFactor": "",
"hueFactor": "",
"saturationFactor": ""
},
"config": {}
} }
} }

6
openhab.items
View File

@ -42,9 +42,6 @@ Contact 1st_Bedroom_WindowContact1Garden "Schlafz. Garten 1" {mqtt="<[localbroke
Contact 1st_Bedroom_WindowContact2Garden "Schlafz. Garten 2" {mqtt="<[localbroker:dispatcher_ng/items/1st/Bedroom/WindowContact2Garden/state/feedback:state:default]"} Contact 1st_Bedroom_WindowContact2Garden "Schlafz. Garten 2" {mqtt="<[localbroker:dispatcher_ng/items/1st/Bedroom/WindowContact2Garden/state/feedback:state:default]"}
Number 1st_Bedroom_Thermostat "Thermostat Schlafzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/temperature/feedback:state:default]"} Number 1st_Bedroom_Thermostat "Thermostat Schlafzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/temperature/feedback:state:default]"}
Number Preset_1st_Bedroom_Thermostat "Preset_Thermostat Schlafzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/presetTemperature/feedback:state:default]"} Number Preset_1st_Bedroom_Thermostat "Preset_Thermostat Schlafzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/presetTemperature/feedback:state:default]"}
Switch Gnd_Szenen_DayLight "DayLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Szenen/DayLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Szenen/DayLight/state/feedback:state:default]"}
Switch Gnd_Szenen_EcoLight "EcoLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Szenen/EcoLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Szenen/EcoLight/state/feedback:state:default]"}
Switch Gnd_Szenen_MorningLight "MorningLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Szenen/MorningLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Szenen/MorningLight/state/feedback:state:default]"}
Contact Gnd_Bathroom_WindowContact "Bad unten" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Bathroom/WindowContact/state/feedback:state:default]"} Contact Gnd_Bathroom_WindowContact "Bad unten" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Bathroom/WindowContact/state/feedback:state:default]"}
Number Gnd_Bathroom_Thermostat "Thermostat Bad unten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/temperature/feedback:state:default]"} Number Gnd_Bathroom_Thermostat "Thermostat Bad unten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/temperature/feedback:state:default]"}
Number Preset_Gnd_Bathroom_Thermostat "Preset_Thermostat Bad unten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/presetTemperature/feedback:state:default]"} Number Preset_Gnd_Bathroom_Thermostat "Preset_Thermostat Bad unten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/presetTemperature/feedback:state:default]"}
@ -67,4 +64,7 @@ String base_labor_relaybox2Conflict "Waschküche [%s]" {mqtt="<[localbroker:disp
Switch Base_Keller_Light "Werkstatt"{mqtt=">[localbroker:dispatcher_ng/items/Base/Keller/Light/state:command:*:default],<[localbroker:dispatcher_ng/items/Base/Keller/Light/state/feedback:state:default]"} Switch Base_Keller_Light "Werkstatt"{mqtt=">[localbroker:dispatcher_ng/items/Base/Keller/Light/state:command:*:default],<[localbroker:dispatcher_ng/items/Base/Keller/Light/state/feedback:state:default]"}
Switch Base_Keller_SmallLight "Licht einfach"{mqtt=">[localbroker:dispatcher_ng/items/Base/Keller/SmallLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Base/Keller/SmallLight/state/feedback:state:default]"} Switch Base_Keller_SmallLight "Licht einfach"{mqtt=">[localbroker:dispatcher_ng/items/Base/Keller/SmallLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Base/Keller/SmallLight/state/feedback:state:default]"}
Switch Base_Keller_LargeLight "Licht hell"{mqtt=">[localbroker:dispatcher_ng/items/Base/Keller/LargeLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Base/Keller/LargeLight/state/feedback:state:default]"} Switch Base_Keller_LargeLight "Licht hell"{mqtt=">[localbroker:dispatcher_ng/items/Base/Keller/LargeLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Base/Keller/LargeLight/state/feedback:state:default]"}
Switch Gnd_Szenen_DayLight "DayLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Szenen/DayLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Szenen/DayLight/state/feedback:state:default]"}
Switch Gnd_Szenen_EcoLight "EcoLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Szenen/EcoLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Szenen/EcoLight/state/feedback:state:default]"}
Switch Gnd_Szenen_MorningLight "MorningLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Szenen/MorningLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Szenen/MorningLight/state/feedback:state:default]"}
Switch HeatingMainSwitch "Heizung Hauptschalter" {mqtt=">[localbroker:dispatcher_ng/items/heatingMainSwitch:command:*:default],<[localbroker:dispatcher_ng/items/heatingMainSwitch:state:default]"} Switch HeatingMainSwitch "Heizung Hauptschalter" {mqtt=">[localbroker:dispatcher_ng/items/heatingMainSwitch:command:*:default],<[localbroker:dispatcher_ng/items/heatingMainSwitch:state:default]"}

98
src/main.ts
View File

@ -329,55 +329,6 @@ let thermostatBedroom1stCron = new Cron('thermostatBedroom1stCron', thermostatBe
thermostatBedroom1stCron.start() thermostatBedroom1stCron.start()
// --------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------
let dayLightScene = new LightScene('Gnd', 'Szenen', 'DayLight', 'DayLight',
[
kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayStandLight, hallwayWardrobeLight,
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomLargeLight, livingRoomSmallLight, livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
],
[]
)
dayLightScene.start()
allLabeledItems.push(dayLightScene)
allLightScenes.push(dayLightScene)
let ecoLightScene = new LightScene('Gnd', 'Szenen', 'EcoLight', 'EcoLight',
[
kitchenWindowLight, hallwayDeskLight, hallwayWardrobeLight,
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
],
[
kitchenCeilingLight, hallwayStandLight,
livingRoomLargeLight, livingRoomSmallLight
]
)
ecoLightScene.start()
allLabeledItems.push(ecoLightScene)
allLightScenes.push(ecoLightScene)
let ecoSwitch = new MaxEcoSwitch('Gnd', 'Szenen', 'EcoSwitch', 'EcoSwitch', 6, dayLightScene, ecoLightScene)
ecoSwitch.start()
let morningLightScene = new LightScene('Gnd', 'Szenen', 'MorningLight', 'MorningLight',
[
kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayWardrobeLight,
hallwayStandLight
],
[
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomStars, livingRoomStandLight, livingRoomLargeLight, livingRoomSmallLight, diningRoomNaehkaestchenLight
]
)
morningLightScene.start()
allLabeledItems.push(morningLightScene)
allLightScenes.push(morningLightScene)
let sceneOfAllLights = new LightScene('Gnd', 'Szenen', 'AllLights', 'Alle Lampen', allLights, [])
sceneOfAllLights.start()
allLightScenes.push(sceneOfAllLights)
// ----------------------------------------------------------------------------------------------------------
let windowContactBathroomGnd = new MaxWindowContact('Gnd', 'Bathroom', 'WindowContact', 'Bad unten', 7) let windowContactBathroomGnd = new MaxWindowContact('Gnd', 'Bathroom', 'WindowContact', 'Bad unten', 7)
windowContactBathroomGnd.start() windowContactBathroomGnd.start()
allLabeledItems.push(windowContactBathroomGnd) allLabeledItems.push(windowContactBathroomGnd)
@ -573,6 +524,55 @@ let testScene = new LightScene('Gnd', 'Flur', 'TestScene', 'TestScene',
) )
testScene.start() testScene.start()
// ----------------------------------------------------------------------------------------------------------
let dayLightScene = new LightScene('Gnd', 'Szenen', 'DayLight', 'DayLight',
[
kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayStandLight, hallwayWardrobeLight,
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomLargeLight, livingRoomSmallLight, livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
],
[]
)
dayLightScene.start()
allLabeledItems.push(dayLightScene)
allLightScenes.push(dayLightScene)
let ecoLightScene = new LightScene('Gnd', 'Szenen', 'EcoLight', 'EcoLight',
[
kitchenWindowLight, hallwayDeskLight, hallwayWardrobeLight,
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
],
[
kitchenCeilingLight, hallwayStandLight,
livingRoomLargeLight, livingRoomSmallLight
]
)
ecoLightScene.start()
allLabeledItems.push(ecoLightScene)
allLightScenes.push(ecoLightScene)
let ecoSwitch = new MaxEcoSwitch('Gnd', 'Szenen', 'EcoSwitch', 'EcoSwitch', 6, dayLightScene, ecoLightScene)
ecoSwitch.start()
let morningLightScene = new LightScene('Gnd', 'Szenen', 'MorningLight', 'MorningLight',
[
kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayWardrobeLight,
hallwayStandLight
],
[
diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
livingRoomStars, livingRoomStandLight, livingRoomLargeLight, livingRoomSmallLight, diningRoomNaehkaestchenLight
]
)
morningLightScene.start()
allLabeledItems.push(morningLightScene)
allLightScenes.push(morningLightScene)
let sceneOfAllLights = new LightScene('Gnd', 'Szenen', 'AllLights', 'Alle Lampen', allLights, [])
sceneOfAllLights.start()
allLightScenes.push(sceneOfAllLights)
// ---------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------