JcDenis/iotredloop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rework teleinfo, UI rooms, create "home" room

Browse source
This commit is contained in:
JcDenis 2024-05-08 15:58:47 +02:00
parent 51f9aa681d
commit e32193b412
24 changed files with 2942 additions and 5595 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
config-nodes.json
View file

@ -366,7 +366,7 @@
"page": "103382107d295424",
"width": "6",
"height": "1",
"order": 3,
"order": 4,
"showTitle": true,
"className": "",
"visible": "true",
@ -379,7 +379,7 @@
"page": "103382107d295424",
"width": "6",
"height": "5",
"order": 4,
"order": 5,
"showTitle": true,
"className": "",
"visible": "true",
@ -392,7 +392,7 @@
"page": "103382107d295424",
"width": "6",
"height": "1",
"order": 5,
"order": 6,
"showTitle": true,
"className": "",
"visible": "true",
@ -412,19 +412,6 @@
"visible": "true",
"disabled": "false"
},
{
"id": "611358544679e8cf",
"type": "ui-group",
"name": "Linky",
"page": "90601eed5215748f",
"width": "6",
"height": "1",
"order": 2,
"showTitle": true,
"className": "",
"visible": "true",
"disabled": "false"
},
{
"id": "e408b55d1dc6870d",
"type": "influxdb",
@ -539,7 +526,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 8,
"order": 10,
"showTitle": true,
"className": "",
"visible": false,
@ -552,7 +539,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 4,
"order": 6,
"showTitle": true,
"className": "",
"visible": true,
@ -565,7 +552,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 5,
"order": 7,
"showTitle": true,
"className": "",
"visible": "true",
@ -578,7 +565,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 10,
"order": 12,
"showTitle": true,
"className": "",
"visible": "true",
@ -591,7 +578,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 11,
"order": 13,
"showTitle": true,
"className": "",
"visible": "true",
@ -604,7 +591,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 6,
"order": 8,
"showTitle": true,
"className": "",
"visible": "true",
@ -617,7 +604,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 7,
"order": 9,
"showTitle": true,
"className": "",
"visible": "true",
@ -630,7 +617,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 9,
"order": 11,
"showTitle": true,
"className": "",
"visible": "true",
@ -643,7 +630,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 16,
"order": 18,
"showTitle": true,
"className": "",
"visible": "true",
@ -656,7 +643,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 15,
"order": 17,
"showTitle": true,
"className": "",
"visible": "true",
@ -669,7 +656,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 13,
"order": 15,
"showTitle": true,
"className": "",
"visible": "true",
@ -682,7 +669,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 17,
"order": 19,
"showTitle": true,
"className": "",
"visible": "true",
@ -695,7 +682,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 14,
"order": 16,
"showTitle": true,
"className": "",
"visible": "true",
@ -708,7 +695,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 12,
"order": 14,
"showTitle": true,
"className": "",
"visible": "true",
@ -721,7 +708,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 20,
"order": 22,
"showTitle": true,
"className": "",
"visible": "true",
@ -734,7 +721,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 18,
"order": 20,
"showTitle": true,
"className": "",
"visible": "true",
@ -747,7 +734,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 19,
"order": 21,
"showTitle": true,
"className": "",
"visible": "true",
@ -967,7 +954,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 2,
"order": 4,
"showTitle": true,
"className": "",
"visible": "true",
@ -980,7 +967,7 @@
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 3,
"order": 5,
"showTitle": true,
"className": "",
"visible": "true",
@ -1051,5 +1038,45 @@
"className": "",
"visible": "true",
"disabled": "false"
},
{
"id": "3fe7bc27344a324e",
"type": "ui-group",
"d": true,
"name": "Electricité",
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 2,
"showTitle": true,
"className": "",
"visible": "true",
"disabled": "false"
},
{
"id": "c19749d8e5cc1e1f",
"type": "ui-group",
"name": "Puissance électrique",
"page": "fcf92ce9c73cd90d",
"width": "6",
"height": "1",
"order": 3,
"showTitle": true,
"className": "",
"visible": "true",
"disabled": "false"
},
{
"id": "b3fa33201c5f1de7",
"type": "ui-group",
"name": "Délestage",
"page": "103382107d295424",
"width": "6",
"height": "1",
"order": 3,
"showTitle": true,
"className": "",
"visible": "true",
"disabled": "false"
}
]

2
flow-manager-nodes-order.json
View file

File diff suppressed because one or more lines are too long

53
flows/K.Kernel.json
View file

