Skip to content

Commit

Permalink
version 0.10.4
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Sep 14, 2023
1 parent cb74cdf commit 2c8d5aa
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 25 deletions.
26 changes: 12 additions & 14 deletions docs/draft/variables/variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion npm-module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "Envox <[email protected]>",
"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"]
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "Envox <[email protected]>",
"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",
Expand Down Expand Up @@ -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,
Expand Down
18 changes: 10 additions & 8 deletions packages/instrument/connection/connection-main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 2c8d5aa

Please sign in to comment.