Merge branch 'develop'

Argonne-National-Laboratory · Dec 2, 2024 · da722b2 · da722b2
2 parents ebd01f3 + 3937720
commit da722b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ocpp/ocpp-cp-json.html b/ocpp/ocpp-cp-json.html
@@ -25,7 +25,7 @@
             cmddata: { value: "", required: false},
             log: { value: false, required: true },
             pathlog: {value: "", required: false},
-            wsdelayconnect: {value: true, required: true},
+            wsdelayconnect: {value: false, required: true},
             wstomin: {value: 5, required: false}, 
             wstomax: {value: 360, required: false}, 
             wstoinc: {value: 5, required: false} 

diff --git a/ocpp/ocpp-cp-json.js b/ocpp/ocpp-cp-json.js
@@ -49,7 +49,7 @@ module.exports = function(RED) {
     this.logging = config.log || false;
     this.pathlog = config.pathlog;
 
-    this.auto_connect = config.wsdelayconnect || false;
+    this.delay_auto_connect = config.wsdelayconnect || false;
     this.wstomin = (isNaN(Number.parseInt(config.wstomin))) ? WSTOMIN_DEF : Number.parseInt(config.wstomin);
     let _wstomax = (isNaN(Number.parseInt(config.wstomax))) ? WSTOMAX_DEF : Number.parseInt(config.wstomax);
     this.wstomax = parseInt((_wstomax >= this.wstomin)? _wstomax : this.wstomin);
@@ -308,7 +308,7 @@ module.exports = function(RED) {
 
     // Only do this if auto-connect is enabled
     //
-    if (node.auto_connect && csmsURL){
+    if (!(node.delay_auto_connect) && csmsURL){
       node.status({fill: 'blue', shape: 'dot', text: `Connecting...`});
       wsConnect();
     }