@ -1474,7 +1474,8 @@
"13a43ea0c63dc053",
"5d76905ae805599d",
"81d1299edeeec856",
"a5360e4799f9e170"
"a5360e4799f9e170",
"2154dfc072f5104e"
],
"x": 1755,
"y": 4060,
@ -1779,7 +1780,8 @@
"9c89f8ad918445b3",
"2095d2a63909780c",
"ddda7783f50a0db4",
"b3091e70cd5211b4"
"b3091e70cd5211b4",
"a735610c7cb844e6"
],
"x": 1575,
"y": 4120,
@ -1921,7 +1923,8 @@
"links": [
"a3594a90f69fe537",
"ebdbee7baef678a6",
"ed6bcbd32e72afe1"
"ed6bcbd32e72afe1",
"b491f7eb02575108"
],
"x": 155,
"y": 4120,
@ -2142,7 +2145,8 @@
"73d4e0dc30041c36",
"2ed136ebd92695c1",
"22ef5d09e03d19e0",
"e20cf17770949369"
"e20cf17770949369",
"136467c932bcd5c7"
],
"x": 875,
"y": 3880,
@ -2189,7 +2193,8 @@
"ed3c5c95136138e9",
"f2af422ed8da0c9f",
"fdbf3fd639e2816d",
"96341058baa9083b"
"96341058baa9083b",
"4b7ee33aecb98a13"
],
"x": 455,
"y": 3820,
@ -2603,7 +2608,9 @@
"62c79bf2c5d8ec18",
"c47db9d9abdfe3ba",
"7069be6e6ebff25e",
"a2bfb1feb168f963"
"a2bfb1feb168f963",
"d0935907549d7d1d",
"20f084f32aa8f63a"
],
"x": 365,
"y": 2580,
@ -4149,7 +4156,11 @@
"617d4124d86bfdac",
"ca7fc23ad69449e2",
"7776980b147e962e",
"bbdfc8668282860e"
"bbdfc8668282860e",
"78cb242c2c455e90",
"2dc931335063149f",
"bdd43096dd5eab70",
"09baf70e95e7762d"
],
"x": 5195,
"y": 1260,
@ -4223,7 +4234,12 @@
"75e409ff7d8f6f73",
"ad12f9079d717f76",
"c13658af805aed99",
"645a5c37a7442a3a"
"645a5c37a7442a3a",
"d31b51e2d671597c",
"b0c372c9dde0c728",
"d8b71de8a6215fed",
"8784a0f9a054e833",
"8862ebb60d770b07"
],
"x": 135,
"y": 1260,
@ -5135,7 +5151,8 @@
"c9f8f3d06381d3b2",
"e66b05819afe5f9b",
"284f816c5e8bbfec",
"fe346a68ed6e7772"
"fe346a68ed6e7772",
"ad55dad3f3184232"
],
"x": 1315,
"y": 780,
@ -5193,7 +5210,10 @@
"021ed4766414be0d",
"035654b1d4cd63d6",
"0de5b7fcdb0aa040",
"6afea9dc42323877"
"6afea9dc42323877",
"05e8fa641a3e8478",
"8f8a3cf8eff18bc0",
"ec9a2ee558dee047"
],
"x": 135,
"y": 780,
@ -5598,7 +5618,8 @@
"633ef89ae7ff3aac",
"c622c7d8b085a6d6",
"13a75f13ba9ce529",
"65c543a69d403cd7"
"65c543a69d403cd7",
"244bd83e904aba26"
],
"x": 2295,
"y": 600,
@ -5986,7 +6007,7 @@
"op2": "",
"op1type": "pay",
"op2type": "payl",
"duration": "50",
"duration": "100",
"extend": false,
"overrideDelay": false,
"units": "ms",
@ -6084,7 +6105,8 @@
"cdd076b6b818d38f",
"39e9e59dd42094bb",
"b4066829ee5f163b",
"ff3a40b127910051"
"ff3a40b127910051",
"3d1e4fa0f23499e7"
],
"x": 455,
"y": 3520,
@ -6125,7 +6147,8 @@
"7dd6e99d1c259084",
"b8e2db56d1fe5f75",
"4ad7402573722786",
"fbe235d0cb60d161"
"fbe235d0cb60d161",
"a8b3e0ae1a87461c"
],
"x": 635,
"y": 3520,
@ -6169,7 +6192,7 @@
"z": "ab51b1e8cad7b700",
"g": "abae3c836f2269b3",
"name": "auto - model - uncomplete",
"active": false,
"active": true,
"tosidebar": true,
"console": false,
"tostatus": false,

3
flows/K.Scene.json
View file

@ -610,7 +610,8 @@
"5fef774a053c6a26",
"06c1934cb35fe252",
"9379409dd3374a57",
"7110eb15cfddfcf3"
"7110eb15cfddfcf3",
"371da4ba2aa94afb"
],
"x": 135,
"y": 420,

65
flows/P.API.json
View file

