iobroker.modbus 5.0.2 → 5.0.5

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.
Files changed (19) hide show
  1. package/README.md +12 -3
  2. package/admin/asset-manifest.json +6 -6
  3. package/admin/index_m.html +1 -1
  4. package/admin/static/css/main.96b3c861.css +2 -0
  5. package/admin/static/css/main.96b3c861.css.map +1 -0
  6. package/admin/static/js/main.92002ca6.js +3 -0
  7. package/admin/static/js/{main.dca2f512.js.LICENSE.txt → main.92002ca6.js.LICENSE.txt} +43 -23
  8. package/admin/static/js/main.92002ca6.js.map +1 -0
  9. package/io-package.json +35 -35
  10. package/lib/jsmodbus/handler/server/ReadCoils.js +1 -2
  11. package/lib/jsmodbus/handler/server/ReadDiscreteInputs.js +1 -3
  12. package/lib/master.js +80 -72
  13. package/lib/slave.js +31 -23
  14. package/main.js +21 -15
  15. package/package.json +3 -3
  16. package/admin/static/css/main.fb1757a1.css +0 -2
  17. package/admin/static/css/main.fb1757a1.css.map +0 -1
  18. package/admin/static/js/main.dca2f512.js +0 -3
  19. package/admin/static/js/main.dca2f512.js.map +0 -1
package/README.md CHANGED
@@ -123,11 +123,13 @@ This factor is used to multiply the read value from Bus for static scaling. So t
123
123
  This offset is added to the read value after above multiplication. So the calculation looks like following val = x * Factor + Offset
124
124
 
125
125
  ### Formula
126
- This field can be used for advanced calculations if Factor and Offset is not sufficient. If this field is set, then the Factor and Offset field is ignored.
126
+ This field can be used for advanced calculations if Factor and Offset is not sufficient. **If this field is set, then the Factor and Offset field is ignored.**
127
127
  The Formula is executed by the eval() function. Therefore, all common functions are supported. Especially the Math functions. The formula must comply with Javascript syntax, therefore also take care about upper and lower cases.
128
128
 
129
129
  In the formula, "x" has to be used for the read value from Modbus. E.g. `x * Math.pow(10, sf['40065'])`
130
130
 
131
+ Using the "sf" array (see above example) you can access other read modbus values if they are flagged as "Scale Factor" in the config (see below infos on "SF" flag).
132
+
131
133
  If the formula cannot be evaluated during runtime, then the Adapter writes a warning message to the log.
132
134
 
133
135
  Another use case for formulas could also be to prevent implausible data with a formula like `x > 2000000 ? null : x`
@@ -276,8 +278,15 @@ There are some programs in folder *test' to test the TCP communication:
276
278
  ### **WORK IN PROGRESS**
277
279
  -->
278
280
  ## Changelog
279
- ### 5.0.2 (2022-05-13)
280
- * (bluefox) Added debug outputs to catch errors
281
+ ### 5.0.5 (2022-08-13)
282
+ * (Apollon77) Prevent some crash cases reported by Sentry
283
+
284
+ ### 5.0.4 (2022-06-15)v
285
+ * (bluefox) Corrected the coils reading in slave mode
286
+ * (bluefox) Corrected type of connection indicator
287
+
288
+ ### 5.0.3 (2022-05-13)
289
+ * (bluefox) Fixed error with mutli-devices
281
290
 
282
291
  ### 5.0.0 (2022-05-11)
283
292
  * BREAKING: All space characters will be replaced with underscores now in the Objects IDs, not only the first one.
package/admin/asset-manifest.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "files": {
3
- "main.css": "./static/css/main.fb1757a1.css",
4
- "main.js": "./static/js/main.dca2f512.js",
3
+ "main.css": "./static/css/main.96b3c861.css",
4
+ "main.js": "./static/js/main.92002ca6.js",
5
5
  "index.html": "./index.html",
6
- "main.fb1757a1.css.map": "./static/css/main.fb1757a1.css.map",
7
- "main.dca2f512.js.map": "./static/js/main.dca2f512.js.map"
6
+ "main.96b3c861.css.map": "./static/css/main.96b3c861.css.map",
7
+ "main.92002ca6.js.map": "./static/js/main.92002ca6.js.map"
8
8
  },
9
9
  "entrypoints": [
10
- "static/css/main.fb1757a1.css",
11
- "static/js/main.dca2f512.js"
10
+ "static/css/main.96b3c861.css",
11
+ "static/js/main.92002ca6.js"
12
12
  ]
13
13
  }
package/admin/index_m.html CHANGED
@@ -1 +1 @@
1
- <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>Modbus</title><script defer="defer" src="./static/js/main.dca2f512.js"></script><link href="./static/css/main.fb1757a1.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
1
+ <!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>Modbus</title><script defer="defer" src="./static/js/main.92002ca6.js"></script><link href="./static/css/main.96b3c861.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
package/admin/static/css/main.96b3c861.css ADDED
@@ -0,0 +1,2 @@
1
+ body,html{height:100%}body{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;margin:0;overflow:hidden;padding:0;width:100%}::-webkit-scrollbar,::-webkit-scrollbar-track{background-color:#ccc}::-webkit-scrollbar{width:6px}::-webkit-scrollbar-thumb{background-color:#575757}#root,.App{height:100%}
2
+ /*# sourceMappingURL=main.96b3c861.css.map*/
package/admin/static/css/main.96b3c861.css.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"static/css/main.96b3c861.css","mappings":"AAGA,UAFE,WAWF,CATA,KAIE,kCAAmC,CACnC,iCAAkC,CAFlC,mIAA8J,CAF9J,QAAS,CAOT,eAAgB,CANhB,SAAU,CAIV,UAGF,CAKA,8CAFE,qBAKF,CAHA,oBACE,SAEF,CACA,0BACE,wBACF,CAMA,WACE,WACF","sources":["index.css"],"sourcesContent":["html {\n height: 100%;\n}\nbody {\n margin: 0;\n padding: 0;\n font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", \"Roboto\", \"Oxygen\", \"Ubuntu\", \"Cantarell\", \"Fira Sans\", \"Droid Sans\", \"Helvetica Neue\", sans-serif;\n -webkit-font-smoothing: antialiased;\n -moz-osx-font-smoothing: grayscale;\n width: 100%;\n height: 100%;\n overflow: hidden;\n}\n/* scrollbar */\n*::-webkit-scrollbar-track {\n background-color: #ccc;\n}\n*::-webkit-scrollbar {\n width: 6px;\n background-color: #ccc;\n}\n*::-webkit-scrollbar-thumb {\n background-color: #575757;\n}\n\n\n#root {\n height: 100%;\n}\n.App {\n height: 100%;\n}"],"names":[],"sourceRoot":""}