diff --git a/docs/draft/variables/variables.md b/docs/draft/variables/variables.md index 530c38b61..bb2b66f89 100644 --- a/docs/draft/variables/variables.md +++ b/docs/draft/variables/variables.md @@ -314,31 +314,29 @@ Each binary operators requires two arguments. Binary operator is written between - These are also binary operators which results to boolean value -`==` +`==` equal to -`!=` +`!=` not equal -`<` +`<` greater than -`>` +`>` less than -`<=` +`<=` less than or equal to -`>=` +`>=` greater than or equal to -`&&` +`&&` and -`||` +`||` or ## Unary operators -`+` +`-` negate the value -`-` +`~` binary invert -`~` - -`!` +`!` logical invert ## Conditional (ternary) operator @@ -361,7 +359,7 @@ The conditional (ternary) operator is the only operator that takes three operand - Description: Index of current element in the List and Grid widget. Check the description of these two widget for the more information. - Parameters: - - Name: `index`. Type: `integer`. Description: + - Name: `index`. Type: `integer`. Description: in case of nested List/Grid widgets use 0 for inner most List/Grid, 1 for List/Grid one up, etc. - Return value: - Type: `integer`. Description: element index diff --git a/npm-module/package.json b/npm-module/package.json index ba7a0db6b..d29bf58bf 100644 --- a/npm-module/package.json +++ b/npm-module/package.json @@ -3,7 +3,7 @@ "author": "Envox ", "description": "EEZ Studio for building standalone dashboard applications", "repository": "https://github.com/eez-open/studio", - "version": "0.0.26", + "version": "0.0.28", "revision": "1", "license": "GPL-3.0-only", "files": ["packages", "libs", "resources"] diff --git a/package.json b/package.json index 4737e88ba..df6662a9c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "author": "Envox ", "description": "Cross-platform visual development tool and SCPI instrument controller", "homepage": "https://www.envox.hr/eez/studio/studio-introduction.html", - "version": "0.10.3", + "version": "0.10.4", "revision": "1", "license": "GPL-3.0-only", "repository": "https://github.com/eez-open/studio", @@ -34,7 +34,8 @@ "electron-version": "electron --version", "publish-types": "cd packages/eez-studio-types && npm publish", "pubdoc-dev": "cd tools/pubdoc && tsc && cd build && node pubdoc.js --config ../config/dev.json", - "pubdoc-prod": "cd tools/pubdoc && tsc && cd build && node pubdoc.js --config ../config/prod.json" + "pubdoc-prod": "cd tools/pubdoc && tsc && cd build && node pubdoc.js --config ../config/prod.json", + "npm-module-publish": "node npm-module-publish.js" }, "prettier": { "printWidth": 80, diff --git a/packages/instrument/connection/connection-main.ts b/packages/instrument/connection/connection-main.ts index 3c5fe95f9..8be9faaaa 100644 --- a/packages/instrument/connection/connection-main.ts +++ b/packages/instrument/connection/connection-main.ts @@ -521,23 +521,25 @@ export class Connection const delay = options && options.delay != undefined ? options.delay - : this.connectionParameters.delay; + : this.connectionParameters.delay ?? 0; + this.sendQueue.push({ command: command + "\n", delay }); + this.dumpSendQueue(); if (options && options.isQuery) { - this.sendTimeoutId = setTimeout( - () => { - this.sendTimeoutId = undefined; - this.sendTimeout(); - }, + const timeout = options.timeout != undefined ? options.timeout - : this.connectionParameters.timeout - ); + : this.connectionParameters.timeout ?? 60000; + + this.sendTimeoutId = setTimeout(() => { + this.sendTimeoutId = undefined; + this.sendTimeout(); + }, timeout); } }