From f105fa471ec26fad839f75672c0255ecc1b0fdd4 Mon Sep 17 00:00:00 2001 From: Tony Stork Date: Tue, 20 Sep 2022 13:33:17 -0400 Subject: [PATCH] Continuing to add groups and cleanup readability Grouping efforts continue --- flows.json | 1261 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 874 insertions(+), 387 deletions(-) diff --git a/flows.json b/flows.json index c5a31b3..75797da 100644 --- a/flows.json +++ b/flows.json @@ -712,7 +712,9 @@ "017de174925e8c75" ], "x": 94, - "y": 319 + "y": 319, + "w": 1992, + "h": 602 }, { "id": "39a7ac02f2727f1d", @@ -746,7 +748,9 @@ "1ad455bccec8ab46" ], "x": 14, - "y": 699 + "y": 699, + "w": 1192, + "h": 362 }, { "id": "e065b1ed4938b477", @@ -827,7 +831,9 @@ "783cfb381b70afc5" ], "x": 14, - "y": 59 + "y": 59, + "w": 2812, + "h": 622 }, { "id": "5c50443a84910fb7", @@ -853,7 +859,9 @@ "6f011420f6bb15a7" ], "x": 34, - "y": 159 + "y": 159, + "w": 882, + "h": 302 }, { "id": "477e752fcd2e2a19", @@ -875,7 +883,9 @@ "b2bc83c9195efe0f" ], "x": 14, - "y": 39 + "y": 39, + "w": 872, + "h": 142 }, { "id": "50e4d951ee7b3e54", @@ -897,7 +907,314 @@ "427cc2991454bbf0" ], "x": 14, - "y": 219 + "y": 219, + "w": 1012, + "h": 202 + }, + { + "id": "fbbe69a14cbe0236", + "type": "group", + "z": "ffa6a885ac41a5ed", + "name": "Sensors", + "style": { + "label": true + }, + "nodes": [ + "c2972c7728c99c43", + "bc09f451754ba126", + "fdefcd6a64aa9bca", + "1d09b6c6a3773d9a", + "6cf8f103906c1a49", + "da305ace22579c07", + "7ecdec08d9698a19", + "9c9d7870a5204f13", + "1b5678e80095a461", + "5248dc02bf48733e", + "c88179f1facb8646", + "7af97720032b4609", + "08aadf619537949e", + "d819e61c0895affe", + "a0adec284cd8162a", + "46e0046a27f4bc89", + "a6038f6bd028bd2f", + "8006b0b34776ec34", + "d5c7d4f4714a6cd6", + "d1ac8b45d7baa4ed", + "35847fc20196c4ce", + "5fa5b04e2b1b3ae2", + "6f429b0dcaa5c607", + "9f53af3ad747cd62", + "c002b47a53a0e203", + "0008fb5b70ae6aea", + "a46a88d4fb03cceb", + "8d26310ed06bb045", + "67119024666b68bd", + "e235145192886939", + "80d831ad0265a01f", + "069a7ab44b04c9ef" + ], + "x": 34, + "y": 39, + "w": 872, + "h": 682 + }, + { + "id": "46275dd0f9461013", + "type": "group", + "z": "ffa6a885ac41a5ed", + "name": "Functionality", + "style": { + "label": true + }, + "nodes": [ + "b109c8db1c2cd259", + "75a50e8dac7af692", + "baae5d6f53900594", + "619d1474239faf58" + ], + "x": 34, + "y": 739, + "w": 472, + "h": 142 + }, + { + "id": "ff6d8150e8d5e606", + "type": "group", + "z": "b0286fae9f2ce547", + "name": "Entertainment Mode", + "style": { + "label": true + }, + "nodes": [ + "7611921cadb91b1e", + "3a29cecbefa6cbe2", + "4a2031f363418db1", + "2c9b9e4fbaa17b8a", + "984386fa0a6369d6", + "0beae13503166379", + "6c77ade442a47a30", + "bc363dcf2c3aaf3c", + "6392f2f0586d988a", + "e505e9f24bf919dd", + "c1c0d3ee514fa085", + "88580ff9416f69c7", + "9efd5346a1ca1972", + "3596959961544947", + "9cbcdb825b0a60ad", + "40cab913b75a5507", + "c9ca600850fc6a76", + "a57d15aac606dfb1", + "8b53b9f4d5ba0bf0", + "1ddcce6ef3293779", + "cc8f6ab710549be2", + "24c5dfc33d4685c2", + "6019fc13d70a69c7", + "f505205962d4e214", + "966547ac9d93eee1", + "63a9f9055e287a53", + "0845a18537933359", + "0968727f2138ac62" + ], + "x": 34, + "y": 779, + "w": 1432, + "h": 422 + }, + { + "id": "f55a52c40b8b8749", + "type": "group", + "z": "b0286fae9f2ce547", + "name": "Buttons, Alexa Calls", + "style": { + "label": true + }, + "nodes": [ + "cd04bdb407311eb5", + "cac7cc3111526a67", + "7d8d5376e990d357", + "ab4c69753bfc36f5", + "b18c7a21fc449d35", + "936091f71dc880b3", + "59350a1f38e3e04a", + "6c78852a9c604f64", + "abe997d5df095480", + "a18b6c8c026995d6", + "db54e97573a07fc4", + "77f2aae15fa1250d", + "9e36b04d6063c234", + "7f82b9d6d835e09b", + "158b197a42fed757", + "e549712aaaceb285", + "be5bdfc3c12b05da", + "728ab818393de52d", + "960884b0fd23e69b", + "61fdabfde220fbcc", + "42b706dd4afe3e42", + "9a605b80513eba44", + "0b860dc2f7db3ba0", + "51d86d6064f084d2", + "31cb558d6ee383c4", + "0b79d297a8596c37", + "13d5c047c41f60ba", + "40817f8c9eeae5fe", + "b8995a85f5d34268", + "85bd556a614f0455", + "c95d487f9fbe14ce", + "318bee4424125dd5" + ], + "x": 34, + "y": 19, + "w": 832, + "h": 742 + }, + { + "id": "208284848b13b85b", + "type": "group", + "z": "47f17992fab9b4f5", + "name": "Front Door Awareness", + "style": { + "label": true + }, + "nodes": [ + "97a441f1ac510844", + "d45ac7361e128558", + "fbe3667814a51f6f", + "ec543bc9adac3d08", + "cb4d95e0ee4e1f05", + "3563f62312975002", + "d4019d35bf5a5f98", + "29b9f573370571cf", + "25e12d8e4a0a7f11", + "e91c3392b59ff9d1", + "5a19347b1a570e9c", + "753ad45c3685897b", + "d32a407e1c701563", + "58b54517ed812db3" + ], + "x": 34, + "y": 239, + "w": 832, + "h": 382 + }, + { + "id": "eeafd13be593ae69", + "type": "group", + "z": "eff21041cc941fef", + "name": "Front Porch Light Timer", + "style": { + "label": true + }, + "nodes": [ + "05547a934bbcab4d", + "091390f43bfeddf5", + "26bda03370a86d83", + "f65b2eccda530bcd", + "1bf27a631436c914", + "7a7229eb69c9b1a3", + "edef3ad58f6e9bbd", + "780ad4c1a1d5204b", + "51237623ed73ba98", + "47aa56df01f697fc", + "f34816b23181f21e" + ], + "x": 34, + "y": 539, + "w": 1032, + "h": 282 + }, + { + "id": "753e14252442d87d", + "type": "group", + "z": "4a8821853d4dd1ad", + "name": "Start", + "style": { + "label": true + }, + "nodes": [ + "cc8645ebae721601", + "b2d071ca42e4a3c6", + "7fc67fc156c0f4be", + "797d3e7cc53d773f", + "cb399b9e54bcf0f0", + "4d4e55cea59da9ad", + "600f4c2dcc3e0c51", + "908543f7b78f7beb", + "d6728df5d1fdf67e", + "ae7073e78053da5d", + "715c94772f02e398", + "736d7433005436b3", + "0aa29248b560c45d", + "b8ca8a1a2655570b", + "6a84cfeac66e9b29", + "c43df123937fd07d", + "fc26a2c43e3a3faa" + ], + "x": 34, + "y": 39, + "w": 1872, + "h": 262 + }, + { + "id": "56c26bcb1de77e0e", + "type": "group", + "z": "4a8821853d4dd1ad", + "name": "Pause", + "style": { + "label": true + }, + "nodes": [ + "f24aeb9c34914db9", + "afeb1d238a623c3d", + "34dcb204b421710d", + "e69ad4771494c458", + "fdf9b6820eb7289a", + "5c44fd504453ae63", + "dd0be4a0dd77e1db", + "6b086807971b2618", + "6736626753b33834", + "24abb932c4cd0b1f", + "b0f2bb3aef2890a1", + "70888fea017c3e69", + "c0521b53f7efeb17", + "95d5ac486b4f9ee0", + "392d8c474c89b9f0", + "3ba243a44893f620", + "49767cbfa622a734", + "04113ab4977bf725" + ], + "x": 34, + "y": 319, + "w": 1732, + "h": 222 + }, + { + "id": "1ca205a84922c8c2", + "type": "group", + "z": "4a8821853d4dd1ad", + "name": "Finish", + "style": { + "label": true + }, + "nodes": [ + "602437ba010cc43d", + "1dc210f02bbc891d", + "014d305040d2a8bd", + "923538ef97772f0c", + "a3e3dc438a7b95fc", + "fe1ba086baf93ec0", + "50056b099a24a824", + "9727faf3509b96f8", + "d8e2d16e313b938a", + "646450ddef26f6f6", + "b0c92a72557d0ac6", + "408795055634e897", + "0a441953c41a18ae", + "08a22fa71fce5e91" + ], + "x": 34, + "y": 559, + "w": 1132, + "h": 322 }, { "id": "19b0e082db0643ac", @@ -966,8 +1283,9 @@ "id": "0968727f2138ac62", "type": "junction", "z": "b0286fae9f2ce547", - "x": 500, - "y": 1100, + "g": "ff6d8150e8d5e606", + "x": 520, + "y": 1120, "wires": [ [ "cc8f6ab710549be2" @@ -978,8 +1296,9 @@ "id": "31cb558d6ee383c4", "type": "junction", "z": "b0286fae9f2ce547", - "x": 440, - "y": 40, + "g": "f55a52c40b8b8749", + "x": 460, + "y": 60, "wires": [ [ "cac7cc3111526a67" @@ -990,8 +1309,9 @@ "id": "0b79d297a8596c37", "type": "junction", "z": "b0286fae9f2ce547", - "x": 460, - "y": 100, + "g": "f55a52c40b8b8749", + "x": 480, + "y": 120, "wires": [ [ "ab4c69753bfc36f5" @@ -1002,8 +1322,9 @@ "id": "13d5c047c41f60ba", "type": "junction", "z": "b0286fae9f2ce547", - "x": 440, - "y": 220, + "g": "f55a52c40b8b8749", + "x": 460, + "y": 240, "wires": [ [ "db54e97573a07fc4" @@ -1014,8 +1335,9 @@ "id": "40817f8c9eeae5fe", "type": "junction", "z": "b0286fae9f2ce547", - "x": 460, - "y": 280, + "g": "f55a52c40b8b8749", + "x": 480, + "y": 300, "wires": [ [ "77f2aae15fa1250d" @@ -1026,8 +1348,9 @@ "id": "b8995a85f5d34268", "type": "junction", "z": "b0286fae9f2ce547", - "x": 440, - "y": 400, + "g": "f55a52c40b8b8749", + "x": 460, + "y": 420, "wires": [ [ "be5bdfc3c12b05da" @@ -1038,8 +1361,9 @@ "id": "85bd556a614f0455", "type": "junction", "z": "b0286fae9f2ce547", - "x": 460, - "y": 460, + "g": "f55a52c40b8b8749", + "x": 480, + "y": 480, "wires": [ [ "728ab818393de52d" @@ -1050,8 +1374,9 @@ "id": "c95d487f9fbe14ce", "type": "junction", "z": "b0286fae9f2ce547", - "x": 440, - "y": 580, + "g": "f55a52c40b8b8749", + "x": 460, + "y": 600, "wires": [ [ "0b860dc2f7db3ba0" @@ -1062,8 +1387,9 @@ "id": "318bee4424125dd5", "type": "junction", "z": "b0286fae9f2ce547", - "x": 460, - "y": 640, + "g": "f55a52c40b8b8749", + "x": 480, + "y": 660, "wires": [ [ "51d86d6064f084d2" @@ -4036,6 +4362,7 @@ "id": "cc8645ebae721601", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Get duration", "server": "9e87348d.9c1c48", "version": 3, @@ -4068,8 +4395,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 1010, - "y": 160, + "x": 1030, + "y": 200, "wires": [ [ "b2d071ca42e4a3c6", @@ -4081,6 +4408,7 @@ "id": "b2d071ca42e4a3c6", "type": "function", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Convert to seconds", "func": "msg.duration = msg.duration * 60\nreturn msg;", "outputs": 1, @@ -4088,8 +4416,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1210, - "y": 160, + "x": 1230, + "y": 200, "wires": [ [ "7fc67fc156c0f4be" @@ -4100,6 +4428,7 @@ "id": "7fc67fc156c0f4be", "type": "api-call-service", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Start Timer", "server": "9e87348d.9c1c48", "version": 5, @@ -4117,8 +4446,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1410, - "y": 160, + "x": 1430, + "y": 200, "wires": [ [] ] @@ -4127,6 +4456,7 @@ "id": "f24aeb9c34914db9", "type": "server-state-changed", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Pause Switch", "server": "9e87348d.9c1c48", "version": 4, @@ -4178,8 +4508,8 @@ "valueType": "triggerId" } ], - "x": 250, - "y": 320, + "x": 130, + "y": 400, "wires": [ [ "afeb1d238a623c3d" @@ -4193,6 +4523,7 @@ "id": "afeb1d238a623c3d", "type": "api-call-service", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "", "server": "9e87348d.9c1c48", "version": 5, @@ -4210,8 +4541,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 450, - "y": 280, + "x": 330, + "y": 360, "wires": [ [ "b0f2bb3aef2890a1" @@ -4222,6 +4553,7 @@ "id": "34dcb204b421710d", "type": "api-call-service", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "", "server": "9e87348d.9c1c48", "version": 5, @@ -4239,8 +4571,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 440, - "y": 360, + "x": 320, + "y": 440, "wires": [ [ "e69ad4771494c458", @@ -4252,6 +4584,7 @@ "id": "602437ba010cc43d", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "Get Room", "server": "9e87348d.9c1c48", "version": 3, @@ -4284,8 +4617,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 790, - "y": 520, + "x": 670, + "y": 600, "wires": [ [ "0a441953c41a18ae" @@ -4296,6 +4629,7 @@ "id": "1dc210f02bbc891d", "type": "switch", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "", "property": "payload", "propertyType": "msg", @@ -4309,8 +4643,8 @@ "checkall": "true", "repair": false, "outputs": 1, - "x": 430, - "y": 520, + "x": 310, + "y": 600, "wires": [ [ "fe1ba086baf93ec0", @@ -4322,6 +4656,7 @@ "id": "014d305040d2a8bd", "type": "server-events", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "Timer Finished", "server": "9e87348d.9c1c48", "version": 1, @@ -4346,8 +4681,8 @@ "valueType": "jsonata" } ], - "x": 260, - "y": 520, + "x": 140, + "y": 600, "wires": [ [ "1dc210f02bbc891d" @@ -4358,6 +4693,7 @@ "id": "923538ef97772f0c", "type": "api-call-service", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "Notification", "server": "9e87348d.9c1c48", "version": 5, @@ -4373,8 +4709,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1190, - "y": 580, + "x": 1070, + "y": 660, "wires": [ [] ] @@ -4383,6 +4719,7 @@ "id": "a3e3dc438a7b95fc", "type": "change", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "Finished Message", "rules": [ { @@ -4405,8 +4742,8 @@ "from": "", "to": "", "reg": false, - "x": 810, - "y": 580, + "x": 690, + "y": 660, "wires": [ [ "08a22fa71fce5e91" @@ -4417,6 +4754,7 @@ "id": "797d3e7cc53d773f", "type": "ha-button", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Start Button", "version": 0, "debugenabled": false, @@ -4442,8 +4780,8 @@ "valueType": "entity" } ], - "x": 110, - "y": 160, + "x": 130, + "y": 200, "wires": [ [ "cb399b9e54bcf0f0" @@ -4454,6 +4792,7 @@ "id": "fe1ba086baf93ec0", "type": "api-call-service", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "Reset Slider", "server": "9e87348d.9c1c48", "version": 5, @@ -4471,8 +4810,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 790, - "y": 760, + "x": 670, + "y": 840, "wires": [ [] ] @@ -4481,6 +4820,7 @@ "id": "cb399b9e54bcf0f0", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Get Room", "server": "9e87348d.9c1c48", "version": 3, @@ -4513,8 +4853,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 290, - "y": 160, + "x": 310, + "y": 200, "wires": [ [ "715c94772f02e398" @@ -4525,6 +4865,7 @@ "id": "4d4e55cea59da9ad", "type": "api-call-service", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Basement Lights Scene", "server": "9e87348d.9c1c48", "version": 5, @@ -4542,8 +4883,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1370, - "y": 40, + "x": 1390, + "y": 80, "wires": [ [] ] @@ -4552,6 +4893,7 @@ "id": "600f4c2dcc3e0c51", "type": "switch", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Routing", "property": "room", "propertyType": "msg", @@ -4573,8 +4915,8 @@ "checkall": "true", "repair": false, "outputs": 3, - "x": 840, - "y": 160, + "x": 860, + "y": 200, "wires": [ [ "cc8645ebae721601", @@ -4593,9 +4935,10 @@ "id": "50056b099a24a824", "type": "subflow:6429099c4571dd6b", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "", - "x": 1160, - "y": 520, + "x": 1040, + "y": 600, "wires": [ [] ] @@ -4604,10 +4947,11 @@ "id": "9727faf3509b96f8", "type": "todoist-task-complete", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "", "token": "f19eac517a138c66", - "x": 1100, - "y": 660, + "x": 980, + "y": 740, "wires": [ [] ] @@ -4616,6 +4960,7 @@ "id": "d8e2d16e313b938a", "type": "change", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "Task ID", "rules": [ { @@ -4631,8 +4976,8 @@ "from": "", "to": "", "reg": false, - "x": 920, - "y": 640, + "x": 800, + "y": 720, "wires": [ [ "9727faf3509b96f8" @@ -4643,6 +4988,7 @@ "id": "e69ad4771494c458", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Get Room", "server": "9e87348d.9c1c48", "version": 3, @@ -4675,8 +5021,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 610, - "y": 360, + "x": 490, + "y": 440, "wires": [ [ "fdf9b6820eb7289a" @@ -4687,6 +5033,7 @@ "id": "fdf9b6820eb7289a", "type": "switch", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Routing", "property": "room", "propertyType": "msg", @@ -4703,8 +5050,8 @@ "checkall": "true", "repair": false, "outputs": 2, - "x": 780, - "y": 360, + "x": 660, + "y": 440, "wires": [ [ "24abb932c4cd0b1f" @@ -4716,6 +5063,7 @@ "id": "5c44fd504453ae63", "type": "api-call-service", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Turn on K's bedroom lights", "server": "9e87348d.9c1c48", "version": 5, @@ -4733,8 +5081,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1380, - "y": 320, + "x": 1260, + "y": 400, "wires": [ [ "dd0be4a0dd77e1db" @@ -4745,6 +5093,7 @@ "id": "908543f7b78f7beb", "type": "api-call-service", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Turn on K's bedroom lights", "server": "9e87348d.9c1c48", "version": 5, @@ -4762,8 +5111,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1380, - "y": 100, + "x": 1400, + "y": 140, "wires": [ [ "d6728df5d1fdf67e" @@ -4774,6 +5123,7 @@ "id": "dd0be4a0dd77e1db", "type": "delay", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "", "pauseType": "delay", "timeout": "5", @@ -4787,8 +5137,8 @@ "drop": false, "allowrate": false, "outputs": 1, - "x": 1600, - "y": 320, + "x": 1480, + "y": 400, "wires": [ [ "6b086807971b2618" @@ -4799,6 +5149,7 @@ "id": "d6728df5d1fdf67e", "type": "delay", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "", "pauseType": "delay", "timeout": "5", @@ -4812,8 +5163,8 @@ "drop": false, "allowrate": false, "outputs": 1, - "x": 1600, - "y": 100, + "x": 1620, + "y": 140, "wires": [ [ "ae7073e78053da5d" @@ -4824,6 +5175,7 @@ "id": "ae7073e78053da5d", "type": "api-call-service", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Set to Adaptive", "server": "9e87348d.9c1c48", "version": 5, @@ -4841,8 +5193,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1780, - "y": 100, + "x": 1800, + "y": 140, "wires": [ [] ] @@ -4851,6 +5203,7 @@ "id": "6b086807971b2618", "type": "api-call-service", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Set to Adaptive", "server": "9e87348d.9c1c48", "version": 5, @@ -4868,8 +5221,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1780, - "y": 320, + "x": 1660, + "y": 400, "wires": [ [] ] @@ -4878,6 +5231,7 @@ "id": "6736626753b33834", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Check lights", "server": "9e87348d.9c1c48", "version": 3, @@ -4910,8 +5264,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 1150, - "y": 360, + "x": 1030, + "y": 440, "wires": [ [ "5c44fd504453ae63" @@ -4927,6 +5281,52 @@ "id": "715c94772f02e398", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", + "name": "Get Activity", + "server": "9e87348d.9c1c48", + "version": 3, + "outputs": 1, + "halt_if": "", + "halt_if_type": "str", + "halt_if_compare": "is", + "entity_id": "input_select.kallen_activities", + "state_type": "str", + "blockInputOverrides": false, + "outputProperties": [ + { + "property": "activity", + "propertyType": "msg", + "value": "", + "valueType": "entityState" + }, + { + "property": "data", + "propertyType": "msg", + "value": "", + "valueType": "entity" + } + ], + "for": "0", + "forType": "num", + "forUnits": "minutes", + "override_topic": false, + "state_location": "payload", + "override_payload": "msg", + "entity_location": "data", + "override_data": "msg", + "x": 490, + "y": 200, + "wires": [ + [ + "6a84cfeac66e9b29" + ] + ] + }, + { + "id": "646450ddef26f6f6", + "type": "api-current-state", + "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "Get Activity", "server": "9e87348d.9c1c48", "version": 3, @@ -4960,51 +5360,7 @@ "entity_location": "data", "override_data": "msg", "x": 470, - "y": 160, - "wires": [ - [ - "6a84cfeac66e9b29" - ] - ] - }, - { - "id": "646450ddef26f6f6", - "type": "api-current-state", - "z": "4a8821853d4dd1ad", - "name": "Get Activity", - "server": "9e87348d.9c1c48", - "version": 3, - "outputs": 1, - "halt_if": "", - "halt_if_type": "str", - "halt_if_compare": "is", - "entity_id": "input_select.kallen_activities", - "state_type": "str", - "blockInputOverrides": false, - "outputProperties": [ - { - "property": "activity", - "propertyType": "msg", - "value": "", - "valueType": "entityState" - }, - { - "property": "data", - "propertyType": "msg", - "value": "", - "valueType": "entity" - } - ], - "for": "0", - "forType": "num", - "forUnits": "minutes", - "override_topic": false, - "state_location": "payload", - "override_payload": "msg", - "entity_location": "data", - "override_data": "msg", - "x": 590, - "y": 520, + "y": 600, "wires": [ [ "602437ba010cc43d", @@ -5017,6 +5373,7 @@ "id": "b0c92a72557d0ac6", "type": "switch", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "", "property": "activity", "propertyType": "msg", @@ -5035,8 +5392,8 @@ "checkall": "true", "repair": false, "outputs": 2, - "x": 770, - "y": 660, + "x": 650, + "y": 740, "wires": [ [ "d8e2d16e313b938a" @@ -5050,6 +5407,7 @@ "id": "408795055634e897", "type": "change", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "Task ID", "rules": [ { @@ -5065,8 +5423,8 @@ "from": "", "to": "", "reg": false, - "x": 920, - "y": 700, + "x": 800, + "y": 780, "wires": [ [ "9727faf3509b96f8" @@ -5077,6 +5435,7 @@ "id": "0a441953c41a18ae", "type": "change", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "Formatting", "rules": [ { @@ -5101,8 +5460,8 @@ "from": "", "to": "", "reg": false, - "x": 970, - "y": 520, + "x": 850, + "y": 600, "wires": [ [ "50056b099a24a824" @@ -5113,6 +5472,7 @@ "id": "08a22fa71fce5e91", "type": "change", "z": "4a8821853d4dd1ad", + "g": "1ca205a84922c8c2", "name": "Set Activity", "rules": [ { @@ -5139,8 +5499,8 @@ "from": "", "to": "", "reg": false, - "x": 1010, - "y": 580, + "x": 890, + "y": 660, "wires": [ [ "923538ef97772f0c" @@ -5151,6 +5511,7 @@ "id": "736d7433005436b3", "type": "change", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Formatting", "rules": [ { @@ -5207,8 +5568,8 @@ "from": "", "to": "", "reg": false, - "x": 1350, - "y": 220, + "x": 1370, + "y": 260, "wires": [ [ "0aa29248b560c45d" @@ -5219,9 +5580,10 @@ "id": "0aa29248b560c45d", "type": "subflow:6429099c4571dd6b", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "", - "x": 1540, - "y": 220, + "x": 1560, + "y": 260, "wires": [ [] ] @@ -5230,6 +5592,7 @@ "id": "b8ca8a1a2655570b", "type": "function", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Rounding", "func": "var readout = msg.duration\n\nmsg.duration = +readout.toFixed(0)\n\nreturn msg;", "outputs": 1, @@ -5237,8 +5600,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1180, - "y": 220, + "x": 1200, + "y": 260, "wires": [ [ "736d7433005436b3" @@ -5249,6 +5612,7 @@ "id": "6a84cfeac66e9b29", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Control Lights?", "server": "9e87348d.9c1c48", "version": 3, @@ -5281,8 +5645,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 660, - "y": 160, + "x": 680, + "y": 200, "wires": [ [ "600f4c2dcc3e0c51" @@ -5300,6 +5664,7 @@ "id": "c43df123937fd07d", "type": "switch", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Lights?", "property": "lights", "propertyType": "msg", @@ -5318,8 +5683,8 @@ "checkall": "true", "repair": false, "outputs": 2, - "x": 1000, - "y": 80, + "x": 1020, + "y": 120, "wires": [ [ "fc26a2c43e3a3faa" @@ -5331,6 +5696,7 @@ "id": "fc26a2c43e3a3faa", "type": "switch", "z": "4a8821853d4dd1ad", + "g": "753e14252442d87d", "name": "Routing", "property": "room", "propertyType": "msg", @@ -5349,8 +5715,8 @@ "checkall": "true", "repair": false, "outputs": 2, - "x": 1160, - "y": 80, + "x": 1180, + "y": 120, "wires": [ [ "4d4e55cea59da9ad" @@ -5364,6 +5730,7 @@ "id": "24abb932c4cd0b1f", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Control Lights?", "server": "9e87348d.9c1c48", "version": 3, @@ -5396,8 +5763,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 960, - "y": 360, + "x": 840, + "y": 440, "wires": [ [ "6736626753b33834" @@ -5413,6 +5780,7 @@ "id": "b0f2bb3aef2890a1", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Get Room", "server": "9e87348d.9c1c48", "version": 3, @@ -5445,8 +5813,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 630, - "y": 280, + "x": 510, + "y": 360, "wires": [ [ "70888fea017c3e69" @@ -5457,6 +5825,7 @@ "id": "70888fea017c3e69", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Get Activity", "server": "9e87348d.9c1c48", "version": 3, @@ -5489,8 +5858,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 810, - "y": 280, + "x": 690, + "y": 360, "wires": [ [ "c0521b53f7efeb17" @@ -5501,6 +5870,7 @@ "id": "c0521b53f7efeb17", "type": "change", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Formatting", "rules": [ { @@ -5548,8 +5918,8 @@ "from": "", "to": "", "reg": false, - "x": 990, - "y": 280, + "x": 870, + "y": 360, "wires": [ [ "95d5ac486b4f9ee0" @@ -5560,9 +5930,10 @@ "id": "95d5ac486b4f9ee0", "type": "subflow:6429099c4571dd6b", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "", - "x": 1180, - "y": 280, + "x": 1060, + "y": 360, "wires": [ [] ] @@ -5571,6 +5942,7 @@ "id": "392d8c474c89b9f0", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Get Room", "server": "9e87348d.9c1c48", "version": 3, @@ -5603,8 +5975,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 610, - "y": 420, + "x": 490, + "y": 500, "wires": [ [ "3ba243a44893f620" @@ -5615,6 +5987,7 @@ "id": "3ba243a44893f620", "type": "api-current-state", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Get Activity", "server": "9e87348d.9c1c48", "version": 3, @@ -5647,8 +6020,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 790, - "y": 420, + "x": 670, + "y": 500, "wires": [ [ "49767cbfa622a734" @@ -5659,6 +6032,7 @@ "id": "49767cbfa622a734", "type": "change", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "Formatting", "rules": [ { @@ -5706,8 +6080,8 @@ "from": "", "to": "", "reg": false, - "x": 970, - "y": 420, + "x": 850, + "y": 500, "wires": [ [ "04113ab4977bf725" @@ -5718,9 +6092,10 @@ "id": "04113ab4977bf725", "type": "subflow:6429099c4571dd6b", "z": "4a8821853d4dd1ad", + "g": "56c26bcb1de77e0e", "name": "", - "x": 1160, - "y": 420, + "x": 1040, + "y": 500, "wires": [ [] ] @@ -8085,6 +8460,7 @@ "id": "05547a934bbcab4d", "type": "server-state-changed", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "name": "Motion Detected", "server": "9e87348d.9c1c48", "version": 4, @@ -8136,8 +8512,8 @@ "valueType": "triggerId" } ], - "x": 100, - "y": 600, + "x": 140, + "y": 640, "wires": [ [ "edef3ad58f6e9bbd" @@ -8153,6 +8529,7 @@ "id": "091390f43bfeddf5", "type": "api-call-service", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "name": "Turn on light", "server": "9e87348d.9c1c48", "version": 5, @@ -8172,8 +8549,8 @@ "queue": "none", "output_location": "", "output_location_type": "none", - "x": 730, - "y": 600, + "x": 770, + "y": 640, "wires": [ [ "26bda03370a86d83" @@ -8184,13 +8561,14 @@ "id": "26bda03370a86d83", "type": "stoptimer", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "duration": "10", "units": "Minute", "payloadtype": "num", "payloadval": "0", "name": "Wait 10 Minutes", - "x": 920, - "y": 600, + "x": 960, + "y": 640, "wires": [ [ "f65b2eccda530bcd" @@ -8202,6 +8580,7 @@ "id": "f65b2eccda530bcd", "type": "api-current-state", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "name": "Motion Detected?", "server": "9e87348d.9c1c48", "version": 3, @@ -8229,8 +8608,8 @@ "for": 0, "forType": "num", "forUnits": "minutes", - "x": 170, - "y": 740, + "x": 210, + "y": 780, "wires": [ [ "1bf27a631436c914" @@ -8244,13 +8623,14 @@ "id": "1bf27a631436c914", "type": "stoptimer", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "duration": "30", "units": "Second", "payloadtype": "num", "payloadval": "0", "name": "Wait 30 Seconds", - "x": 550, - "y": 680, + "x": 590, + "y": 720, "wires": [ [ "f65b2eccda530bcd" @@ -8262,6 +8642,7 @@ "id": "7a7229eb69c9b1a3", "type": "api-call-service", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "name": "Turn off light", "server": "9e87348d.9c1c48", "version": 5, @@ -8281,8 +8662,8 @@ "queue": "none", "output_location": "", "output_location_type": "none", - "x": 610, - "y": 740, + "x": 650, + "y": 780, "wires": [ [] ] @@ -8291,6 +8672,7 @@ "id": "edef3ad58f6e9bbd", "type": "api-current-state", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "name": "Early Night Mode", "server": "9e87348d.9c1c48", "version": 3, @@ -8323,8 +8705,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 310, - "y": 600, + "x": 350, + "y": 640, "wires": [ [ "780ad4c1a1d5204b" @@ -8336,6 +8718,7 @@ "id": "780ad4c1a1d5204b", "type": "api-current-state", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "name": "Front Porch Toggle", "server": "9e87348d.9c1c48", "version": 3, @@ -8368,8 +8751,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 530, - "y": 600, + "x": 570, + "y": 640, "wires": [ [ "091390f43bfeddf5" @@ -8381,6 +8764,7 @@ "id": "51237623ed73ba98", "type": "api-current-state", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "name": "Front Porch Toggle", "server": "9e87348d.9c1c48", "version": 3, @@ -8413,8 +8797,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 390, - "y": 740, + "x": 430, + "y": 780, "wires": [ [ "7a7229eb69c9b1a3" @@ -8426,6 +8810,7 @@ "id": "47aa56df01f697fc", "type": "server-state-changed", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "name": "Door Open", "server": "9e87348d.9c1c48", "version": 4, @@ -8477,8 +8862,8 @@ "valueType": "triggerId" } ], - "x": 80, - "y": 660, + "x": 120, + "y": 700, "wires": [ [ "edef3ad58f6e9bbd" @@ -8494,12 +8879,13 @@ "id": "f34816b23181f21e", "type": "link in", "z": "eff21041cc941fef", + "g": "eeafd13be593ae69", "name": "Porch Light Input", "links": [ "26f15fc8d75a4020" ], - "x": 165, - "y": 540, + "x": 205, + "y": 580, "wires": [ [ "edef3ad58f6e9bbd" @@ -10314,6 +10700,7 @@ "id": "97a441f1ac510844", "type": "inject", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "", "props": [ { @@ -10327,8 +10714,8 @@ "topic": "", "payload": "", "payloadType": "date", - "x": 140, - "y": 220, + "x": 180, + "y": 280, "wires": [ [ "ec543bc9adac3d08" @@ -10339,6 +10726,7 @@ "id": "d45ac7361e128558", "type": "lifx-pulse-effect", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "", "api": "60eb53fb94cd64e4", "selector": "group:Basement Studio", @@ -10348,14 +10736,15 @@ "cycles": "5", "persist": "false", "power_on": "true", - "x": 550, - "y": 280, + "x": 590, + "y": 340, "wires": [] }, { "id": "fbe3667814a51f6f", "type": "server-state-changed", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "Front Door Opens", "server": "9e87348d.9c1c48", "version": 4, @@ -10407,8 +10796,8 @@ "valueType": "triggerId" } ], - "x": 110, - "y": 280, + "x": 150, + "y": 340, "wires": [ [ "ec543bc9adac3d08" @@ -10420,6 +10809,7 @@ "id": "ec543bc9adac3d08", "type": "api-current-state", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "Basement Lights On?", "server": "9e87348d.9c1c48", "version": 3, @@ -10452,8 +10842,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 340, - "y": 280, + "x": 380, + "y": 340, "wires": [ [ "d45ac7361e128558", @@ -10467,6 +10857,7 @@ "id": "cb4d95e0ee4e1f05", "type": "api-call-service", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "Reset Adaptive", "server": "9e87348d.9c1c48", "version": 5, @@ -10484,8 +10875,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 720, - "y": 220, + "x": 760, + "y": 280, "wires": [ [] ] @@ -10494,6 +10885,7 @@ "id": "3563f62312975002", "type": "delay", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "", "pauseType": "delay", "timeout": "5", @@ -10507,8 +10899,8 @@ "drop": false, "allowrate": false, "outputs": 1, - "x": 540, - "y": 220, + "x": 580, + "y": 280, "wires": [ [ "cb4d95e0ee4e1f05" @@ -10519,6 +10911,7 @@ "id": "d4019d35bf5a5f98", "type": "inject", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "", "props": [ { @@ -10532,8 +10925,8 @@ "topic": "", "payload": "", "payloadType": "date", - "x": 140, - "y": 400, + "x": 180, + "y": 460, "wires": [ [ "e91c3392b59ff9d1" @@ -10544,6 +10937,7 @@ "id": "29b9f573370571cf", "type": "lifx-pulse-effect", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "", "api": "60eb53fb94cd64e4", "selector": "group:Basement Studio", @@ -10553,14 +10947,15 @@ "cycles": "8", "persist": "false", "power_on": "true", - "x": 550, - "y": 460, + "x": 590, + "y": 520, "wires": [] }, { "id": "25e12d8e4a0a7f11", "type": "server-state-changed", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "Doorbell Rings", "server": "9e87348d.9c1c48", "version": 4, @@ -10612,8 +11007,8 @@ "valueType": "triggerId" } ], - "x": 100, - "y": 460, + "x": 140, + "y": 520, "wires": [ [ "e91c3392b59ff9d1" @@ -10625,6 +11020,7 @@ "id": "e91c3392b59ff9d1", "type": "api-current-state", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "Basement Lights On?", "server": "9e87348d.9c1c48", "version": 3, @@ -10657,8 +11053,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 340, - "y": 460, + "x": 380, + "y": 520, "wires": [ [ "29b9f573370571cf", @@ -10672,6 +11068,7 @@ "id": "5a19347b1a570e9c", "type": "api-call-service", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "Reset Adaptive", "server": "9e87348d.9c1c48", "version": 5, @@ -10689,8 +11086,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 720, - "y": 400, + "x": 760, + "y": 460, "wires": [ [] ] @@ -10699,6 +11096,7 @@ "id": "753ad45c3685897b", "type": "delay", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "", "pauseType": "delay", "timeout": "5", @@ -10712,8 +11110,8 @@ "drop": false, "allowrate": false, "outputs": 1, - "x": 540, - "y": 400, + "x": 580, + "y": 460, "wires": [ [ "5a19347b1a570e9c" @@ -10724,6 +11122,7 @@ "id": "d32a407e1c701563", "type": "api-call-service", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "Hue Lights", "server": "9e87348d.9c1c48", "version": 5, @@ -10743,8 +11142,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 550, - "y": 340, + "x": 590, + "y": 400, "wires": [ [] ] @@ -10753,6 +11152,7 @@ "id": "58b54517ed812db3", "type": "api-call-service", "z": "47f17992fab9b4f5", + "g": "208284848b13b85b", "name": "Hue Lights", "server": "9e87348d.9c1c48", "version": 5, @@ -10772,8 +11172,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 550, - "y": 520, + "x": 590, + "y": 580, "wires": [ [] ] @@ -10782,6 +11182,7 @@ "id": "cd04bdb407311eb5", "type": "ha-button", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Start YouTube in Living Room", "version": 0, "debugenabled": false, @@ -10807,8 +11208,8 @@ "valueType": "entity" } ], - "x": 160, - "y": 40, + "x": 180, + "y": 60, "wires": [ [ "31cb558d6ee383c4" @@ -10819,6 +11220,7 @@ "id": "7611921cadb91b1e", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Dim Lights", "server": "9e87348d.9c1c48", "version": 5, @@ -10836,8 +11238,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 990, - "y": 920, + "x": 1010, + "y": 940, "wires": [ [ "8b53b9f4d5ba0bf0" @@ -10848,6 +11250,7 @@ "id": "cac7cc3111526a67", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Start Youtube", "server": "9e87348d.9c1c48", "version": 5, @@ -10865,8 +11268,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 740, - "y": 40, + "x": 760, + "y": 60, "wires": [ [] ] @@ -10875,6 +11278,7 @@ "id": "7d8d5376e990d357", "type": "ha-button", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Stop YouTube in Living Room", "version": 0, "debugenabled": false, @@ -10900,8 +11304,8 @@ "valueType": "entity" } ], - "x": 160, - "y": 100, + "x": 180, + "y": 120, "wires": [ [ "0b79d297a8596c37" @@ -10912,6 +11316,7 @@ "id": "3a29cecbefa6cbe2", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Reset Lights", "server": "9e87348d.9c1c48", "version": 5, @@ -10929,8 +11334,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1070, - "y": 1000, + "x": 1090, + "y": 1020, "wires": [ [ "2c9b9e4fbaa17b8a" @@ -10941,6 +11346,7 @@ "id": "ab4c69753bfc36f5", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Stop Youtube", "server": "9e87348d.9c1c48", "version": 5, @@ -10958,8 +11364,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 730, - "y": 100, + "x": 750, + "y": 120, "wires": [ [] ] @@ -10968,13 +11374,14 @@ "id": "b18c7a21fc449d35", "type": "alexa-home", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "conf": "c8312629c112d43a", "device": "171565", "acknoledge": true, "name": "Living Room Youtube", "topic": "", - "x": 140, - "y": 160, + "x": 160, + "y": 180, "wires": [ [ "936091f71dc880b3" @@ -10985,6 +11392,7 @@ "id": "936091f71dc880b3", "type": "switch", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "", "property": "payload", "propertyType": "msg", @@ -11003,8 +11411,8 @@ "checkall": "true", "repair": false, "outputs": 2, - "x": 330, - "y": 160, + "x": 350, + "y": 180, "wires": [ [ "31cb558d6ee383c4" @@ -11018,6 +11426,7 @@ "id": "59350a1f38e3e04a", "type": "ha-button", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Start Twitch in Living Room", "version": 0, "debugenabled": false, @@ -11043,8 +11452,8 @@ "valueType": "entity" } ], - "x": 150, - "y": 220, + "x": 170, + "y": 240, "wires": [ [ "13d5c047c41f60ba" @@ -11055,6 +11464,7 @@ "id": "6c78852a9c604f64", "type": "ha-button", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Stop Twitch in Living Room", "version": 0, "debugenabled": false, @@ -11080,8 +11490,8 @@ "valueType": "entity" } ], - "x": 150, - "y": 280, + "x": 170, + "y": 300, "wires": [ [ "40817f8c9eeae5fe" @@ -11092,13 +11502,14 @@ "id": "abe997d5df095480", "type": "alexa-home", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "conf": "c8312629c112d43a", "device": "171566", "acknoledge": true, "name": "Living Room Twitch", "topic": "", - "x": 130, - "y": 340, + "x": 150, + "y": 360, "wires": [ [ "a18b6c8c026995d6" @@ -11109,6 +11520,7 @@ "id": "a18b6c8c026995d6", "type": "switch", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "", "property": "payload", "propertyType": "msg", @@ -11127,8 +11539,8 @@ "checkall": "true", "repair": false, "outputs": 2, - "x": 330, - "y": 340, + "x": 350, + "y": 360, "wires": [ [ "13d5c047c41f60ba" @@ -11142,6 +11554,7 @@ "id": "db54e97573a07fc4", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Start Twitch", "server": "9e87348d.9c1c48", "version": 5, @@ -11159,8 +11572,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 730, - "y": 160, + "x": 750, + "y": 180, "wires": [ [] ] @@ -11169,6 +11582,7 @@ "id": "77f2aae15fa1250d", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Stop Twitch", "server": "9e87348d.9c1c48", "version": 5, @@ -11186,8 +11600,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 730, - "y": 220, + "x": 750, + "y": 240, "wires": [ [] ] @@ -11196,6 +11610,7 @@ "id": "9e36b04d6063c234", "type": "ha-button", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Start Plex in Living Room", "version": 0, "debugenabled": false, @@ -11221,8 +11636,8 @@ "valueType": "entity" } ], - "x": 150, - "y": 400, + "x": 170, + "y": 420, "wires": [ [ "b8995a85f5d34268" @@ -11233,6 +11648,7 @@ "id": "7f82b9d6d835e09b", "type": "ha-button", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Stop Plex in Living Room", "version": 0, "debugenabled": false, @@ -11258,8 +11674,8 @@ "valueType": "entity" } ], - "x": 150, - "y": 460, + "x": 170, + "y": 480, "wires": [ [ "85bd556a614f0455" @@ -11270,13 +11686,14 @@ "id": "158b197a42fed757", "type": "alexa-home", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "conf": "c8312629c112d43a", "device": "171567", "acknoledge": true, "name": "Living Room Plex", "topic": "", - "x": 120, - "y": 520, + "x": 140, + "y": 540, "wires": [ [ "e549712aaaceb285" @@ -11287,6 +11704,7 @@ "id": "e549712aaaceb285", "type": "switch", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "", "property": "payload", "propertyType": "msg", @@ -11305,8 +11723,8 @@ "checkall": "true", "repair": false, "outputs": 2, - "x": 330, - "y": 520, + "x": 350, + "y": 540, "wires": [ [ "b8995a85f5d34268" @@ -11320,6 +11738,7 @@ "id": "be5bdfc3c12b05da", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Start Plex", "server": "9e87348d.9c1c48", "version": 5, @@ -11337,8 +11756,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 720, - "y": 280, + "x": 740, + "y": 300, "wires": [ [] ] @@ -11347,6 +11766,7 @@ "id": "728ab818393de52d", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Stop Plex", "server": "9e87348d.9c1c48", "version": 5, @@ -11364,8 +11784,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 720, - "y": 340, + "x": 740, + "y": 360, "wires": [ [] ] @@ -11374,6 +11794,7 @@ "id": "960884b0fd23e69b", "type": "ha-button", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Start Netflix in Living Room", "version": 0, "debugenabled": false, @@ -11399,8 +11820,8 @@ "valueType": "entity" } ], - "x": 150, - "y": 580, + "x": 170, + "y": 600, "wires": [ [ "c95d487f9fbe14ce" @@ -11411,6 +11832,7 @@ "id": "61fdabfde220fbcc", "type": "ha-button", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Stop Netflix in Living Room", "version": 0, "debugenabled": false, @@ -11436,8 +11858,8 @@ "valueType": "entity" } ], - "x": 150, - "y": 640, + "x": 170, + "y": 660, "wires": [ [ "318bee4424125dd5" @@ -11448,13 +11870,14 @@ "id": "42b706dd4afe3e42", "type": "alexa-home", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "conf": "c8312629c112d43a", "device": "171568", "acknoledge": true, "name": "Living Room Netflix", "topic": "", - "x": 130, - "y": 700, + "x": 150, + "y": 720, "wires": [ [ "9a605b80513eba44" @@ -11465,6 +11888,7 @@ "id": "9a605b80513eba44", "type": "switch", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "", "property": "payload", "propertyType": "msg", @@ -11483,8 +11907,8 @@ "checkall": "true", "repair": false, "outputs": 2, - "x": 330, - "y": 700, + "x": 350, + "y": 720, "wires": [ [ "c95d487f9fbe14ce" @@ -11498,6 +11922,7 @@ "id": "0b860dc2f7db3ba0", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Start Netflix", "server": "9e87348d.9c1c48", "version": 5, @@ -11515,8 +11940,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 730, - "y": 400, + "x": 750, + "y": 420, "wires": [ [] ] @@ -11525,6 +11950,7 @@ "id": "51d86d6064f084d2", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "f55a52c40b8b8749", "name": "Stop Netflix", "server": "9e87348d.9c1c48", "version": 5, @@ -11542,8 +11968,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 730, - "y": 460, + "x": 750, + "y": 480, "wires": [ [] ] @@ -11552,6 +11978,7 @@ "id": "4a2031f363418db1", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Set Scene", "server": "9e87348d.9c1c48", "version": 5, @@ -11569,8 +11996,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1350, - "y": 920, + "x": 1370, + "y": 940, "wires": [ [] ] @@ -11579,6 +12006,7 @@ "id": "2c9b9e4fbaa17b8a", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Reset Scene", "server": "9e87348d.9c1c48", "version": 5, @@ -11596,8 +12024,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1250, - "y": 1000, + "x": 1270, + "y": 1020, "wires": [ [] ] @@ -11606,6 +12034,7 @@ "id": "984386fa0a6369d6", "type": "server-state-changed", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Living Room TV Current App", "server": "9e87348d.9c1c48", "version": 4, @@ -11645,8 +12074,8 @@ "valueType": "entityState" } ], - "x": 160, - "y": 840, + "x": 180, + "y": 860, "wires": [ [ "0beae13503166379" @@ -11657,6 +12086,7 @@ "id": "0beae13503166379", "type": "function", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "", "func": "if (msg.payload === \"YouTube\") {\n msg.payload = \"start\"\n} else if (msg.payload === \"Netflix\") {\n msg.payload = \"start\"\n} else if (msg.payload === \"Plex\") {\n msg.payload = \"start\"\n} else if (msg.payload === \"Twitch\") {\n msg.payload = \"start\"\n} else if (msg.payload === \"Hulu\") {\n msg.payload = \"start\"\n} else {\n msg.payload = \"stop\"\n}\nreturn msg;", "outputs": 1, @@ -11664,8 +12094,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 380, - "y": 840, + "x": 400, + "y": 860, "wires": [ [ "bc363dcf2c3aaf3c" @@ -11676,6 +12106,7 @@ "id": "6c77ade442a47a30", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Entertainment Mode On", "server": "9e87348d.9c1c48", "version": 5, @@ -11693,8 +12124,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 770, - "y": 800, + "x": 790, + "y": 820, "wires": [ [] ] @@ -11703,6 +12134,7 @@ "id": "bc363dcf2c3aaf3c", "type": "switch", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "", "property": "payload", "propertyType": "msg", @@ -11721,8 +12153,8 @@ "checkall": "true", "repair": false, "outputs": 2, - "x": 530, - "y": 840, + "x": 550, + "y": 860, "wires": [ [ "6c77ade442a47a30" @@ -11736,6 +12168,7 @@ "id": "6392f2f0586d988a", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Entertainment Mode Off", "server": "9e87348d.9c1c48", "version": 5, @@ -11753,8 +12186,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 770, - "y": 860, + "x": 790, + "y": 880, "wires": [ [] ] @@ -11763,6 +12196,7 @@ "id": "e505e9f24bf919dd", "type": "server-state-changed", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Entertainment Mode State", "server": "9e87348d.9c1c48", "version": 4, @@ -11814,8 +12248,8 @@ "valueType": "triggerId" } ], - "x": 150, - "y": 960, + "x": 170, + "y": 980, "wires": [ [ "6019fc13d70a69c7" @@ -11833,6 +12267,7 @@ "id": "c1c0d3ee514fa085", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Are Lights On?", "server": "9e87348d.9c1c48", "version": 3, @@ -11865,8 +12300,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 540, - "y": 920, + "x": 560, + "y": 940, "wires": [ [ "1ddcce6ef3293779" @@ -11878,6 +12313,7 @@ "id": "88580ff9416f69c7", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Are Lights On?", "server": "9e87348d.9c1c48", "version": 3, @@ -11910,8 +12346,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 540, - "y": 1000, + "x": 560, + "y": 1020, "wires": [ [ "3a29cecbefa6cbe2" @@ -11923,6 +12359,7 @@ "id": "9efd5346a1ca1972", "type": "server-state-changed", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Detect Pause", "server": "9e87348d.9c1c48", "version": 4, @@ -11962,8 +12399,8 @@ "valueType": "entityState" } ], - "x": 110, - "y": 1100, + "x": 130, + "y": 1120, "wires": [ [ "0845a18537933359" @@ -11982,6 +12419,7 @@ "id": "3596959961544947", "type": "switch", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "", "property": "payload", "propertyType": "msg", @@ -11995,8 +12433,8 @@ "checkall": "true", "repair": false, "outputs": 1, - "x": 430, - "y": 1060, + "x": 450, + "y": 1080, "wires": [ [ "9cbcdb825b0a60ad" @@ -12007,6 +12445,7 @@ "id": "9cbcdb825b0a60ad", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Check Toggle", "server": "9e87348d.9c1c48", "version": 3, @@ -12033,8 +12472,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 600, - "y": 1060, + "x": 620, + "y": 1080, "wires": [ [ "c9ca600850fc6a76" @@ -12046,6 +12485,7 @@ "id": "40cab913b75a5507", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Check Toggle", "server": "9e87348d.9c1c48", "version": 3, @@ -12072,8 +12512,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 860, - "y": 1140, + "x": 880, + "y": 1160, "wires": [ [ "a57d15aac606dfb1" @@ -12085,6 +12525,7 @@ "id": "c9ca600850fc6a76", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Are Lights On?", "server": "9e87348d.9c1c48", "version": 3, @@ -12117,8 +12558,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 800, - "y": 1060, + "x": 820, + "y": 1080, "wires": [ [ "1ddcce6ef3293779" @@ -12130,6 +12571,7 @@ "id": "a57d15aac606dfb1", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Are Lights On?", "server": "9e87348d.9c1c48", "version": 3, @@ -12162,8 +12604,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 1060, - "y": 1140, + "x": 1080, + "y": 1160, "wires": [ [ "3a29cecbefa6cbe2" @@ -12175,6 +12617,7 @@ "id": "8b53b9f4d5ba0bf0", "type": "api-call-service", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Dynamic On", "server": "9e87348d.9c1c48", "version": 5, @@ -12192,8 +12635,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 1170, - "y": 920, + "x": 1190, + "y": 940, "wires": [ [ "4a2031f363418db1" @@ -12204,6 +12647,7 @@ "id": "1ddcce6ef3293779", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Prevent Duplicate", "server": "9e87348d.9c1c48", "version": 3, @@ -12236,8 +12680,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 790, - "y": 920, + "x": 810, + "y": 940, "wires": [ [ "7611921cadb91b1e" @@ -12249,13 +12693,14 @@ "id": "cc8f6ab710549be2", "type": "stoptimer", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "duration": "15", "units": "Second", "payloadtype": "num", "payloadval": "0", "name": "", - "x": 650, - "y": 1140, + "x": 670, + "y": 1160, "wires": [ [ "40cab913b75a5507" @@ -12267,6 +12712,7 @@ "id": "24c5dfc33d4685c2", "type": "change", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Stop Timer", "rules": [ { @@ -12282,8 +12728,8 @@ "from": "", "to": "", "reg": false, - "x": 450, - "y": 1140, + "x": 470, + "y": 1160, "wires": [ [ "cc8f6ab710549be2" @@ -12294,6 +12740,7 @@ "id": "6019fc13d70a69c7", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Allowed?", "server": "9e87348d.9c1c48", "version": 3, @@ -12326,8 +12773,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 360, - "y": 920, + "x": 380, + "y": 940, "wires": [ [ "c1c0d3ee514fa085" @@ -12339,6 +12786,7 @@ "id": "f505205962d4e214", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Allowed?", "server": "9e87348d.9c1c48", "version": 3, @@ -12371,8 +12819,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 360, - "y": 1000, + "x": 380, + "y": 1020, "wires": [ [ "88580ff9416f69c7" @@ -12384,6 +12832,7 @@ "id": "966547ac9d93eee1", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Allowed?", "server": "9e87348d.9c1c48", "version": 3, @@ -12416,8 +12865,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 280, - "y": 1060, + "x": 300, + "y": 1080, "wires": [ [ "3596959961544947" @@ -12429,6 +12878,7 @@ "id": "63a9f9055e287a53", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Allowed?", "server": "9e87348d.9c1c48", "version": 3, @@ -12461,8 +12911,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 280, - "y": 1140, + "x": 300, + "y": 1160, "wires": [ [ "24c5dfc33d4685c2" @@ -12474,6 +12924,7 @@ "id": "0845a18537933359", "type": "api-current-state", "z": "b0286fae9f2ce547", + "g": "ff6d8150e8d5e606", "name": "Allowed?", "server": "9e87348d.9c1c48", "version": 3, @@ -12506,8 +12957,8 @@ "override_payload": "msg", "entity_location": "data", "override_data": "msg", - "x": 280, - "y": 1100, + "x": 300, + "y": 1120, "wires": [ [ "0968727f2138ac62" @@ -18442,6 +18893,7 @@ "id": "c2972c7728c99c43", "type": "function", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Conversions", "func": "msg.payload = (msg.payload / 1024000000)\nreturn msg;", "outputs": 1, @@ -18449,8 +18901,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 290, - "y": 180, + "x": 310, + "y": 200, "wires": [ [ "bc09f451754ba126" @@ -18461,6 +18913,7 @@ "id": "bc09f451754ba126", "type": "function", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Rounding", "func": "var readout = msg.payload\n\nmsg.payload = +readout.toFixed(2)\n\nreturn msg;", "outputs": 1, @@ -18468,8 +18921,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 460, - "y": 180, + "x": 480, + "y": 200, "wires": [ [ "6cf8f103906c1a49" @@ -18480,6 +18933,7 @@ "id": "fdefcd6a64aa9bca", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "CPU Temp", "topic": "glances/basement-server/sensors/Package_id_0/value", "qos": "1", @@ -18489,8 +18943,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 100, - "y": 60, + "x": 120, + "y": 80, "wires": [ [ "1d09b6c6a3773d9a" @@ -18501,6 +18955,7 @@ "id": "1d09b6c6a3773d9a", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Basement Server - CPU Temperature", "server": "9e87348d.9c1c48", "version": 2, @@ -18543,8 +18998,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 350, - "y": 60, + "x": 370, + "y": 80, "wires": [ [] ] @@ -18553,6 +19008,7 @@ "id": "6cf8f103906c1a49", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Basement Server - Memory Used", "server": "9e87348d.9c1c48", "version": 2, @@ -18595,8 +19051,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 700, - "y": 180, + "x": 720, + "y": 200, "wires": [ [] ] @@ -18605,6 +19061,7 @@ "id": "da305ace22579c07", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Memory Used", "topic": "glances/basement-server/mem/used", "qos": "1", @@ -18614,8 +19071,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 110, - "y": 180, + "x": 130, + "y": 200, "wires": [ [ "c2972c7728c99c43" @@ -18626,6 +19083,7 @@ "id": "7ecdec08d9698a19", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "CPU Usage", "topic": "glances/basement-server/cpu/total", "qos": "1", @@ -18635,8 +19093,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 110, - "y": 120, + "x": 130, + "y": 140, "wires": [ [ "9c9d7870a5204f13" @@ -18647,6 +19105,7 @@ "id": "9c9d7870a5204f13", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Basement Server - CPU Usage", "server": "9e87348d.9c1c48", "version": 2, @@ -18689,8 +19148,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 350, - "y": 120, + "x": 370, + "y": 140, "wires": [ [] ] @@ -18699,6 +19158,7 @@ "id": "1b5678e80095a461", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Uptime", "topic": "glances/basement-server/uptime/seconds", "qos": "1", @@ -18708,8 +19168,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 90, - "y": 300, + "x": 110, + "y": 320, "wires": [ [ "c88179f1facb8646" @@ -18720,6 +19180,7 @@ "id": "5248dc02bf48733e", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Basement Server - Uptime", "server": "9e87348d.9c1c48", "version": 2, @@ -18762,8 +19223,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 640, - "y": 300, + "x": 660, + "y": 320, "wires": [ [] ] @@ -18772,6 +19233,7 @@ "id": "c88179f1facb8646", "type": "function", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Conversions", "func": "msg.payload = (msg.payload / 60) / 60\nreturn msg;", "outputs": 1, @@ -18779,8 +19241,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 250, - "y": 300, + "x": 270, + "y": 320, "wires": [ [ "7af97720032b4609" @@ -18791,6 +19253,7 @@ "id": "7af97720032b4609", "type": "function", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Rounding", "func": "var readout = msg.payload\n\nmsg.payload = +readout.toFixed(2)\n\nreturn msg;", "outputs": 1, @@ -18798,8 +19261,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 420, - "y": 300, + "x": 440, + "y": 320, "wires": [ [ "5248dc02bf48733e" @@ -18810,6 +19273,7 @@ "id": "08aadf619537949e", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Memory Usage", "topic": "glances/basement-server/mem/percent", "qos": "1", @@ -18819,8 +19283,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 120, - "y": 240, + "x": 140, + "y": 260, "wires": [ [ "d819e61c0895affe" @@ -18831,6 +19295,7 @@ "id": "d819e61c0895affe", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Basement Server - Memory Usage", "server": "9e87348d.9c1c48", "version": 2, @@ -18873,8 +19338,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 380, - "y": 240, + "x": 400, + "y": 260, "wires": [ [] ] @@ -18883,6 +19348,7 @@ "id": "a0adec284cd8162a", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Free Space - /", "topic": "glances/basement-server/fs/_/free", "qos": "1", @@ -18892,8 +19358,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 110, - "y": 360, + "x": 130, + "y": 380, "wires": [ [ "46e0046a27f4bc89" @@ -18904,6 +19370,7 @@ "id": "46e0046a27f4bc89", "type": "function", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Conversions", "func": "msg.payload = (msg.payload / 1024000000)\nreturn msg;", "outputs": 1, @@ -18911,8 +19378,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 290, - "y": 360, + "x": 310, + "y": 380, "wires": [ [ "a6038f6bd028bd2f" @@ -18923,6 +19390,7 @@ "id": "a6038f6bd028bd2f", "type": "function", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Rounding", "func": "var readout = msg.payload\n\nmsg.payload = +readout.toFixed(2)\n\nreturn msg;", "outputs": 1, @@ -18930,8 +19398,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 460, - "y": 360, + "x": 480, + "y": 380, "wires": [ [ "8006b0b34776ec34" @@ -18942,6 +19410,7 @@ "id": "8006b0b34776ec34", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Basement Server - Free Space Root", "server": "9e87348d.9c1c48", "version": 2, @@ -18984,8 +19453,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 710, - "y": 360, + "x": 730, + "y": 380, "wires": [ [] ] @@ -18994,6 +19463,7 @@ "id": "b109c8db1c2cd259", "type": "ha-button", "z": "ffa6a885ac41a5ed", + "g": "46275dd0f9461013", "name": "Restart AppDaemon", "version": 0, "debugenabled": false, @@ -19007,8 +19477,8 @@ "valueType": "date" } ], - "x": 130, - "y": 720, + "x": 150, + "y": 780, "wires": [ [ "75a50e8dac7af692" @@ -19019,6 +19489,7 @@ "id": "75a50e8dac7af692", "type": "api-call-service", "z": "ffa6a885ac41a5ed", + "g": "46275dd0f9461013", "name": "", "server": "9e87348d.9c1c48", "version": 5, @@ -19034,8 +19505,8 @@ "mustacheAltTags": false, "outputProperties": [], "queue": "none", - "x": 360, - "y": 720, + "x": 380, + "y": 780, "wires": [ [] ] @@ -19044,6 +19515,7 @@ "id": "d5c7d4f4714a6cd6", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "CPU Load - 1 min", "topic": "glances/basement-server/load/min1", "qos": "1", @@ -19053,8 +19525,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 130, - "y": 420, + "x": 150, + "y": 440, "wires": [ [ "5fa5b04e2b1b3ae2" @@ -19065,6 +19537,7 @@ "id": "d1ac8b45d7baa4ed", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "CPU Load - 5 min", "topic": "glances/basement-server/load/min5", "qos": "1", @@ -19074,8 +19547,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 130, - "y": 480, + "x": 150, + "y": 500, "wires": [ [ "6f429b0dcaa5c607" @@ -19086,6 +19559,7 @@ "id": "35847fc20196c4ce", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "CPU Load - 15 min", "topic": "glances/basement-server/load/min15", "qos": "1", @@ -19095,8 +19569,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 130, - "y": 540, + "x": 150, + "y": 560, "wires": [ [ "9f53af3ad747cd62" @@ -19107,6 +19581,7 @@ "id": "5fa5b04e2b1b3ae2", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Basement Server - CPU Average Loads 1 min", "server": "9e87348d.9c1c48", "version": 2, @@ -19149,8 +19624,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 440, - "y": 420, + "x": 460, + "y": 440, "wires": [ [] ] @@ -19159,6 +19634,7 @@ "id": "6f429b0dcaa5c607", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Basement Server - CPU Average Loads 5 min", "server": "9e87348d.9c1c48", "version": 2, @@ -19201,8 +19677,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 440, - "y": 480, + "x": 460, + "y": 500, "wires": [ [] ] @@ -19211,6 +19687,7 @@ "id": "9f53af3ad747cd62", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Basement Server - CPU Average Loads 15 min", "server": "9e87348d.9c1c48", "version": 2, @@ -19253,8 +19730,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 440, - "y": 540, + "x": 460, + "y": 560, "wires": [ [] ] @@ -19263,6 +19740,7 @@ "id": "c002b47a53a0e203", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Network RX", "topic": "glances/basement-server/network/enp4s0/rx", "qos": "1", @@ -19272,8 +19750,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 110, - "y": 600, + "x": 130, + "y": 620, "wires": [ [ "a46a88d4fb03cceb" @@ -19284,6 +19762,7 @@ "id": "0008fb5b70ae6aea", "type": "mqtt in", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Network TX", "topic": "glances/basement-server/network/enp4s0/tx", "qos": "1", @@ -19293,8 +19772,8 @@ "rap": true, "rh": 0, "inputs": 0, - "x": 110, - "y": 660, + "x": 130, + "y": 680, "wires": [ [ "67119024666b68bd" @@ -19305,6 +19784,7 @@ "id": "a46a88d4fb03cceb", "type": "function", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Conversions", "func": "msg.payload = msg.payload / 1000000\nreturn msg;", "outputs": 1, @@ -19312,8 +19792,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 290, - "y": 600, + "x": 310, + "y": 620, "wires": [ [ "8d26310ed06bb045" @@ -19324,6 +19804,7 @@ "id": "8d26310ed06bb045", "type": "function", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Rounding", "func": "var readout = msg.payload\n\nmsg.payload = +readout.toFixed(2)\n\nreturn msg;", "outputs": 1, @@ -19331,8 +19812,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 460, - "y": 600, + "x": 480, + "y": 620, "wires": [ [ "80d831ad0265a01f" @@ -19343,6 +19824,7 @@ "id": "67119024666b68bd", "type": "function", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Conversions", "func": "msg.payload = msg.payload / 1000000\nreturn msg;", "outputs": 1, @@ -19350,8 +19832,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 290, - "y": 660, + "x": 310, + "y": 680, "wires": [ [ "e235145192886939" @@ -19362,6 +19844,7 @@ "id": "e235145192886939", "type": "function", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Rounding", "func": "var readout = msg.payload\n\nmsg.payload = +readout.toFixed(2)\n\nreturn msg;", "outputs": 1, @@ -19369,8 +19852,8 @@ "initialize": "", "finalize": "", "libs": [], - "x": 460, - "y": 660, + "x": 480, + "y": 680, "wires": [ [ "069a7ab44b04c9ef" @@ -19381,6 +19864,7 @@ "id": "80d831ad0265a01f", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Network RX", "server": "9e87348d.9c1c48", "version": 2, @@ -19423,8 +19907,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 630, - "y": 600, + "x": 650, + "y": 620, "wires": [ [] ] @@ -19433,6 +19917,7 @@ "id": "069a7ab44b04c9ef", "type": "ha-entity", "z": "ffa6a885ac41a5ed", + "g": "fbbe69a14cbe0236", "name": "Network TX", "server": "9e87348d.9c1c48", "version": 2, @@ -19475,8 +19960,8 @@ "outputOnStateChange": false, "outputPayload": "", "outputPayloadType": "str", - "x": 630, - "y": 660, + "x": 650, + "y": 680, "wires": [ [] ] @@ -19485,6 +19970,7 @@ "id": "baae5d6f53900594", "type": "ha-button", "z": "ffa6a885ac41a5ed", + "g": "46275dd0f9461013", "name": "Cleanup", "version": 0, "debugenabled": false, @@ -19510,8 +19996,8 @@ "valueType": "entity" } ], - "x": 100, - "y": 780, + "x": 120, + "y": 840, "wires": [ [ "619d1474239faf58" @@ -19522,13 +20008,14 @@ "id": "619d1474239faf58", "type": "link out", "z": "ffa6a885ac41a5ed", + "g": "46275dd0f9461013", "name": "Cleanup", "mode": "link", "links": [ "6a1cecedd6ef4b44" ], - "x": 215, - "y": 780, + "x": 235, + "y": 840, "wires": [] }, {