From 10be0213dc3d4c95a637c79423651657876694c0 Mon Sep 17 00:00:00 2001 From: Tony Stork Date: Sun, 23 Mar 2025 04:30:10 -0400 Subject: [PATCH] Improve templating in master bedroom climate flows --- climate/master-bedroom/meltdown-center.js | 2 +- climate/master-bedroom/notifications.js | 2 +- climate/master-bedroom/processing.js | 40 +++++++++++------------ climate/master-bedroom/reset.js | 2 +- climate/master-bedroom/set-mode.js | 2 +- climate/master-bedroom/shower-on.js | 4 +-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/climate/master-bedroom/meltdown-center.js b/climate/master-bedroom/meltdown-center.js index 0260112..720225f 100644 --- a/climate/master-bedroom/meltdown-center.js +++ b/climate/master-bedroom/meltdown-center.js @@ -12,7 +12,7 @@ let setFan = 'turn_off' let sendFan = { "payload": { - "action": "fan." + setFan, + "action": `fan.${setFan}`, "target": { "entity_id": ["fan.master_bedroom_fan"] }, diff --git a/climate/master-bedroom/notifications.js b/climate/master-bedroom/notifications.js index a989eb0..7c9adeb 100644 --- a/climate/master-bedroom/notifications.js +++ b/climate/master-bedroom/notifications.js @@ -4,7 +4,7 @@ const acMode = msg.acmode const fanMode = msg.fanmode let coolMsg = { - "payload": 'Master bedroom AC temp has been set to ' + nightTemp + '°F as scheduled', + "payload": `Master bedroom AC temp has been set to ${nightTemp} °F as scheduled`, "topic": 'AC Mode: Cooling' } let fanOnlyMsg = { diff --git a/climate/master-bedroom/processing.js b/climate/master-bedroom/processing.js index 6ba5311..61da330 100644 --- a/climate/master-bedroom/processing.js +++ b/climate/master-bedroom/processing.js @@ -192,7 +192,7 @@ node.log("Master Bedroom Climate: Decision Logic Complete") let sendFan = { "payload": { - "action": "fan." + setFan, + "action": `fan.${setFan}`, "target": { "entity_id": ["fan.master_bedroom_fan"] }, @@ -202,7 +202,7 @@ let sendFan = { let sendCool = { "payload": { - "action": "input_boolean." + setCool, + "action": `input_boolean.${setCool}`, "target": { "entity_id": ["input_boolean.master_bedroom_cooling_on"] }, @@ -212,7 +212,7 @@ let sendCool = { let sendSleep = { "payload": { - "action": "input_boolean." + setSleep, + "action": `input_boolean.${setSleep}`, "target": { "entity_id": ["input_boolean.master_bedroom_sleeping"] }, @@ -222,7 +222,7 @@ let sendSleep = { let sendPeople = { "payload": { - "action": "input_boolean." + setPeople, + "action": `input_boolean.${setPeople}`, "target": { "entity_id": ["input_boolean.tony_awake","input_boolean.tina_awake"] }, @@ -232,7 +232,7 @@ let sendPeople = { let sendDisplay = { "payload": { - "action": "switch." + setDisplay, + "action": `switch.${setDisplay}`, "target": { "entity_id": ["switch.master_bedroom_aircon_display"] }, @@ -249,7 +249,7 @@ let notify = { let sendBriefing = { "payload": { - "action": "script." + setBriefing, + "action": `script.${setBriefing}`, }, "delay": setBriefingDelay } @@ -304,7 +304,7 @@ let sendAcFan = { let sendEchoDotDND = { "payload": { - "action": "switch." + echoDotService, + "action": `switch.${echoDotService}`, "target": { "entity_id": ["switch.basement_echo_dot_do_not_disturb_switch"] }, @@ -317,19 +317,19 @@ node.log("Master Bedroom Climate: Message Payloads Defined") // Log the parameters that were chosen, for debugging purposes node.log("----- Master Bedroom Climate: Set Parameters -----") -node.log("setTemp: " + setTemp) -node.log("setEco: " + setEco) -node.log("setHvac: " + setHvac) -node.log("setFan: " + setFan) -node.log("setCool: " + setCool) -node.log("setSleep: " + setSleep) -node.log("setPeople: " + setPeople) -node.log("setDisplay: " + setDisplay) -node.log("setBriefing: " + setBriefing) -node.log("setBriefingDelay: " + setBriefingDelay) -node.log("time: " + time) -node.log("type: " + type) -node.log("topic: " + topic) +node.log(`setTemp: ${setTemp}`) +node.log(`setEco: ${setEco}`) +node.log(`setHvac: ${setHvac}`) +node.log(`setFan: ${setFan}`) +node.log(`setCool: ${setCool}`) +node.log(`setSleep: ${setSleep}`) +node.log(`setPeople: ${setPeople}`) +node.log(`setDisplay: ${setDisplay}`) +node.log(`setBriefing: ${setBriefing}`) +node.log(`setBriefingDelay: ${setBriefingDelay}`) +node.log(`time: ${time}`) +node.log(`type: ${type}`) +node.log(`topic: ${topic}`) node.log("----- Master Bedroom Climate: End Parameters -----") // If this was an automated trigger, set the cooling context for the bedroom accordingly. diff --git a/climate/master-bedroom/reset.js b/climate/master-bedroom/reset.js index 39b0018..86048f9 100644 --- a/climate/master-bedroom/reset.js +++ b/climate/master-bedroom/reset.js @@ -27,4 +27,4 @@ let reset = { } node.send(reset) -node.status({ fill: "green", shape: "dot", text: "Mode reset to " + setTopic}) \ No newline at end of file +node.status({ fill: "green", shape: "dot", text: `Mode reset to ${setTopic}`}) \ No newline at end of file diff --git a/climate/master-bedroom/set-mode.js b/climate/master-bedroom/set-mode.js index 54bda42..6087142 100644 --- a/climate/master-bedroom/set-mode.js +++ b/climate/master-bedroom/set-mode.js @@ -17,4 +17,4 @@ if (sleeping === 'on' || nightMode === 'on' || goodnight === 'on') { } flow.set("lastMode", lastMode, "diskCon") -node.status({ fill: "green", shape: "dot", text: "Last Mode Set: " + lastMode}) \ No newline at end of file +node.status({ fill: "green", shape: "dot", text: `Last Mode Set: ${lastMode}`}) \ No newline at end of file diff --git a/climate/master-bedroom/shower-on.js b/climate/master-bedroom/shower-on.js index e2b7dbe..4e40f2d 100644 --- a/climate/master-bedroom/shower-on.js +++ b/climate/master-bedroom/shower-on.js @@ -10,11 +10,11 @@ if (ac === 'on') { if (temp >= threshold) { if (sleeping === 'on') { msg.set = bedTemp - node.status({fill:"green",shape:"dot",text:"Shower Mode On: " + bedTemp}) + node.status({fill:"green",shape:"dot",text:`Shower Mode On: ${bedTemp}`}) return msg } else { msg.set = nightTemp - node.status({fill:"green",shape:"dot",text:"Shower Mode On: " + nightTemp}) + node.status({fill:"green",shape:"dot",text:`Shower Mode On: ${nightTemp}`}) return msg } } else {