@ -72,6 +72,29 @@
"w": 422,
"h": 82
},
{
"id": "96eb2a79eb4c26b2",
"type": "group",
"z": "f125f568d4e332ee",
"name": "api - ecu-c - device",
"style": {
"fill": "#777777",
"fill-opacity": "0.05",
"label": true
},
"nodes": [
"2a395b7046ce9a55",
"e3693344db474a0a",
"709f263740a61967",
"c2f0571e97f072d9",
"a839571a87dd2aa6",
"97176af7973174dd"
],
"x": 68,
"y": 1253,
"w": 5184,
"h": 374
},
{
"id": "636790a6de6bdeca",
"type": "group",
@ -274,29 +297,6 @@
"w": 782,
"h": 262
},
{
"id": "96eb2a79eb4c26b2",
"type": "group",
"z": "f125f568d4e332ee",
"name": "api - ecu-c - device",
"style": {
"fill": "#777777",
"fill-opacity": "0.05",
"label": true
},
"nodes": [
"2a395b7046ce9a55",
"e3693344db474a0a",
"709f263740a61967",
"c2f0571e97f072d9",
"a839571a87dd2aa6",
"97176af7973174dd"
],
"x": 68,
"y": 1253,
"w": 5184,
"h": 374
},
{
"id": "2a395b7046ce9a55",
"type": "group",
@ -3557,6 +3557,9 @@
"p": "limit",
"v": "$millis()-300000",
"vt": "jsonata"
},
{
"p": "payload"
}
],
"repeat": "300",
@ -3564,6 +3567,8 @@
"once": true,
"onceDelay": "30",
"topic": "",
"payload": "",
"payloadType": "str",
"x": 1680,
"y": 1320,
"wires": [
@ -4244,19 +4249,19 @@
"g": "c2f0571e97f072d9",
"name": "from global",
"rules": [
{
"t": "set",
"p": "payload",
"pt": "msg",
"to": "metrics",
"tot": "global"
},
{
"t": "set",
"p": "old_payload",
"pt": "msg",
"to": "payload",
"tot": "msg"
},
{
"t": "set",
"p": "payload",
"pt": "msg",
"to": "metrics",
"tot": "global"
}
],
"action": "",

5264
flows/P.Linky.json
View file

File diff suppressed because it is too large Load diff

4
flows/P.Rfxcom.json
View file

@ -3053,7 +3053,7 @@
"p": "measurement",
"pt": "msg",
"to": "motion",
"tot": "jsonata"
"tot": "str"
},
{
"t": "set",
@ -3185,7 +3185,7 @@
"p": "measurement",
"pt": "msg",
"to": "command",
"tot": "msg"
"tot": "str"
},
{
"t": "set",

2
flows/R.Ambre.json
View file

@ -615,7 +615,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Ambre",
"order": 2,
"order": 3,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Bain.json
View file

@ -489,7 +489,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Bain",
"order": 3,
"order": 4,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Cave.json
View file

@ -514,7 +514,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Cave",
"order": 5,
"order": 6,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Combles.json
View file

@ -318,7 +318,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Combles",
"order": 6,
"order": 7,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Couloir.json
View file

@ -514,7 +514,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Couloir",
"order": 7,
"order": 8,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Cuisine.json
View file

@ -587,7 +587,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Cuisine",
"order": 8,
"order": 9,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Diner.json
View file

@ -467,7 +467,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Diner",
"order": 9,
"order": 10,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Jardin.json
View file

@ -447,7 +447,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Jardin",
"order": 13,
"order": 14,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Oriane.json
View file

@ -617,7 +617,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Oriane",
"order": 16,
"order": 17,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Parents.json
View file

@ -660,7 +660,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Parents",
"order": 17,
"order": 18,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Parking.json
View file

@ -441,7 +441,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Parking",
"order": 18,
"order": 19,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Salon.json
View file

@ -805,7 +805,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Salon",
"order": 19,
"order": 20,
"width": "2",
"height": "1",
"tooltip": "",

2
flows/R.Toilettes.json
View file

@ -468,7 +468,7 @@
"group": "36396f5285df476c",
"name": "",
"label": "Toilettes",
"order": 20,
"order": 21,
"width": "2",
"height": "1",
"tooltip": "",

24
flows/U.Creator.json
View file

@ -145,7 +145,6 @@
"c19a4a024ab45653",
"868f82b1a5ca2a85",
"f5b6bba2551b5bec",
"26a056a88ea18afb",
"28026a2ce29f6d72"
],
"x": 94,
@ -2173,7 +2172,7 @@
"z": "1362a4b4f08f3d5b",
"g": "4aa11d03f1b394a5",
"name": "creator - boot entities",
"active": true,
"active": false,
"tosidebar": true,
"console": false,
"tostatus": false,
@ -4913,24 +4912,6 @@
]
]
},
{
"id": "26a056a88ea18afb",
"type": "debug",
"z": "1362a4b4f08f3d5b",
"g": "7a3b686f86cb9beb",
"name": "debug 1",
"active": true,
"tosidebar": true,
"console": false,
"tostatus": false,
"complete": "true",
"targetType": "full",
"statusVal": "",
"statusType": "auto",
"x": 460,
"y": 1680,
"wires": []
},
{
"id": "a327bc0ce37018cf",
"type": "link in",
@ -5062,8 +5043,7 @@
"y": 1620,
"wires": [
[
"b09d639af149c549",
"26a056a88ea18afb"
"b09d639af149c549"
]
]
},

