@things-factory/integration-melsec 4.0.17 → 4.0.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -20,7 +20,7 @@ async function MelsecWaitForCoil(step, { logger, root, domain }) {
|
|
|
20
20
|
var sendMessage = melsec_plc_1.MelsecPLCConnector.getReadCoilCommand(deviceCode, readStartDevice, undefined);
|
|
21
21
|
while (true) {
|
|
22
22
|
let state = root.getState();
|
|
23
|
-
if (state ==
|
|
23
|
+
if (state == integration_base_1.ScenarioInstanceStatus.STARTED /* STARTED */) {
|
|
24
24
|
var content = await request(sendMessage, 23, { logger });
|
|
25
25
|
if (content.substring(17, 18) == '5') {
|
|
26
26
|
var coilValue = content.substring(22, 23);
|
|
@@ -41,7 +41,7 @@ async function MelsecWaitForCoil(step, { logger, root, domain }) {
|
|
|
41
41
|
throw new Error('response not applicable');
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
else if (state ==
|
|
44
|
+
else if (state == integration_base_1.ScenarioInstanceStatus.STOPPED /* PAUSED */) {
|
|
45
45
|
await (0, utils_1.sleep)(waitTerm);
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"melsec-wait-coil.js","sourceRoot":"","sources":["../../../server/engine/task/melsec-wait-coil.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"melsec-wait-coil.js","sourceRoot":"","sources":["../../../server/engine/task/melsec-wait-coil.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-melsec",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.22",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"clean": "npm run clean:server"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@things-factory/integration-base": "^4.0.
|
|
26
|
+
"@things-factory/integration-base": "^4.0.22",
|
|
27
27
|
"p-queue": "^6.4.0"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "8267638c3bd77dfc8fa9629b490d681c6854e423"
|
|
30
30
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { ConnectionManager, TaskRegistry } from '@things-factory/integration-base'
|
|
1
|
+
import { ConnectionManager, ScenarioInstanceStatus, TaskRegistry } from '@things-factory/integration-base'
|
|
2
2
|
import { sleep } from '@things-factory/utils'
|
|
3
|
+
|
|
3
4
|
import { MelsecPLCConnector } from '../connector/melsec-plc'
|
|
4
5
|
|
|
5
6
|
async function MelsecWaitForCoil(step, { logger, root, domain }) {
|
|
@@ -26,7 +27,7 @@ async function MelsecWaitForCoil(step, { logger, root, domain }) {
|
|
|
26
27
|
|
|
27
28
|
while (true) {
|
|
28
29
|
let state = root.getState()
|
|
29
|
-
if (state ==
|
|
30
|
+
if (state == ScenarioInstanceStatus.STARTED /* STARTED */) {
|
|
30
31
|
var content = await request(sendMessage, 23, { logger })
|
|
31
32
|
|
|
32
33
|
if (content.substring(17, 18) == '5') {
|
|
@@ -47,7 +48,7 @@ async function MelsecWaitForCoil(step, { logger, root, domain }) {
|
|
|
47
48
|
// error
|
|
48
49
|
throw new Error('response not applicable')
|
|
49
50
|
}
|
|
50
|
-
} else if (state ==
|
|
51
|
+
} else if (state == ScenarioInstanceStatus.STOPPED /* PAUSED */) {
|
|
51
52
|
await sleep(waitTerm)
|
|
52
53
|
} else {
|
|
53
54
|
throw new Error('scenario stopped unexpectedly')
|