fix thermostat (aperture, temperature, photovoltaic)

This commit is contained in:
JcDenis 2024-08-19 17:19:46 +02:00
parent c1328c399e
commit 6ba33acf73
10 changed files with 3229 additions and 1765 deletions

File diff suppressed because one or more lines are too long

View file

@ -4650,7 +4650,8 @@
"a1bd5f85906d484b", "a1bd5f85906d484b",
"d7e7a4c4f46d667f", "d7e7a4c4f46d667f",
"2d03cfadf0f001a9", "2d03cfadf0f001a9",
"0834ba091c1e77d9" "0834ba091c1e77d9",
"b611507f6e070bd4"
], ],
"x": 135, "x": 135,
"y": 3060, "y": 3060,

View file

@ -472,7 +472,7 @@
], ],
"x": 94, "x": 94,
"y": 2199, "y": 2199,
"w": 902, "w": 962,
"h": 142 "h": 142
}, },
{ {
@ -2708,7 +2708,7 @@
"type": "change", "type": "change",
"z": "bcb4426f5301b9f2", "z": "bcb4426f5301b9f2",
"g": "045e623bc9372013", "g": "045e623bc9372013",
"name": "from global", "name": "from global metrics",
"rules": [ "rules": [
{ {
"t": "set", "t": "set",
@ -2723,7 +2723,7 @@
"from": "", "from": "",
"to": "", "to": "",
"reg": false, "reg": false,
"x": 490, "x": 510,
"y": 2300, "y": 2300,
"wires": [ "wires": [
[ [
@ -2752,7 +2752,7 @@
"checkall": "false", "checkall": "false",
"repair": false, "repair": false,
"outputs": 2, "outputs": 2,
"x": 670, "x": 730,
"y": 2300, "y": 2300,
"wires": [ "wires": [
[ [
@ -2783,7 +2783,7 @@
"from": "", "from": "",
"to": "", "to": "",
"reg": false, "reg": false,
"x": 830, "x": 890,
"y": 2300, "y": 2300,
"wires": [ "wires": [
[ [
@ -2799,7 +2799,7 @@
"name": "get routine", "name": "get routine",
"mode": "return", "mode": "return",
"links": [], "links": [],
"x": 955, "x": 1015,
"y": 2240, "y": 2240,
"wires": [] "wires": []
}, },
@ -2823,7 +2823,7 @@
"from": "", "from": "",
"to": "", "to": "",
"reg": false, "reg": false,
"x": 830, "x": 890,
"y": 2240, "y": 2240,
"wires": [ "wires": [
[ [
@ -2914,7 +2914,7 @@
"from": "", "from": "",
"to": "", "to": "",
"reg": false, "reg": false,
"x": 670, "x": 730,
"y": 2240, "y": 2240,
"wires": [ "wires": [
[] []
@ -5681,7 +5681,7 @@
"g": "45b2c91cc17508eb", "g": "45b2c91cc17508eb",
"name": "return msg.routine.response : 1 = active and valid, 0 = not active, -1 active and not valid", "name": "return msg.routine.response : 1 = active and valid, 0 = not active, -1 active and not valid",
"info": "", "info": "",
"x": 1420, "x": 1480,
"y": 2240, "y": 2240,
"wires": [] "wires": []
}, },
@ -5692,7 +5692,7 @@
"g": "45b2c91cc17508eb", "g": "45b2c91cc17508eb",
"name": "scene must call \"routine mode\" first", "name": "scene must call \"routine mode\" first",
"info": "", "info": "",
"x": 1260, "x": 1320,
"y": 2300, "y": 2300,
"wires": [] "wires": []
}, },
@ -6748,7 +6748,7 @@
"type": "change", "type": "change",
"z": "bcb4426f5301b9f2", "z": "bcb4426f5301b9f2",
"g": "045e623bc9372013", "g": "045e623bc9372013",
"name": "from global", "name": "from global scenes",
"rules": [ "rules": [
{ {
"t": "set", "t": "set",
@ -6819,7 +6819,7 @@
"from": "", "from": "",
"to": "", "to": "",
"reg": false, "reg": false,
"x": 490, "x": 510,
"y": 2240, "y": 2240,
"wires": [ "wires": [
[ [

View file

@ -194,7 +194,7 @@
], ],
"x": 94, "x": 94,
"y": 3679, "y": 3679,
"w": 2192, "w": 2202,
"h": 682 "h": 682
}, },
{ {
@ -1708,21 +1708,11 @@
"v": "lighting", "v": "lighting",
"vt": "str" "vt": "str"
}, },
{
"t": "eq",
"v": "toggle",
"vt": "str"
},
{ {
"t": "eq", "t": "eq",
"v": "shading", "v": "shading",
"vt": "str" "vt": "str"
}, },
{
"t": "eq",
"v": "clone",
"vt": "str"
},
{ {
"t": "eq", "t": "eq",
"v": "airflow", "v": "airflow",
@ -1733,6 +1723,16 @@
"v": "cumulus", "v": "cumulus",
"vt": "str" "vt": "str"
}, },
{
"t": "eq",
"v": "toggle",
"vt": "str"
},
{
"t": "eq",
"v": "clone",
"vt": "str"
},
{ {
"t": "eq", "t": "eq",
"v": "snapshot", "v": "snapshot",
@ -1768,21 +1768,21 @@
[ [
"a205fd735ab69076" "a205fd735ab69076"
], ],
[
"5aaa598948695182"
],
[ [
"df48aef72bf72d15" "df48aef72bf72d15"
], ],
[
"828954124f9d5f18"
],
[ [
"e61e9d413554539f" "e61e9d413554539f"
], ],
[ [
"1ea871e1ad0c448e" "1ea871e1ad0c448e"
], ],
[
"5aaa598948695182"
],
[
"828954124f9d5f18"
],
[ [
"3ada84cb46c4cf59" "3ada84cb46c4cf59"
], ],
@ -1810,7 +1810,7 @@
"links": [ "links": [
"abdf34b12a5dd88d" "abdf34b12a5dd88d"
], ],
"x": 2245, "x": 2255,
"y": 3720, "y": 3720,
"wires": [] "wires": []
}, },
@ -2320,8 +2320,8 @@
"links": [ "links": [
"4e5dc7fe86199d6d" "4e5dc7fe86199d6d"
], ],
"x": 2245, "x": 2255,
"y": 3780, "y": 3960,
"wires": [] "wires": []
}, },
{ {
@ -2419,8 +2419,8 @@
"links": [ "links": [
"d104d5773963a340" "d104d5773963a340"
], ],
"x": 2245, "x": 2255,
"y": 3840, "y": 3780,
"wires": [] "wires": []
}, },
{ {
@ -3178,8 +3178,8 @@
"links": [ "links": [
"394846d13b3f3ad5" "394846d13b3f3ad5"
], ],
"x": 2245, "x": 2255,
"y": 3900, "y": 4020,
"wires": [] "wires": []
}, },
{ {
@ -3270,7 +3270,7 @@
"links": [ "links": [
"0a11184001fe0640" "0a11184001fe0640"
], ],
"x": 2245, "x": 2255,
"y": 4200, "y": 4200,
"wires": [] "wires": []
}, },
@ -3411,7 +3411,7 @@
"links": [ "links": [
"309b17151899bda1" "309b17151899bda1"
], ],
"x": 2245, "x": 2255,
"y": 4260, "y": 4260,
"wires": [] "wires": []
}, },
@ -3837,8 +3837,8 @@
"links": [ "links": [
"222a2cb866b5d927" "222a2cb866b5d927"
], ],
"x": 2245, "x": 2255,
"y": 3960, "y": 3840,
"wires": [] "wires": []
}, },
{ {
@ -4727,8 +4727,8 @@
"links": [ "links": [
"66144194d3248dab" "66144194d3248dab"
], ],
"x": 2245, "x": 2255,
"y": 4020, "y": 3900,
"wires": [] "wires": []
}, },
{ {
@ -4892,7 +4892,7 @@
"links": [ "links": [
"d7a5fb49638d61c7" "d7a5fb49638d61c7"
], ],
"x": 2245, "x": 2255,
"y": 4080, "y": 4080,
"wires": [] "wires": []
}, },
@ -5170,7 +5170,7 @@
"links": [ "links": [
"779a7ca67f93706e" "779a7ca67f93706e"
], ],
"x": 2245, "x": 2255,
"y": 4320, "y": 4320,
"wires": [] "wires": []
}, },
@ -5322,7 +5322,7 @@
"links": [ "links": [
"077d26e64b31245a" "077d26e64b31245a"
], ],
"x": 2245, "x": 2255,
"y": 4140, "y": 4140,
"wires": [] "wires": []
}, },

File diff suppressed because it is too large Load diff

View file

@ -369,7 +369,7 @@
"t": "set", "t": "set",
"p": "tmp", "p": "tmp",
"pt": "msg", "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" "tot": "jsonata"
}, },
{ {
@ -739,7 +739,7 @@
"t": "set", "t": "set",
"p": "tmp", "p": "tmp",
"pt": "msg", "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" "tot": "jsonata"
}, },
{ {

View file

@ -313,11 +313,12 @@
"e314d68876ac9938", "e314d68876ac9938",
"192d06a39b1a1f66", "192d06a39b1a1f66",
"517ffa31c1e561c3", "517ffa31c1e561c3",
"8296521e661aabf6" "8296521e661aabf6",
"9e6b8f297621f50f"
], ],
"x": 1574, "x": 1574,
"y": 919, "y": 919,
"w": 782, "w": 1002,
"h": 262 "h": 262
}, },
{ {
@ -3183,7 +3184,7 @@
"y": 1080, "y": 1080,
"wires": [ "wires": [
[ [
"08048d875b38ceb8" "9e6b8f297621f50f"
] ]
] ]
}, },
@ -3198,24 +3199,24 @@
"rules": [ "rules": [
{ {
"t": "eq", "t": "eq",
"v": "salon/cible/pilot", "v": "msg.bucket&'/cible/pilot'",
"vt": "str" "vt": "jsonata"
}, },
{ {
"t": "eq", "t": "eq",
"v": "salon/air conditioner/actif", "v": "msg.bucket&'/air conditioner/actif'",
"vt": "str" "vt": "jsonata"
}, },
{ {
"t": "eq", "t": "eq",
"v": "salon/thermostat/temperature setpoint", "v": "msg.bucket&'/thermostat/temperature setpoint'",
"vt": "str" "vt": "jsonata"
} }
], ],
"checkall": "false", "checkall": "false",
"repair": false, "repair": false,
"outputs": 3, "outputs": 3,
"x": 1750, "x": 1970,
"y": 1080, "y": 1080,
"wires": [ "wires": [
[ [
@ -3240,7 +3241,7 @@
"links": [ "links": [
"206c1fb4a48067df" "206c1fb4a48067df"
], ],
"x": 2315, "x": 2535,
"y": 1080, "y": 1080,
"wires": [] "wires": []
}, },
@ -3271,6 +3272,13 @@
"pt": "msg", "pt": "msg",
"to": "metrics[msg.bucket]thermostat['temperature setpoint']", "to": "metrics[msg.bucket]thermostat['temperature setpoint']",
"tot": "global" "tot": "global"
},
{
"t": "set",
"p": "repeat",
"pt": "msg",
"to": "true",
"tot": "bool"
} }
], ],
"action": "", "action": "",
@ -3278,7 +3286,7 @@
"from": "", "from": "",
"to": "", "to": "",
"reg": false, "reg": false,
"x": 2010, "x": 2230,
"y": 1140, "y": 1140,
"wires": [ "wires": [
[ [
@ -3313,7 +3321,7 @@
"from": "", "from": "",
"to": "", "to": "",
"reg": false, "reg": false,
"x": 1960, "x": 2180,
"y": 1020, "y": 1020,
"wires": [ "wires": [
[ [
@ -3348,7 +3356,7 @@
"from": "", "from": "",
"to": "", "to": "",
"reg": false, "reg": false,
"x": 1950, "x": 2170,
"y": 1080, "y": 1080,
"wires": [ "wires": [
[ [
@ -3372,7 +3380,7 @@
"checkall": "false", "checkall": "false",
"repair": false, "repair": false,
"outputs": 1, "outputs": 1,
"x": 2170, "x": 2390,
"y": 960, "y": 960,
"wires": [ "wires": [
[ [
@ -3398,7 +3406,7 @@
"drop": false, "drop": false,
"allowrate": false, "allowrate": false,
"outputs": 1, "outputs": 1,
"x": 2180, "x": 2400,
"y": 1020, "y": 1020,
"wires": [ "wires": [
[ [
@ -3427,12 +3435,19 @@
"to": "mode", "to": "mode",
"tot": "str" "tot": "str"
}, },
{
"t": "set",
"p": "mode",
"pt": "msg",
"to": "metrics[msg.bucket]thermostat['operating mode']",
"tot": "global"
},
{ {
"t": "set", "t": "set",
"p": "payload", "p": "payload",
"pt": "msg", "pt": "msg",
"to": "4", "to": "msg.mode='cold'?'3':'4'",
"tot": "str" "tot": "jsonata"
} }
], ],
"action": "", "action": "",
@ -3440,7 +3455,7 @@
"from": "", "from": "",
"to": "", "to": "",
"reg": false, "reg": false,
"x": 1960, "x": 2180,
"y": 960, "y": 960,
"wires": [ "wires": [
[ [
@ -5815,6 +5830,8 @@
"height": "1", "height": "1",
"passthru": false, "passthru": false,
"multiple": false, "multiple": false,
"chips": false,
"clearable": false,
"options": [ "options": [
{ {
"label": "Auto", "label": "Auto",
@ -5826,6 +5843,7 @@
"topic": "mode", "topic": "mode",
"topicType": "str", "topicType": "str",
"className": "", "className": "",
"typeIsComboBox": true,
"x": 7270, "x": 7270,
"y": 960, "y": 960,
"wires": [ "wires": [
@ -7379,5 +7397,31 @@
"5b23a7e32b5b478a" "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"
]
]
} }
] ]

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -2087,12 +2087,19 @@
"height": "1", "height": "1",
"passthru": false, "passthru": false,
"multiple": false, "multiple": false,
"chips": false,
"clearable": false,
"options": [ "options": [
{ {
"label": "Automatique", "label": "Chauffage",
"value": "automatic", "value": "automatic",
"type": "str" "type": "str"
}, },
{
"label": "Climatisation",
"value": "cool",
"type": "str"
},
{ {
"label": "Manuel", "label": "Manuel",
"value": "manual", "value": "manual",
@ -2113,6 +2120,7 @@
"topic": "heating", "topic": "heating",
"topicType": "str", "topicType": "str",
"className": "", "className": "",
"typeIsComboBox": true,
"x": 1740, "x": 1740,
"y": 360, "y": 360,
"wires": [ "wires": [