fix thermostat (aperture, temperature, photovoltaic)
This commit is contained in:
parent
c1328c399e
commit
6ba33acf73
10 changed files with 3229 additions and 1765 deletions
File diff suppressed because one or more lines are too long
|
@ -4650,7 +4650,8 @@
|
|||
"a1bd5f85906d484b",
|
||||
"d7e7a4c4f46d667f",
|
||||
"2d03cfadf0f001a9",
|
||||
"0834ba091c1e77d9"
|
||||
"0834ba091c1e77d9",
|
||||
"b611507f6e070bd4"
|
||||
],
|
||||
"x": 135,
|
||||
"y": 3060,
|
||||
|
|
|
@ -472,7 +472,7 @@
|
|||
],
|
||||
"x": 94,
|
||||
"y": 2199,
|
||||
"w": 902,
|
||||
"w": 962,
|
||||
"h": 142
|
||||
},
|
||||
{
|
||||
|
@ -2708,7 +2708,7 @@
|
|||
"type": "change",
|
||||
"z": "bcb4426f5301b9f2",
|
||||
"g": "045e623bc9372013",
|
||||
"name": "from global",
|
||||
"name": "from global metrics",
|
||||
"rules": [
|
||||
{
|
||||
"t": "set",
|
||||
|
@ -2723,7 +2723,7 @@
|
|||
"from": "",
|
||||
"to": "",
|
||||
"reg": false,
|
||||
"x": 490,
|
||||
"x": 510,
|
||||
"y": 2300,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -2752,7 +2752,7 @@
|
|||
"checkall": "false",
|
||||
"repair": false,
|
||||
"outputs": 2,
|
||||
"x": 670,
|
||||
"x": 730,
|
||||
"y": 2300,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -2783,7 +2783,7 @@
|
|||
"from": "",
|
||||
"to": "",
|
||||
"reg": false,
|
||||
"x": 830,
|
||||
"x": 890,
|
||||
"y": 2300,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -2799,7 +2799,7 @@
|
|||
"name": "get routine",
|
||||
"mode": "return",
|
||||
"links": [],
|
||||
"x": 955,
|
||||
"x": 1015,
|
||||
"y": 2240,
|
||||
"wires": []
|
||||
},
|
||||
|
@ -2823,7 +2823,7 @@
|
|||
"from": "",
|
||||
"to": "",
|
||||
"reg": false,
|
||||
"x": 830,
|
||||
"x": 890,
|
||||
"y": 2240,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -2914,7 +2914,7 @@
|
|||
"from": "",
|
||||
"to": "",
|
||||
"reg": false,
|
||||
"x": 670,
|
||||
"x": 730,
|
||||
"y": 2240,
|
||||
"wires": [
|
||||
[]
|
||||
|
@ -5681,7 +5681,7 @@
|
|||
"g": "45b2c91cc17508eb",
|
||||
"name": "return msg.routine.response : 1 = active and valid, 0 = not active, -1 active and not valid",
|
||||
"info": "",
|
||||
"x": 1420,
|
||||
"x": 1480,
|
||||
"y": 2240,
|
||||
"wires": []
|
||||
},
|
||||
|
@ -5692,7 +5692,7 @@
|
|||
"g": "45b2c91cc17508eb",
|
||||
"name": "scene must call \"routine mode\" first",
|
||||
"info": "",
|
||||
"x": 1260,
|
||||
"x": 1320,
|
||||
"y": 2300,
|
||||
"wires": []
|
||||
},
|
||||
|
@ -6748,7 +6748,7 @@
|
|||
"type": "change",
|
||||
"z": "bcb4426f5301b9f2",
|
||||
"g": "045e623bc9372013",
|
||||
"name": "from global",
|
||||
"name": "from global scenes",
|
||||
"rules": [
|
||||
{
|
||||
"t": "set",
|
||||
|
@ -6819,7 +6819,7 @@
|
|||
"from": "",
|
||||
"to": "",
|
||||
"reg": false,
|
||||
"x": 490,
|
||||
"x": 510,
|
||||
"y": 2240,
|
||||
"wires": [
|
||||
[
|
||||
|
|
|
@ -194,7 +194,7 @@
|
|||
],
|
||||
"x": 94,
|
||||
"y": 3679,
|
||||
"w": 2192,
|
||||
"w": 2202,
|
||||
"h": 682
|
||||
},
|
||||
{
|
||||
|
@ -1708,21 +1708,11 @@
|
|||
"v": "lighting",
|
||||
"vt": "str"
|
||||
},
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "toggle",
|
||||
"vt": "str"
|
||||
},
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "shading",
|
||||
"vt": "str"
|
||||
},
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "clone",
|
||||
"vt": "str"
|
||||
},
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "airflow",
|
||||
|
@ -1733,6 +1723,16 @@
|
|||
"v": "cumulus",
|
||||
"vt": "str"
|
||||
},
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "toggle",
|
||||
"vt": "str"
|
||||
},
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "clone",
|
||||
"vt": "str"
|
||||
},
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "snapshot",
|
||||
|
@ -1768,21 +1768,21 @@
|
|||
[
|
||||
"a205fd735ab69076"
|
||||
],
|
||||
[
|
||||
"5aaa598948695182"
|
||||
],
|
||||
[
|
||||
"df48aef72bf72d15"
|
||||
],
|
||||
[
|
||||
"828954124f9d5f18"
|
||||
],
|
||||
[
|
||||
"e61e9d413554539f"
|
||||
],
|
||||
[
|
||||
"1ea871e1ad0c448e"
|
||||
],
|
||||
[
|
||||
"5aaa598948695182"
|
||||
],
|
||||
[
|
||||
"828954124f9d5f18"
|
||||
],
|
||||
[
|
||||
"3ada84cb46c4cf59"
|
||||
],
|
||||
|
@ -1810,7 +1810,7 @@
|
|||
"links": [
|
||||
"abdf34b12a5dd88d"
|
||||
],
|
||||
"x": 2245,
|
||||
"x": 2255,
|
||||
"y": 3720,
|
||||
"wires": []
|
||||
},
|
||||
|
@ -2320,8 +2320,8 @@
|
|||
"links": [
|
||||
"4e5dc7fe86199d6d"
|
||||
],
|
||||
"x": 2245,
|
||||
"y": 3780,
|
||||
"x": 2255,
|
||||
"y": 3960,
|
||||
"wires": []
|
||||
},
|
||||
{
|
||||
|
@ -2419,8 +2419,8 @@
|
|||
"links": [
|
||||
"d104d5773963a340"
|
||||
],
|
||||
"x": 2245,
|
||||
"y": 3840,
|
||||
"x": 2255,
|
||||
"y": 3780,
|
||||
"wires": []
|
||||
},
|
||||
{
|
||||
|
@ -3178,8 +3178,8 @@
|
|||
"links": [
|
||||
"394846d13b3f3ad5"
|
||||
],
|
||||
"x": 2245,
|
||||
"y": 3900,
|
||||
"x": 2255,
|
||||
"y": 4020,
|
||||
"wires": []
|
||||
},
|
||||
{
|
||||
|
@ -3270,7 +3270,7 @@
|
|||
"links": [
|
||||
"0a11184001fe0640"
|
||||
],
|
||||
"x": 2245,
|
||||
"x": 2255,
|
||||
"y": 4200,
|
||||
"wires": []
|
||||
},
|
||||
|
@ -3411,7 +3411,7 @@
|
|||
"links": [
|
||||
"309b17151899bda1"
|
||||
],
|
||||
"x": 2245,
|
||||
"x": 2255,
|
||||
"y": 4260,
|
||||
"wires": []
|
||||
},
|
||||
|
@ -3837,8 +3837,8 @@
|
|||
"links": [
|
||||
"222a2cb866b5d927"
|
||||
],
|
||||
"x": 2245,
|
||||
"y": 3960,
|
||||
"x": 2255,
|
||||
"y": 3840,
|
||||
"wires": []
|
||||
},
|
||||
{
|
||||
|
@ -4727,8 +4727,8 @@
|
|||
"links": [
|
||||
"66144194d3248dab"
|
||||
],
|
||||
"x": 2245,
|
||||
"y": 4020,
|
||||
"x": 2255,
|
||||
"y": 3900,
|
||||
"wires": []
|
||||
},
|
||||
{
|
||||
|
@ -4892,7 +4892,7 @@
|
|||
"links": [
|
||||
"d7a5fb49638d61c7"
|
||||
],
|
||||
"x": 2245,
|
||||
"x": 2255,
|
||||
"y": 4080,
|
||||
"wires": []
|
||||
},
|
||||
|
@ -5170,7 +5170,7 @@
|
|||
"links": [
|
||||
"779a7ca67f93706e"
|
||||
],
|
||||
"x": 2245,
|
||||
"x": 2255,
|
||||
"y": 4320,
|
||||
"wires": []
|
||||
},
|
||||
|
@ -5322,7 +5322,7 @@
|
|||
"links": [
|
||||
"077d26e64b31245a"
|
||||
],
|
||||
"x": 2245,
|
||||
"x": 2255,
|
||||
"y": 4140,
|
||||
"wires": []
|
||||
},
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -369,7 +369,7 @@
|
|||
"t": "set",
|
||||
"p": "tmp",
|
||||
"pt": "msg",
|
||||
"to": "{\t 'url':'url',\t 'detector':'detector',\t 'sensor':'sensor',\t 'probe':'probe',\t 'ceiling':'ceiling',\t 'lamp':'lamp',\t 'leds':'leds',\t 'left leds':'left leds',\t 'right leds':'right leds',\t 'spots':'spots',\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 'mirror':'mirror',\t 'fire':'fire',\t 'remote':'remote',\t 'left remote':'left remote',\t 'right remote':'right remote',\t 'button':'button',\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 'rack':'rack',\t 'actif':'actif',\t 'snapshot':'snapshot',\t 'assistant':'assistant',\t 'message':'message',\t 'alexa':'alexa',\t 'server':'server',\t 'proxmox ve':'proxmox ve',\t 'unifi console':'unifi console'\t}",
|
||||
"to": "{\t 'url':'url',\t 'detector':'detector',\t 'sensor':'sensor',\t 'probe':'probe',\t 'ceiling':'ceiling',\t 'lamp':'lamp',\t 'leds':'leds',\t 'left leds':'left leds',\t 'right leds':'right leds',\t 'spots':'spots',\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 'mirror':'mirror',\t 'fire':'fire',\t 'remote':'remote',\t 'left remote':'left remote',\t 'right remote':'right remote',\t 'button':'button',\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 'production power':'production power',\t 'solar panels':'solar panels',\t 'rack':'rack',\t 'actif':'actif',\t 'snapshot':'snapshot',\t 'assistant':'assistant',\t 'message':'message',\t 'alexa':'alexa',\t 'server':'server',\t 'proxmox ve':'proxmox ve',\t 'unifi console':'unifi console'\t}",
|
||||
"tot": "jsonata"
|
||||
},
|
||||
{
|
||||
|
@ -739,7 +739,7 @@
|
|||
"t": "set",
|
||||
"p": "tmp",
|
||||
"pt": "msg",
|
||||
"to": "{\t 'url':'url',\t 'detector':'détecteur',\t 'sensor':'capteur',\t 'probe':'sonde',\t 'ceiling':'plafonnier',\t 'lamp':'lampe',\t 'leds':'leds',\t 'left leds':'leds gauche',\t 'right leds':'leds droite',\t 'spots':'spots',\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 'mirror':'miroir',\t 'fire':'incendie',\t 'remote':'télécommande',\t 'left remote':'télécommande gauche',\t 'right remote':'télécommande droite',\t 'button':'button',\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 'rack':'rack',\t 'actif':'actif',\t 'snapshot':\"capture d'image\",\t 'assistant':'assistant',\t 'message':'message',\t 'alexa':'alexa',\t 'server':'serveur',\t 'proxmox ve':'proxmox ve',\t 'unifi console':'unifi console'\t}",
|
||||
"to": "{\t 'url':'url',\t 'detector':'détecteur',\t 'sensor':'capteur',\t 'probe':'sonde',\t 'ceiling':'plafonnier',\t 'lamp':'lampe',\t 'leds':'leds',\t 'left leds':'leds gauche',\t 'right leds':'leds droite',\t 'spots':'spots',\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 'mirror':'miroir',\t 'fire':'incendie',\t 'remote':'télécommande',\t 'left remote':'télécommande gauche',\t 'right remote':'télécommande droite',\t 'button':'button',\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 'production power':'puissance produite',\t 'solar panels':'panneaux solaires',\t 'rack':'rack',\t 'actif':'actif',\t 'snapshot':\"capture d'image\",\t 'assistant':'assistant',\t 'message':'message',\t 'alexa':'alexa',\t 'server':'serveur',\t 'proxmox ve':'proxmox ve',\t 'unifi console':'unifi console'\t}",
|
||||
"tot": "jsonata"
|
||||
},
|
||||
{
|
||||
|
|
|
@ -313,11 +313,12 @@
|
|||
"e314d68876ac9938",
|
||||
"192d06a39b1a1f66",
|
||||
"517ffa31c1e561c3",
|
||||
"8296521e661aabf6"
|
||||
"8296521e661aabf6",
|
||||
"9e6b8f297621f50f"
|
||||
],
|
||||
"x": 1574,
|
||||
"y": 919,
|
||||
"w": 782,
|
||||
"w": 1002,
|
||||
"h": 262
|
||||
},
|
||||
{
|
||||
|
@ -3183,7 +3184,7 @@
|
|||
"y": 1080,
|
||||
"wires": [
|
||||
[
|
||||
"08048d875b38ceb8"
|
||||
"9e6b8f297621f50f"
|
||||
]
|
||||
]
|
||||
},
|
||||
|
@ -3198,24 +3199,24 @@
|
|||
"rules": [
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "salon/cible/pilot",
|
||||
"vt": "str"
|
||||
"v": "msg.bucket&'/cible/pilot'",
|
||||
"vt": "jsonata"
|
||||
},
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "salon/air conditioner/actif",
|
||||
"vt": "str"
|
||||
"v": "msg.bucket&'/air conditioner/actif'",
|
||||
"vt": "jsonata"
|
||||
},
|
||||
{
|
||||
"t": "eq",
|
||||
"v": "salon/thermostat/temperature setpoint",
|
||||
"vt": "str"
|
||||
"v": "msg.bucket&'/thermostat/temperature setpoint'",
|
||||
"vt": "jsonata"
|
||||
}
|
||||
],
|
||||
"checkall": "false",
|
||||
"repair": false,
|
||||
"outputs": 3,
|
||||
"x": 1750,
|
||||
"x": 1970,
|
||||
"y": 1080,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -3240,7 +3241,7 @@
|
|||
"links": [
|
||||
"206c1fb4a48067df"
|
||||
],
|
||||
"x": 2315,
|
||||
"x": 2535,
|
||||
"y": 1080,
|
||||
"wires": []
|
||||
},
|
||||
|
@ -3271,6 +3272,13 @@
|
|||
"pt": "msg",
|
||||
"to": "metrics[msg.bucket]thermostat['temperature setpoint']",
|
||||
"tot": "global"
|
||||
},
|
||||
{
|
||||
"t": "set",
|
||||
"p": "repeat",
|
||||
"pt": "msg",
|
||||
"to": "true",
|
||||
"tot": "bool"
|
||||
}
|
||||
],
|
||||
"action": "",
|
||||
|
@ -3278,7 +3286,7 @@
|
|||
"from": "",
|
||||
"to": "",
|
||||
"reg": false,
|
||||
"x": 2010,
|
||||
"x": 2230,
|
||||
"y": 1140,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -3313,7 +3321,7 @@
|
|||
"from": "",
|
||||
"to": "",
|
||||
"reg": false,
|
||||
"x": 1960,
|
||||
"x": 2180,
|
||||
"y": 1020,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -3348,7 +3356,7 @@
|
|||
"from": "",
|
||||
"to": "",
|
||||
"reg": false,
|
||||
"x": 1950,
|
||||
"x": 2170,
|
||||
"y": 1080,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -3372,7 +3380,7 @@
|
|||
"checkall": "false",
|
||||
"repair": false,
|
||||
"outputs": 1,
|
||||
"x": 2170,
|
||||
"x": 2390,
|
||||
"y": 960,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -3398,7 +3406,7 @@
|
|||
"drop": false,
|
||||
"allowrate": false,
|
||||
"outputs": 1,
|
||||
"x": 2180,
|
||||
"x": 2400,
|
||||
"y": 1020,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -3427,12 +3435,19 @@
|
|||
"to": "mode",
|
||||
"tot": "str"
|
||||
},
|
||||
{
|
||||
"t": "set",
|
||||
"p": "mode",
|
||||
"pt": "msg",
|
||||
"to": "metrics[msg.bucket]thermostat['operating mode']",
|
||||
"tot": "global"
|
||||
},
|
||||
{
|
||||
"t": "set",
|
||||
"p": "payload",
|
||||
"pt": "msg",
|
||||
"to": "4",
|
||||
"tot": "str"
|
||||
"to": "msg.mode='cold'?'3':'4'",
|
||||
"tot": "jsonata"
|
||||
}
|
||||
],
|
||||
"action": "",
|
||||
|
@ -3440,7 +3455,7 @@
|
|||
"from": "",
|
||||
"to": "",
|
||||
"reg": false,
|
||||
"x": 1960,
|
||||
"x": 2180,
|
||||
"y": 960,
|
||||
"wires": [
|
||||
[
|
||||
|
@ -5815,6 +5830,8 @@
|
|||
"height": "1",
|
||||
"passthru": false,
|
||||
"multiple": false,
|
||||
"chips": false,
|
||||
"clearable": false,
|
||||
"options": [
|
||||
{
|
||||
"label": "Auto",
|
||||
|
@ -5826,6 +5843,7 @@
|
|||
"topic": "mode",
|
||||
"topicType": "str",
|
||||
"className": "",
|
||||
"typeIsComboBox": true,
|
||||
"x": 7270,
|
||||
"y": 960,
|
||||
"wires": [
|
||||
|
@ -7379,5 +7397,31 @@
|
|||
"5b23a7e32b5b478a"
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "9e6b8f297621f50f",
|
||||
"type": "switch",
|
||||
"z": "f125f568d4e332ee",
|
||||
"g": "00798774fd655f5e",
|
||||
"name": "bucket has ac",
|
||||
"property": "metrics[msg.bucket]",
|
||||
"propertyType": "global",
|
||||
"rules": [
|
||||
{
|
||||
"t": "hask",
|
||||
"v": "air conditioner",
|
||||
"vt": "str"
|
||||
}
|
||||
],
|
||||
"checkall": "false",
|
||||
"repair": false,
|
||||
"outputs": 1,
|
||||
"x": 1780,
|
||||
"y": 1080,
|
||||
"wires": [
|
||||
[
|
||||
"08048d875b38ceb8"
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
1004
flows/R.Rooms.json
1004
flows/R.Rooms.json
File diff suppressed because it is too large
Load diff
1060
flows/U.Scenes.json
1060
flows/U.Scenes.json
File diff suppressed because it is too large
Load diff
|
@ -2087,12 +2087,19 @@
|
|||
"height": "1",
|
||||
"passthru": false,
|
||||
"multiple": false,
|
||||
"chips": false,
|
||||
"clearable": false,
|
||||
"options": [
|
||||
{
|
||||
"label": "Automatique",
|
||||
"label": "Chauffage",
|
||||
"value": "automatic",
|
||||
"type": "str"
|
||||
},
|
||||
{
|
||||
"label": "Climatisation",
|
||||
"value": "cool",
|
||||
"type": "str"
|
||||
},
|
||||
{
|
||||
"label": "Manuel",
|
||||
"value": "manual",
|
||||
|
@ -2113,6 +2120,7 @@
|
|||
"topic": "heating",
|
||||
"topicType": "str",
|
||||
"className": "",
|
||||
"typeIsComboBox": true,
|
||||
"x": 1740,
|
||||
"y": 360,
|
||||
"wires": [
|
||||
|
|
Loading…
Reference in a new issue