From ac239ea27a43a2624af725a8179ab29bfaf05da5 Mon Sep 17 00:00:00 2001
From: Pietro Brenna <pietro.brenna@briq.it>
Date: Thu, 30 May 2024 17:45:19 +0200
Subject: [PATCH] =?UTF-8?q?a=20grande=20richiesta=20(non=20=C3=A8=20vero)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json |  2 +-
 package.json      |  2 +-
 red/s7/s7-briq.js | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6772826..6f7f1a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "red-briq-nodes",
-    "version": "0.2.5",
+    "version": "0.2.6",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
diff --git a/package.json b/package.json
index 33ad0e8..e001b19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "red-briq-nodes",
-    "version": "0.2.5",
+    "version": "0.2.6",
     "description": "Various forked and original nodes",
     "dependencies": {
         "denque": "^1.4.1",
diff --git a/red/s7/s7-briq.js b/red/s7/s7-briq.js
index f29cb34..7147457 100644
--- a/red/s7/s7-briq.js
+++ b/red/s7/s7-briq.js
@@ -203,7 +203,11 @@ module.exports = function (RED) {
                 return;
             }*/
             s7node_from_plc(msg.plc).then(s7conn => {
-                return s7_write(msg.plc, s7conn, msg.payload.variable, msg.payload.value);
+                let variable = msg.payload.variable;
+                if(msg.payload.varname) {
+                    variable = msg.plc.variables[msg.payload.varname];
+                }
+                return s7_write(msg.plc, s7conn, variable, msg.payload.value);
             }).then(() => {
                 msg.result = "ok";
                 node.send(msg);
@@ -230,7 +234,11 @@ module.exports = function (RED) {
                 return;
             }*/
             s7node_from_plc(msg.plc).then(s7conn => {
-                return s7_read(msg.plc, s7conn, msg.payload.variable);
+                let variable = msg.payload.variable;
+                if(msg.payload.varname) {
+                    variable = msg.plc.variables[msg.payload.varname];
+                }
+                return s7_read(msg.plc, s7conn, variable);
             }).then((out) => {
                 msg.result = "ok";
                 msg.payload.value = out;