cosmetic (follow latest fixes)
This commit is contained in:
parent
f8ad26844a
commit
5e6786d0dc
4 changed files with 106 additions and 48 deletions
File diff suppressed because one or more lines are too long
|
@ -26,7 +26,7 @@
|
|||
"x": 62,
|
||||
"y": 3367,
|
||||
"w": 3346,
|
||||
"h": 1206
|
||||
"h": 1266
|
||||
},
|
||||
{
|
||||
"id": "50456628f56ade66",
|
||||
|
@ -154,7 +154,7 @@
|
|||
"d9548e9b1a2e6f36"
|
||||
],
|
||||
"x": 88,
|
||||
"y": 4293,
|
||||
"y": 4353,
|
||||
"w": 1794,
|
||||
"h": 254
|
||||
},
|
||||
|
@ -177,7 +177,7 @@
|
|||
"x": 88,
|
||||
"y": 3993,
|
||||
"w": 3294,
|
||||
"h": 254
|
||||
"h": 314
|
||||
},
|
||||
{
|
||||
"id": "63149b5b57a97c5b",
|
||||
|
@ -660,7 +660,7 @@
|
|||
"69041daa92bc0a8b"
|
||||
],
|
||||
"x": 1094,
|
||||
"y": 4319,
|
||||
"y": 4379,
|
||||
"w": 762,
|
||||
"h": 202
|
||||
},
|
||||
|
@ -684,7 +684,7 @@
|
|||
"f61f5fe80ddf6ff1"
|
||||
],
|
||||
"x": 114,
|
||||
"y": 4319,
|
||||
"y": 4379,
|
||||
"w": 882,
|
||||
"h": 82
|
||||
},
|
||||
|
@ -737,12 +737,13 @@
|
|||
"aa275d99ba85bee2",
|
||||
"5891781e4a61525a",
|
||||
"4908c2284e498338",
|
||||
"411b13dfb3e989f0"
|
||||
"411b13dfb3e989f0",
|
||||
"cf2b3440a4b8c304"
|
||||
],
|
||||
"x": 114,
|
||||
"y": 4019,
|
||||
"w": 1502,
|
||||
"h": 202
|
||||
"h": 262
|
||||
},
|
||||
{
|
||||
"id": "4937527cddd45b61",
|
||||
|
@ -862,7 +863,7 @@
|
|||
"to": "",
|
||||
"reg": false,
|
||||
"x": 1500,
|
||||
"y": 4480,
|
||||
"y": 4540,
|
||||
"wires": [
|
||||
[
|
||||
"b2ccb6a2a248015d"
|
||||
|
@ -890,7 +891,7 @@
|
|||
"to": "",
|
||||
"reg": false,
|
||||
"x": 1500,
|
||||
"y": 4420,
|
||||
"y": 4480,
|
||||
"wires": [
|
||||
[
|
||||
"b2ccb6a2a248015d"
|
||||
|
@ -918,7 +919,7 @@
|
|||
"to": "",
|
||||
"reg": false,
|
||||
"x": 1500,
|
||||
"y": 4360,
|
||||
"y": 4420,
|
||||
"wires": [
|
||||
[
|
||||
"b2ccb6a2a248015d"
|
||||
|
@ -946,7 +947,7 @@
|
|||
"to": "",
|
||||
"reg": false,
|
||||
"x": 1680,
|
||||
"y": 4420,
|
||||
"y": 4480,
|
||||
"wires": [
|
||||
[
|
||||
"89d2eebcaafb5013"
|
||||
|
@ -982,7 +983,7 @@
|
|||
"repair": false,
|
||||
"outputs": 3,
|
||||
"x": 1300,
|
||||
"y": 4420,
|
||||
"y": 4480,
|
||||
"wires": [
|
||||
[
|
||||
"d318afa2a81e4ff9"
|
||||
|
@ -1008,7 +1009,7 @@
|
|||
"de0c34e8104574b0"
|
||||
],
|
||||
"x": 1815,
|
||||
"y": 4420,
|
||||
"y": 4480,
|
||||
"wires": []
|
||||
},
|
||||
{
|
||||
|
@ -1034,7 +1035,7 @@
|
|||
"5d02e59fc60d15bd"
|
||||
],
|
||||
"x": 1135,
|
||||
"y": 4420,
|
||||
"y": 4480,
|
||||
"wires": [
|
||||
[
|
||||
"9c89a41128573752"
|
||||
|
@ -1058,7 +1059,7 @@
|
|||
"repair": false,
|
||||
"outputs": 1,
|
||||
"x": 500,
|
||||
"y": 4360,
|
||||
"y": 4420,
|
||||
"wires": [
|
||||
[
|
||||
"a2d25db2ace537ae"
|
||||
|
@ -1089,7 +1090,7 @@
|
|||
"937769a5cdaa76db"
|
||||
],
|
||||
"x": 955,
|
||||
"y": 4360,
|
||||
"y": 4420,
|
||||
"wires": []
|
||||
},
|
||||
{
|
||||
|
@ -1109,7 +1110,7 @@
|
|||
"repair": false,
|
||||
"outputs": 1,
|
||||
"x": 830,
|
||||
"y": 4360,
|
||||
"y": 4420,
|
||||
"wires": [
|
||||
[
|
||||
"637b84024e725f38"
|
||||
|
@ -1133,7 +1134,7 @@
|
|||
"repair": false,
|
||||
"outputs": 1,
|
||||
"x": 670,
|
||||
"y": 4360,
|
||||
"y": 4420,
|
||||
"wires": [
|
||||
[
|
||||
"282bb73eb4892ab9"
|
||||
|
@ -1182,7 +1183,7 @@
|
|||
"to": "",
|
||||
"reg": false,
|
||||
"x": 310,
|
||||
"y": 4360,
|
||||
"y": 4420,
|
||||
"wires": [
|
||||
[
|
||||
"f61f5fe80ddf6ff1"
|
||||
|
@ -1199,7 +1200,7 @@
|
|||
"031a6afd8300356a"
|
||||
],
|
||||
"x": 155,
|
||||
"y": 4360,
|
||||
"y": 4420,
|
||||
"wires": [
|
||||
[
|
||||
"a4e3db9cc35fc9eb"
|
||||
|
@ -1856,11 +1857,16 @@
|
|||
"t": "eq",
|
||||
"v": "rfxcom2mqtt",
|
||||
"vt": "str"
|
||||
},
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "teleinfo",
|
||||
"vt": "str"
|
||||
}
|
||||
],
|
||||
"checkall": "false",
|
||||
"repair": false,
|
||||
"outputs": 3,
|
||||
"outputs": 4,
|
||||
"x": 500,
|
||||
"y": 4120,
|
||||
"wires": [
|
||||
|
@ -1872,6 +1878,9 @@
|
|||
],
|
||||
[
|
||||
"aa275d99ba85bee2"
|
||||
],
|
||||
[
|
||||
"cf2b3440a4b8c304"
|
||||
]
|
||||
]
|
||||
},
|
||||
|
@ -6414,5 +6423,54 @@
|
|||
"13f4c9a49f9902dc"
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "cf2b3440a4b8c304",
|
||||
"type": "change",
|
||||
"z": "ab51b1e8cad7b700",
|
||||
"g": "3be00f677c6457bd",
|
||||
"name": "extract protocol values",
|
||||
"rules": [
|
||||
{
|
||||
"t": "set",
|
||||
"p": "protocol",
|
||||
"pt": "msg",
|
||||
"to": "teleinfo",
|
||||
"tot": "str"
|
||||
},
|
||||
{
|
||||
"t": "set",
|
||||
"p": "id",
|
||||
"pt": "msg",
|
||||
"to": "input[1]",
|
||||
"tot": "msg"
|
||||
},
|
||||
{
|
||||
"t": "set",
|
||||
"p": "subid",
|
||||
"pt": "msg",
|
||||
"to": "0",
|
||||
"tot": "str"
|
||||
},
|
||||
{
|
||||
"t": "set",
|
||||
"p": "prefix",
|
||||
"pt": "msg",
|
||||
"to": "'teleinfo/'&msg.id",
|
||||
"tot": "jsonata"
|
||||
}
|
||||
],
|
||||
"action": "",
|
||||
"property": "",
|
||||
"from": "",
|
||||
"to": "",
|
||||
"reg": false,
|
||||
"x": 740,
|
||||
"y": 4240,
|
||||
"wires": [
|
||||
[
|
||||
"5891781e4a61525a"
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
|
@ -422,7 +422,7 @@
|
|||
"t": "set",
|
||||
"p": "tmp",
|
||||
"pt": "msg",
|
||||
"to": "{\t 'url':'url',\t 'detector':'detector',\t 'sensor':'sensor',\t 'sensor 2':'sensor 2',\t 'probe':'probe',\t 'ceiling':'ceiling',\t 'lamp':'lamp',\t 'socket':'socket',\t 'left socket':'left socket',\t 'right socket':'right socket',\t 'door':'door',\t 'window':'window',\t 'bay':'bay',\t 'left bay':'left bay',\t 'right bay':'right bay',\t 'balloon':'balloon',\t 'speaker':'speaker',\t 'desk':'desk',\t 'fire':'fire',\t 'remote':'remote',\t 'left remote':'left remote',\t 'right remote':'right remote',\t 'shutter':'shutter',\t 'pilot':'pilot',\t 'bedside':'bedside',\t 'left bedside':'left bedside',\t 'right bedside':'right bedside',\t 'heat pump':'heat pump',\t 'cmv':'cmv',\t 'torus':'torus',\t 'relay':'relay',\t 'power production':'power production'\t}",
|
||||
"to": "{\t 'url':'url',\t 'detector':'detector',\t 'sensor':'sensor',\t 'sensor 2':'sensor 2',\t 'probe':'probe',\t 'ceiling':'ceiling',\t 'lamp':'lamp',\t 'socket':'socket',\t 'left socket':'left socket',\t 'right socket':'right socket',\t 'door':'door',\t 'window':'window',\t 'bay':'bay',\t 'left bay':'left bay',\t 'right bay':'right bay',\t 'balloon':'balloon',\t 'speaker':'speaker',\t 'desk':'desk',\t 'fire':'fire',\t 'remote':'remote',\t 'left remote':'left remote',\t 'right remote':'right remote',\t 'shutter':'shutter',\t 'pilot':'pilot',\t 'bedside':'bedside',\t 'left bedside':'left bedside',\t 'right bedside':'right bedside',\t 'heat pump':'heat pump',\t 'cmv':'cmv',\t 'torus':'torus',\t 'relay':'relay',\t 'electric meter':'electric meter',\t 'solar panels':'solar panels'\t}",
|
||||
"tot": "jsonata"
|
||||
},
|
||||
{
|
||||
|
@ -489,7 +489,7 @@
|
|||
"t": "set",
|
||||
"p": "tmp",
|
||||
"pt": "msg",
|
||||
"to": "{\t 'temperature':'temperature',\t 'humidity':'humidity',\t 'luminosity':'luminosity',\t 'power':'power',\t 'current':'current',\t 'outlet':'outlet',\t 'light':'light',\t 'battery':'battery',\t 'motion':'motion',\t 'airflow':'airflow',\t 'command':'command',\t 'photovoltaic':'photovoltaic',\t 'camera':'camera',\t 'air contidioner':'air conditioner',\t 'thermostat':'thermostat'\t}",
|
||||
"to": "{\t 'temperature':'temperature',\t 'humidity':'humidity',\t 'luminosity':'luminosity',\t 'power':'power',\t 'current':'current',\t 'outlet':'outlet',\t 'light':'light',\t 'battery':'battery',\t 'motion':'motion',\t 'airflow':'airflow',\t 'command':'command',\t 'photovoltaic':'photovoltaic',\t 'camera':'camera',\t 'air contidioner':'air conditioner',\t 'thermostat':'thermostat',\t 'tariff':'tariff',\t 'peak hours counter':'peak hours counter',\t 'off-peak hours counter':'off-peak hours counter',\t 'total hours counter':'total hours counter'\t}",
|
||||
"tot": "jsonata"
|
||||
},
|
||||
{
|
||||
|
@ -949,7 +949,7 @@
|
|||
"t": "set",
|
||||
"p": "tmp",
|
||||
"pt": "msg",
|
||||
"to": "{\t 'url':'url',\t 'detector':'détecteur',\t 'sensor':'capteur',\t 'sensor 2':'capteur 2',\t 'probe':'sonde',\t 'ceiling':'plafonnier',\t 'lamp':'lampe',\t 'socket':'sortie',\t 'left socket':'sortie gauche',\t 'right socket':'sortie droite',\t 'door':'porte',\t 'window':'fenêtre',\t 'bay':'baie',\t 'left bay':'baie gauche',\t 'right bay':'baie droite',\t 'balloon':'ballon',\t 'speaker':'haut parleur',\t 'desk':'bureau',\t 'fire':'incendie',\t 'remote':'télécommande',\t 'left remote':'télécommande gauche',\t 'right remote':'télécommande droite',\t 'shutter':'volet',\t 'pilot':'pilote',\t 'bedside':'chevet',\t 'left bedside':'chevet gauche',\t 'right bedside':'chevet droite',\t 'heat pump':'pompe à chaleur',\t 'cmv':'vmc',\t 'torus':'tore',\t 'relay':'relais',\t 'power production':\"production d'énergie\"\t}",
|
||||
"to": "{\t 'url':'url',\t 'detector':'détecteur',\t 'sensor':'capteur',\t 'sensor 2':'capteur 2',\t 'probe':'sonde',\t 'ceiling':'plafonnier',\t 'lamp':'lampe',\t 'socket':'sortie',\t 'left socket':'sortie gauche',\t 'right socket':'sortie droite',\t 'door':'porte',\t 'window':'fenêtre',\t 'bay':'baie',\t 'left bay':'baie gauche',\t 'right bay':'baie droite',\t 'balloon':'ballon',\t 'speaker':'haut parleur',\t 'desk':'bureau',\t 'fire':'incendie',\t 'remote':'télécommande',\t 'left remote':'télécommande gauche',\t 'right remote':'télécommande droite',\t 'shutter':'volet',\t 'pilot':'pilote',\t 'bedside':'chevet',\t 'left bedside':'chevet gauche',\t 'right bedside':'chevet droite',\t 'heat pump':'pompe à chaleur',\t 'cmv':'vmc',\t 'torus':'tore',\t 'relay':'relais',\t 'power production':\"production d'énergie\",\t 'electric meter':'compteur électrique',\t 'solar panels':'panneaux solaires'\t}",
|
||||
"tot": "jsonata"
|
||||
},
|
||||
{
|
||||
|
@ -1016,7 +1016,7 @@
|
|||
"t": "set",
|
||||
"p": "tmp",
|
||||
"pt": "msg",
|
||||
"to": "{\t 'temperature':'température',\t 'humidity':'humidité',\t 'luminosity':'luminosité',\t 'power':'puissance',\t 'current':'courant',\t 'outlet':'prise',\t 'light':'lumière',\t 'battery':'batterie',\t 'motion':'mouvement',\t 'airflow':'ventilation',\t 'command':'commande',\t 'photovoltaic':'photovoltaîque',\t 'camera':'camera',\t 'air contidioner':'climatisation',\t 'thermostat':'thermostat'\t}",
|
||||
"to": "{\t 'temperature':'température',\t 'humidity':'humidité',\t 'luminosity':'luminosité',\t 'power':'puissance',\t 'current':'courant',\t 'outlet':'prise',\t 'light':'lumière',\t 'battery':'batterie',\t 'motion':'mouvement',\t 'airflow':'ventilation',\t 'command':'commande',\t 'photovoltaic':'photovoltaîque',\t 'camera':'camera',\t 'air contidioner':'climatisation',\t 'thermostat':'thermostat',\t 'tariff':'tarif',\t 'peak hours counter':'compteur heaures pleines',\t 'off-peak hours counter':'compteur heures creuses',\t 'total hours counter':'compteur heures total'\t}",
|
||||
"tot": "jsonata"
|
||||
},
|
||||
{
|
||||
|
|
|
@ -91,6 +91,27 @@
|
|||
"w": 422,
|
||||
"h": 82
|
||||
},
|
||||
{
|
||||
"id": "e221264ccaca42a1",
|
||||
"type": "group",
|
||||
"z": "e19f53e3dc7ab928",
|
||||
"name": "home - device - auto",
|
||||
"style": {
|
||||
"fill": "#ffC000",
|
||||
"fill-opacity": "0.05",
|
||||
"label": true
|
||||
},
|
||||
"nodes": [
|
||||
"ce3cbb4ae72bbc14",
|
||||
"5edfa91275f58882",
|
||||
"fad822d4d6bc47a2",
|
||||
"9beae381e402ac2c"
|
||||
],
|
||||
"x": 94,
|
||||
"y": 199,
|
||||
"w": 642,
|
||||
"h": 82
|
||||
},
|
||||
{
|
||||
"id": "04de52a5f5237233",
|
||||
"type": "group",
|
||||
|
@ -154,27 +175,6 @@
|
|||
"w": 552,
|
||||
"h": 82
|
||||
},
|
||||
{
|
||||
"id": "e221264ccaca42a1",
|
||||
"type": "group",
|
||||
"z": "e19f53e3dc7ab928",
|
||||
"name": "home - device - auto",
|
||||
"style": {
|
||||
"fill": "#ffC000",
|
||||
"fill-opacity": "0.05",
|
||||
"label": true
|
||||
},
|
||||
"nodes": [
|
||||
"ce3cbb4ae72bbc14",
|
||||
"5edfa91275f58882",
|
||||
"fad822d4d6bc47a2",
|
||||
"9beae381e402ac2c"
|
||||
],
|
||||
"x": 94,
|
||||
"y": 199,
|
||||
"w": 642,
|
||||
"h": 82
|
||||
},
|
||||
{
|
||||
"id": "2bdcefabbf93c852",
|
||||
"type": "group",
|
||||
|
@ -776,7 +776,7 @@
|
|||
"g": "2bdcefabbf93c852",
|
||||
"influxdb": "e408b55d1dc6870d",
|
||||
"name": "",
|
||||
"query": "from(bucket: \"home\")\n |> range(start: -1d, stop: now())\n |> aggregateWindow(every: 15m, fn: last, createEmpty: false)\n |> filter(fn: (r) =>\n r._measurement == \"photovoltaic\" and r._field == \"production power\"\n )",
|
||||
"query": "from(bucket: \"cave\")\n |> range(start: -1d, stop: now())\n |> aggregateWindow(every: 15m, fn: last, createEmpty: false)\n |> filter(fn: (r) =>\n r._measurement == \"power\" and r._field == \"solar panels\"\n )",
|
||||
"rawOutput": false,
|
||||
"precision": "",
|
||||
"retentionPolicy": "",
|
||||
|
|
Loading…
Reference in a new issue