129
flows/U.Home.json
View file

@ -45,7 +45,7 @@
"32eb12f106b8c786"
],
"x": 1054,
"y": 19,
"y": 139,
"w": 492,
"h": 82
},
@ -196,6 +196,28 @@
"w": 592,
"h": 82
},
{
"id": "2a1bd2a4837e01f7",
"type": "group",
"z": "e19f53e3dc7ab928",
"name": "home - ui select room",
"style": {
"fill": "#6f2fa0",
"fill-opacity": "0.05",
"label": true,
"stroke": "#6f2fa0"
},
"nodes": [
"601b5a75c014b306",
"29f190c009d9bd2b",
"6877b109cf50132e",
"fc901a06715c2d2a"
],
"x": 1054,
"y": 19,
"w": 562,
"h": 82
},
{
"id": "d210ac6cc3e866c0",
"type": "change",
@ -263,9 +285,8 @@
"name": "home - bucket",
"mode": "link",
"links": [
"2e7bb0e6e6079d56",
"ab6d3d1be0d9ea74",
"ec3cc0db88098e5c",
"15d5a5183a81d250",
"ce3cbb4ae72bbc14"
],
"x": 395,
@ -290,7 +311,7 @@
"className": "",
"name": "",
"x": 1430,
"y": 60,
"y": 180,
"wires": []
},
{
@ -312,7 +333,7 @@
"repair": false,
"outputs": 1,
"x": 1230,
"y": 60,
"y": 180,
"wires": [
[
"d1f40d903ba49ae7"
@ -334,7 +355,7 @@
"1d9d8c969ccdf2be"
],
"x": 1095,
"y": 60,
"y": 180,
"wires": [
[
"c32288ec6571a37f"
@ -805,5 +826,101 @@
"6c11220b26097fc3"
]
]
},
{
"id": "601b5a75c014b306",
"type": "link out",
"z": "e19f53e3dc7ab928",
"g": "2a1bd2a4837e01f7",
"name": "home - ui select room",
"mode": "link",
"links": [
"1be6ca3c2b8615a2"
],
"x": 1575,
"y": 60,
"wires": []
},
{
"id": "29f190c009d9bd2b",
"type": "link in",
"z": "e19f53e3dc7ab928",
"g": "2a1bd2a4837e01f7",
"name": "home - ui select room",
"links": [
"74172837e07ab80d"
],
"x": 1095,
"y": 60,
"wires": [
[
"6877b109cf50132e"
]
]
},
{
"id": "6877b109cf50132e",
"type": "change",
"z": "e19f53e3dc7ab928",
"g": "2a1bd2a4837e01f7",
"name": "enabled button",
"rules": [
{
"t": "set",
"p": "payload",
"pt": "msg",
"to": "bucket",
"tot": "flow"
},
{
"t": "set",
"p": "enabled",
"pt": "msg",
"to": "msg.payload != msg.room",
"tot": "jsonata"
}
],
"action": "",
"property": "",
"from": "",
"to": "",
"reg": false,
"x": 1260,
"y": 60,
"wires": [
[
"fc901a06715c2d2a"
]
]
},
{
"id": "fc901a06715c2d2a",
"type": "ui-button",
"z": "e19f53e3dc7ab928",
"g": "2a1bd2a4837e01f7",
"group": "36396f5285df476c",
"name": "",
"label": "Maison",
"order": 2,
"width": "2",
"height": "1",
"emulateClick": false,
"tooltip": "",
"color": "",
"bgcolor": "",
"className": "",
"icon": "",
"iconPosition": "left",
"payload": "bucket",
"payloadType": "flow",
"topic": "topic",
"topicType": "msg",
"x": 1460,
"y": 60,
"wires": [
[
"601b5a75c014b306"
]
]
}
]

1529
flows/U.Room.json
View file

File diff suppressed because it is too large Load diff

1341
flows/U.System.json
View file

File diff suppressed because it is too large Load diff