Compare commits

...
489 Commits
Author SHA1 Message Date
fengzeroz c6c176069d Merge pull request #2519 from fengzeroz/v2.11
version: 2.11.4
2025-07-10 13:46:56 +08:00
fengzero 1eedb1e4cf version: 2.11.4 2025-07-10 05:46:23 +00:00
fengzeroz 73441f5102 Merge pull request #2518 from ZhouBox/v2.11
[v2.11]mem op when driver report callback
2025-07-08 14:18:33 +08:00
xiang.zhou 2cc9a68548 mem op when driver report callback 2025-07-08 13:53:56 +08:00
fengzeroz 9d586dff2d Merge pull request #2516 from ZhouBox/v2.11
[V2.11] group filter & sort
2025-07-08 13:45:34 +08:00
xiang.zhou 217799aadf filter node name 2025-07-08 10:25:12 +08:00
xiang.zhou 67c5b17816 node&group support filter 2025-07-08 10:23:11 +08:00
fengzero 3bf7a10ac9 get nodes: query state/link, sort delay 2025-07-08 10:23:04 +08:00
fengzeroz e7bd8262f6 Merge pull request #2509 from fengzeroz/v2.11
report: pre alloc memory
2025-06-26 11:15:04 +08:00
fengzero e089d7965e report: pre alloc memory 2025-06-26 03:13:25 +00:00
fengzeroz 17da1835fb Merge pull request #2507 from fengzeroz/v2.11
version: 2.11.3
2025-06-23 15:22:06 +08:00
fengzero f14923e8c2 version: 2.11.3 2025-06-23 07:19:32 +00:00
fengzeroz f87919af37 Merge pull request #2497 from hxy7yx/v2.11-1
[v2.11]feat(modbus):support endianess of 8-Byte data
2025-06-16 11:04:37 +08:00
fengzeroz 49412b4e25 Merge pull request #2496 from fengzeroz/v2.11
fix cppcheck
2025-06-16 10:54:34 +08:00
fengzero d671b7edce fix cppcheck 2025-06-16 02:45:58 +00:00
hxy7yx 3ba03c49e4 feat(modbus):support endianess of 8-Byte data 2025-06-15 19:43:09 -07:00
fengzeroz a2fdbf9c42 Merge pull request #2495 from fengzeroz/v2.11
fix: mqtt disable subscribe topic
2025-06-16 10:33:42 +08:00
fengzero 8646d69f97 fix: mqtt disable subscribe topic 2025-06-16 02:29:50 +00:00
fengzeroz 42450e5bb4 Merge pull request #2483 from fengzeroz/v2.11
mqtt: config enable_topic
2025-06-12 11:08:48 +08:00
fengzero bfdfad5b77 mqtt: config enable_topic 2025-06-12 02:52:06 +00:00
fengzeroz 45e0708ec4 Merge pull request #2480 from fengzeroz/v2.11
fix: filter error crash
2025-06-11 10:34:06 +08:00
fengzeroz 9195a60e96 Merge pull request #2479 from ZhouBox/v2.11
[v2.11]startup optimization
2025-06-11 10:19:48 +08:00
fengzero 2e52482e6d fix: filter error crash 2025-06-11 02:19:01 +00:00
xiang.zhou da8ba29658 startup optimization 2025-06-10 14:37:24 +08:00
Xiang Zhou a041469c8e Merge pull request #2475 from ZhouBox/v2.11
trace:check data control flag
2025-06-09 15:55:21 +08:00
xiang.zhou 8828d338c6 trace:check data control flag 2025-06-09 15:47:26 +08:00
Xiang Zhou b851723265 Merge pull request #2473 from ZhouBox/v2.11
trace:check  trace ctx of trans data
2025-06-09 14:03:55 +08:00
xiang.zhou f66f4ca1e8 trace:check trace ctx of trans data 2025-06-09 13:55:57 +08:00
Xiang Zhou 0ffcdf2c38 Merge pull request #2472 from ZhouBox/v2.11
trace:reduce num when app stopped
2025-06-09 12:40:10 +08:00
xiang.zhou f68c049862 trace:reduce num when app stopped 2025-06-09 12:25:18 +08:00
fengzeroz c707dd9aea Merge pull request #2471 from ZhouBox/v2.11
adapter:check state when do with trans data
2025-06-09 11:03:27 +08:00
xiang.zhou 6483358dba adapter:check state when do with trans data 2025-06-09 10:54:45 +08:00
Xiang Zhou 109e62ede4 Merge pull request #2455 from ZhouBox/v2.11
otel:trace flag assignment error
2025-05-21 16:03:55 +08:00
xiang.zhou bf4d324492 otel:trace flag assignment error 2025-05-21 15:53:39 +08:00
Xiang Zhou 9a7127a1e5 Merge pull request #2453 from ZhouBox/v2.11
[v2.11]otel:ensure the uniqueness of ctx
2025-05-21 14:11:54 +08:00
xiang.zhou 734672fe07 otel:ensure the uniqueness of ctx 2025-05-21 11:26:09 +08:00
fengzeroz b2359a0e60 Merge pull request #2447 from ZhouBox/v2.11
[v2.11]refactor the array type
2025-05-19 16:17:51 +08:00
xiang.zhou 7c80d4e21f refactor the array type 2025-05-19 15:58:58 +08:00
fengzeroz 122ec0a878 Merge pull request #2442 from fengzeroz/v2.11
version: 2.11.2
2025-05-09 15:47:20 +08:00
fengzero 3b9ec7a3f3 version: 2.11.2 2025-05-09 07:46:50 +00:00
fengzeroz 5cadd6a9ba Merge pull request #2440 from ZhouBox/v2.11
[v2.11]otel:span optimization
2025-05-08 14:13:24 +08:00
xiang.zhou 1b9d9699f6 ci:update os version 2025-05-08 13:09:40 +08:00
xiang.zhou 051bd01a87 otel:span optimization 2025-05-08 13:08:33 +08:00
fengzeroz 392eb51907 Merge pull request #2435 from hxy7yx/v2.11-1
[v2.11]fix(persist tags with array types)
2025-04-30 15:46:44 +08:00
hxy7yx e9d357543b fix(persist tags with array types) 2025-04-30 00:34:54 -07:00
fengzeroz 21b36c8de8 Merge pull request #2429 from fengzeroz/v2.11
Revert "write int64/uint64 with string"
2025-04-18 09:54:06 +08:00
fengzero 5d394ffe9d Revert "write int64/uint64 with string"
This reverts commit b3cb8fc61d.
2025-04-18 01:53:14 +00:00
fengzeroz f88f77e1f5 Merge pull request #2424 from fengzeroz/v2.11
write int64/uint64 with string
2025-04-02 13:51:19 +08:00
fengzero b3cb8fc61d write int64/uint64 with string 2025-04-02 05:50:01 +00:00
fengzeroz af8bd23ba6 Merge pull request #2420 from fengzeroz/v2.11
check array length
2025-03-28 16:25:20 +08:00
fengzero aa9290c5bf check array length 2025-03-28 08:24:54 +00:00
fengzeroz 73ff084dc3 Merge pull request #2419 from fengzeroz/v2.11
version: 2.11.1
2025-03-28 16:12:25 +08:00
fengzero 84154d015f version: 2.11.1 2025-03-28 08:11:57 +00:00
fengzeroz 62f3e8dc0c Merge pull request #2418 from gc87/value-size-v2.11
[v2.11]chore: set neu_value_size 128 -> 256
2025-03-28 16:11:03 +08:00
gc87 de5879092b chore: set neu_value_size 128 -> 256 2025-03-28 15:38:51 +08:00
fengzeroz 0975ced6c0 Merge pull request #2414 from ZhouBox/v2.11
[v2.11]ekuiper:support precision
2025-03-19 16:00:02 +08:00
fengzeroz f4a875c0f1 Merge pull request #2410 from hxy7yx/v2.11-1
[v2.11]fix(allow float-tag to write integers)
2025-03-19 15:59:17 +08:00
xiang.zhou 5c0a411407 ekuiper:support precision 2025-03-19 13:28:31 +08:00
hxy7yx e93c4586cd fix(allow float-tag to write integers) 2025-03-18 20:28:18 -07:00
fengzeroz 011d005d36 Merge pull request #2404 from hxy7yx/v2.11-1
[v2.11]allow float-tag to write integers
2025-03-18 11:25:57 +08:00
hxy7yx 843f1234d9 allow float-tag to write integers 2025-03-16 20:05:02 -07:00
fengzeroz 8ae85d29fe Merge pull request #2394 from ZhouBox/v2.11
[v2.11]otel:remove duplicate ctx
2025-02-21 13:46:35 +08:00
xiang.zhou a93a359d6c otel:remove duplicate ctx 2025-02-21 13:26:06 +08:00
fengzeroz 3c1954f48f Merge pull request #2390 from fengzeroz/v2.11
version: 2.11.0-beta3
2025-02-19 16:12:43 +08:00
fengzero 489e402484 version: 2.11.0-beta3 2025-02-19 08:12:10 +00:00
fengzeroz 2f3dd5ab99 Merge pull request #2389 from fengzeroz/v2.11
drop table
2025-02-19 15:49:50 +08:00
fengzero 5262f114ac drop table 2025-02-19 07:37:28 +00:00
fengzeroz 8c4bd2202e Merge pull request #2387 from ZhouBox/v2.11
[v2.11]fixbug:schema file no match lastest
2025-02-18 14:43:30 +08:00
xiang.zhou 6f7dd20454 fixbug:schema file no match laster 2025-02-18 14:13:59 +08:00
fengzeroz c7ce235b92 Merge pull request #2385 from fengzeroz/v2.11
version: 2.11.0-beta2
2025-02-18 11:41:41 +08:00
fengzero b0444941c8 version: 2.11.0-beta2 2025-02-18 03:41:02 +00:00
fengzeroz 64a4044137 Merge pull request #2383 from fengzeroz/v2.11
rm unused schema
2025-02-17 15:31:13 +08:00
fengzero 929695c285 rm unused schema 2025-02-17 07:20:23 +00:00
fengzero d799e13707 rm unused schema 2025-02-17 06:52:43 +00:00
fengzeroz fefc6ad6ca Merge pull request #2381 from hxy7yx/v2.11-fix
[v2.11]fix(ptr): memory leak
2025-02-14 16:58:10 +08:00
hxy 0dd3c9c4ec fix(ptr): memory leak 2025-02-14 16:56:06 +08:00
fengzeroz e9fd98a1fb Merge pull request #2380 from fengzeroz/v2.11
version: 2.11.0-beta1
2025-02-14 15:40:44 +08:00
fengzero 3907b348da version: 2.11.0-beta1 2025-02-14 07:39:54 +00:00
fengzeroz df11ba435a Merge pull request #2378 from hxy7yx/v2.11-fix
[v2.11]fix(mqtt):convert array&object to string format in ECP format
2025-02-11 11:24:19 +08:00
hxy 088b264e10 fix(mqtt):convert array&object to string format in ECP format 2025-02-10 15:41:38 +08:00
fengzeroz 26763e2ff7 Merge pull request #2375 from fengzeroz/v2.11
version: 2.11.0-alpha2
2025-02-07 13:52:37 +08:00
fengzero af82e102a7 version: 2.11.0-alpha2 2025-02-07 05:51:00 +00:00
fengzeroz 75568c5af9 Merge pull request #2372 from hxy7yx/v2.11-fix
[v2.11]fix(mqtt): fix ECP format when the first tag reads incorrect data
2025-02-07 10:05:18 +08:00
hxy 62908f0339 fix(mqtt): fix ECP format when the first tag reads incorrect data 2025-02-07 04:27:43 +08:00
fengzeroz 47aba7bc59 Merge pull request #2370 from fengzeroz/v2.11
ci: fix daily release
2025-02-06 14:11:47 +08:00
fengzero 5c16f03082 ci: fix daily release 2025-02-06 06:11:17 +00:00
fengzeroz 41bb04d4c7 Merge pull request #2369 from fengzeroz/v2.11
V2.11
2025-02-06 14:09:07 +08:00
fengzero d94f1b6ef7 ci upload v4 2025-02-06 06:07:43 +00:00
fengzero 931d979047 mqtt: rm driver action topic 2025-02-06 05:54:57 +00:00
fengzero 00b4650eef mqtt schema deep 3 2025-02-06 03:01:57 +00:00
fengzero 8732518c47 mqtt schema support values format 2025-02-05 08:52:21 +00:00
fengzeroz bd4d6534af Merge pull request #2367 from ZhouBox/v2.11
[v2.11]otel:op
2025-01-24 16:30:43 +08:00
xiang.zhou 9fdc4aa644 otel:op 2025-01-24 16:21:45 +08:00
fengzeroz 36eefb2186 Merge pull request #2365 from fengzeroz/v2.11
branch v2.11
2025-01-17 17:19:23 +08:00
fengzero 2f4216d944 branch v2.11 2025-01-17 09:18:36 +00:00
fengzeroz 085d6846f0 Merge pull request #2364 from fengzeroz/v2.11
branch v2.11
2025-01-17 16:50:52 +08:00
fengzero 8186dc6ee2 branch v2.11 2025-01-17 08:44:09 +00:00
fengzeroz 15627ad9ae Merge pull request #2363 from fengzeroz/main
ut&description
2025-01-08 17:05:02 +08:00
fengzero 6dbd8d1a08 mqtt format description 2025-01-08 08:43:37 +00:00
fengzero fa1964304f mqtt schema test 2025-01-08 06:54:33 +00:00
fengzeroz 5711d5ca46 Merge pull request #2360 from hxy7yx/main-2
chore(scan tag): rename tag_type to type
2025-01-08 13:56:32 +08:00
hxy aba218dade chore(scan tag): rename tag_type to type 2025-01-08 11:54:21 +08:00
fengzeroz 392a72bd0b Merge pull request #2357 from hxy7yx/main-1
feat(scan tag):add type
2025-01-07 17:22:21 +08:00
hxy 9258276aa2 feat(scan tag):add type 2025-01-07 17:13:36 +08:00
fengzeroz d7feb2f514 Merge pull request #2356 from fengzeroz/main
mqtt custom format
2025-01-06 15:22:56 +08:00
fengzero 80803c7af6 static tags 2025-01-06 02:43:52 +00:00
fengzero 32e3c57601 mqtt custom format 2025-01-02 08:16:10 +00:00
fengzeroz afb5e55aa1 Merge pull request #2355 from ZhouBox/main
fix:build error when using a higher version of the compiler
2024-12-27 15:05:56 +08:00
xiang.zhou cea84c12d5 fix:build error when using a higher version of the compiler 2024-12-27 14:50:06 +08:00
fengzeroz bc6eb48fcb Merge pull request #2353 from ZhouBox/main
plugin:using copy file replace rename
2024-12-26 15:49:32 +08:00
xiang.zhou 06667e0352 plugin:using copy file replace rename 2024-12-26 10:54:25 +08:00
fengzeroz d4d17f74ff Merge pull request #2343 from ZhouBox/main
key files into code, no include in package
2024-12-24 09:51:06 +08:00
fengzeroz f91571f10e Merge pull request #2344 from hxy7yx/main-1
fix(modbus):clear recv buf before sending
2024-12-24 09:50:33 +08:00
hxy7yx d33fff5986 fix(modbus):clear recv buf before sending 2024-12-23 17:10:38 +08:00
xiang.zhou 0c833f0343 key files into code, no include in package 2024-12-23 11:07:44 +08:00
fengzeroz 15a10f5b02 Merge pull request #2339 from gc87/tongtech-user-api
feat: add tongtech user management api
2024-12-19 10:33:05 +08:00
fengzeroz 2054b8f3b1 Merge pull request #2340 from hxy7yx/main-1
mqtt: add logs for ecp-format
2024-12-19 10:32:48 +08:00
fengzeroz 38c44c4b41 Merge pull request #2341 from ZhouBox/main
support array string
2024-12-19 10:32:27 +08:00
xiang.zhou bb9d5a71dc support array string 2024-12-19 09:58:37 +08:00
hxy7yx 7dad96261a matt: add logs for ecp-format 2024-12-18 11:38:53 +08:00
gc87 03cfc049e5 fix: pass->password 2024-12-17 15:31:28 +08:00
gc87 7889e6b13f fix: url path user->users 2024-12-17 11:30:51 +08:00
gc87 f547a79900 feat: ready 2024-12-17 10:04:03 +08:00
fengzeroz cab2f92e70 Merge pull request #2338 from hxy7yx/main-1
feat(mqtt):filter tags with errors when uploading
2024-12-16 15:08:28 +08:00
hxy7yx a087f53d04 feat(mqtt):support ECP format 2024-12-16 14:24:38 +08:00
gc87 1b5c8528e2 feat: user management api -add user 2024-12-16 08:01:00 +08:00
gc87 8671b4baaa feat: add tongtech user management api 2024-12-13 16:37:58 +08:00
hxy7yx 6df00a37d6 feat(mqtt):filter tags with errors when uploadind 2024-12-13 10:19:47 +08:00
fengzeroz 2499657f8d Merge pull request #2336 from fengzeroz/main
action: driver to node
2024-12-11 15:53:30 +08:00
fengzeroz db92a94781 Merge pull request #2337 from ZhouBox/main
fixbug:use after free
2024-12-11 14:57:27 +08:00
xiang.zhou 12dd8d79fe fixbug:use after free 2024-12-11 14:49:07 +08:00
fengzeroz 48b935a70b Merge pull request #2335 from gc87/tongtech-log-api
feat: log file api
2024-12-11 14:18:12 +08:00
fengzeroz 154d2783d3 Merge pull request #2334 from emqx/hxy7yx-patch-1
Update Install-dependencies.md
2024-12-11 14:17:54 +08:00
fengzero 702fae369c cid: timestamp -> uint64 2024-12-11 03:25:07 +00:00
fengzero a7b9736380 action: driver to node 2024-12-11 03:03:30 +00:00
gc87 39bbdf882d feat: tongtech log api 2024-12-10 17:59:56 +08:00
hxy 6838811fa7 Update Install-dependencies.md 2024-12-09 11:20:59 +08:00
fengzeroz 3d6f0d02d0 Merge pull request #2328 from fengzeroz/main
cid: control tag
2024-12-02 17:35:25 +08:00
fengzero 8f3d1ce100 cid: control tag 2024-12-02 09:22:21 +00:00
fengzeroz a5cb64ccb4 Merge pull request #2331 from ZhouBox/main
fix bug:json incref when some sub apps
2024-11-29 15:07:53 +08:00
xiang.zhou b7bb822d16 fix bug:json incref when some sub apps 2024-11-29 15:04:35 +08:00
fengzeroz 44d3e94088 Merge pull request #2330 from ZhouBox/main
ekuiper:check encode json str
2024-11-29 13:46:18 +08:00
xiang.zhou d21131f584 ekuiper:check encode json str 2024-11-29 13:22:30 +08:00
fengzeroz 68d7b2e1d3 Merge pull request #2329 from ZhouBox/main
api:add new api about system exit
2024-11-29 11:25:52 +08:00
xiang.zhou 1e27430f88 api:add new api about system exit 2024-11-29 10:08:30 +08:00
fengzeroz eaa6a1bf75 Merge pull request #2326 from ZhouBox/main
write:check custom
2024-11-28 14:57:59 +08:00
xiang.zhou 119e15974c write:check custom 2024-11-28 14:45:49 +08:00
fengzeroz befb48c3b8 Merge pull request #2325 from fengzeroz/main
2.11.0 alpha
2024-11-28 10:38:22 +08:00
fengzero c8552b167a 2.11.0 alpha 2024-11-28 02:31:27 +00:00
fengzeroz 20f04d0a1c Merge pull request #2324 from ZhouBox/main
fix bug:data memory error
2024-11-28 09:36:53 +08:00
xiang.zhou 4573fb5c52 fix bug:data Memory error 2024-11-27 18:21:06 +08:00
fengzeroz d35acb3f12 Merge pull request #2321 from fengzeroz/main
parse cid
2024-11-27 15:20:34 +08:00
fengzero 14a50e7824 fix cid ut 2024-11-27 07:01:15 +00:00
fengzero 96b169a01d mqtt: action 2024-11-27 06:54:05 +00:00
fengzero 4667a4c051 rename plugin action 2024-11-27 06:54:05 +00:00
fengzero aff4a51560 cid format to tag 2024-11-27 06:54:05 +00:00
fengzero a6c3918640 cid write tag 2024-11-27 06:54:05 +00:00
fengzero 00fa869c54 cid: parse all 2024-11-27 06:54:05 +00:00
fengzeroz f2ef867b61 Merge pull request #2322 from ZhouBox/main
fix mem leak
2024-11-27 14:28:38 +08:00
xiang.zhou d52ee1bbca fix mem leak 2024-11-27 14:16:12 +08:00
fengzeroz c0e16f41d4 Merge pull request #2320 from ZhouBox/main
support json obj and array
2024-11-25 11:25:17 +08:00
xiang.zhou ef6bb14809 support json obj and array 2024-11-25 11:12:56 +08:00
fengzeroz 2ce73e527f Merge pull request #2314 from hxy7yx/main-1
feat(modbus-tcp):support backup ip
2024-11-20 13:54:12 +08:00
hxy7yx adaad8d900 feat(modbus-tcp):support backup ip 2024-11-19 17:01:16 +08:00
fengzeroz 2e5372d430 Merge pull request #2315 from hxy7yx/main-2
fix(mqtt):separate MQTT and API for JSON(read resp)
2024-11-19 10:07:21 +08:00
hxy7yx 3b85d2b9cd fix(mqtt):separate MQTT and API for JSON(read resp) 2024-11-19 09:28:52 +08:00
fengzeroz 3d6cdf5fe5 Merge pull request #2311 from fengzeroz/main
#2288: avoiding duplicate release resources
2024-11-11 17:07:44 +08:00
fengzero 5575529863 #2288: avoiding duplicate release resources 2024-11-11 09:02:52 +00:00
fengzeroz b52dbb88f9 Merge pull request #2310 from fengzeroz/main
conn buf size: 8192
2024-11-11 16:39:58 +08:00
fengzero bf6d7340cb conn buf size: 8192 2024-11-11 08:29:54 +00:00
fengzeroz abd58afc16 Merge pull request #2268 from gc87/attributes
fix: support iec61850 data format
2024-11-11 13:46:16 +08:00
fengzeroz d60e9293fb Merge pull request #2306 from fengzeroz/main
mqtt filter tag & driver cmd
2024-11-11 11:40:51 +08:00
fengzero b291e49611 mqtt: driver cmd 2024-11-11 03:31:09 +00:00
gc87 08eea75ac8 fix(cid): co's address missing prefix and inst 2024-11-11 11:31:01 +08:00
gc87 a8ba929457 feat: cyclic reporting for 61850 gi 2024-11-11 10:39:31 +08:00
gc87 c59d557535 fix: add attributes field for update meta 2024-11-11 10:39:31 +08:00
fengzero ebc91b0ce1 mqtt read group filter tags 2024-11-08 06:42:40 +00:00
fengzeroz 141b3f56b1 Merge pull request #2304 from fengzeroz/main
fix value: array bool
2024-11-07 18:11:19 +08:00
fengzero 9fd7e7687b fix value: array bool 2024-11-07 10:08:01 +00:00
fengzeroz c722ee8624 Merge pull request #2302 from fengzeroz/main
ft array type
2024-11-07 16:51:59 +08:00
fengzero 5e4d0ee231 ft array type 2024-11-07 08:44:59 +00:00
fengzeroz a0ffe7eb8c Merge pull request #2300 from fengzeroz/main
json_value: array bool
2024-11-07 15:06:01 +08:00
fengzero d20b810269 json_value: array bool 2024-11-07 06:56:01 +00:00
fengzeroz aee8160291 Merge pull request #2299 from fengzeroz/main
fix: fix_value case neu_type_array_char
2024-11-07 13:51:01 +08:00
fengzero 912cf14173 fix: fix_value case neu_type_array_char 2024-11-07 05:37:29 +00:00
fengzeroz a60657bb29 Merge pull request #2297 from fengzeroz/main
fix_value array
2024-11-07 11:42:03 +08:00
fengzero 065b0179b2 fix_value array 2024-11-07 03:30:46 +00:00
fengzeroz 12779ef4d4 Merge pull request #2295 from fengzeroz/main
db array
2024-11-07 11:15:27 +08:00
fengzero 83dfa3a2e6 db array 2024-11-07 03:07:10 +00:00
fengzeroz b5784a9d3c Merge pull request #2293 from fengzeroz/main
uint8 array
2024-11-07 10:32:23 +08:00
fengzero 1982dacbdb uint8 array 2024-11-07 02:26:09 +00:00
fengzeroz ec8d7c87f0 Merge pull request #2292 from fengzeroz/main
support array type
2024-11-06 18:53:26 +08:00
fengzero 8d90cb7d08 support array type 2024-11-06 10:44:21 +00:00
fengzeroz 2f04a3478e Merge pull request #2290 from fengzeroz/main
check decimal/precision/bias when add tags
2024-11-06 14:09:36 +08:00
fengzero c699d5a156 check decimal/precision/bias when add tags 2024-11-06 03:41:20 +00:00
fengzeroz 4de5e0ae85 Merge pull request #2286 from ZhouBox/main
plugin:buffer overflow
2024-11-05 09:51:07 +08:00
xiang.zhou 3e3a583d72 plugin:buffer overflow 2024-11-05 08:43:47 +08:00
fengzeroz 0b6c5bef39 Merge pull request #2285 from fengzeroz/main
mqtt port limit
2024-11-04 17:00:31 +08:00
fengzero dd46b6fe9e mqtt port limit 2024-11-04 08:54:54 +00:00
fengzeroz 1e0f51058e Merge pull request #2282 from fengzeroz/main
check plugin schema exist
2024-11-04 15:58:34 +08:00
fengzero c9ce39747e #2281: check plugin schema exist 2024-11-04 07:48:27 +00:00
fengzeroz 654a409538 Merge pull request #2275 from fengzeroz/main
update_im: not check subscribe
2024-11-01 13:50:05 +08:00
fengzeroz 8f684e4089 Merge pull request #2271 from hxy7yx/main-1
update install dependencies
2024-11-01 11:40:18 +08:00
fengzeroz d6839f42e3 Merge pull request #2269 from hankchan/patch-1
Update Install-dependencies.md
2024-11-01 11:40:01 +08:00
fengzeroz cd5c3900a4 Merge pull request #2274 from hxy7yx/main-2
fix(write):correct write value verification
2024-11-01 11:39:23 +08:00
fengzero 5b8c4173df update_im: not check subscribe 2024-11-01 03:34:27 +00:00
hxy7yx 11a95166f4 fix(write):correct write value verification 2024-11-01 11:25:07 +08:00
hxy7yx a07c042bf6 update install dependencies 2024-10-31 16:19:07 +08:00
Hank Chan 54aa872279 Update Install-dependencies.md
add "sudo"  before "make install"
2024-10-30 12:57:19 +08:00
fengzeroz cd5f750ce1 Merge pull request #2267 from fengzeroz/main
write tags: optional name
2024-10-25 11:05:50 +08:00
fengzero 4d7b3e0d80 write tags: optional name 2024-10-24 08:15:21 +00:00
fengzeroz 958e0f30f4 Merge pull request #2266 from ZhouBox/sm
mqtt:support keypass
2024-10-24 14:19:16 +08:00
xiang.zhou efc6cd3761 mqtt:support keypass 2024-10-24 13:55:01 +08:00
fengzeroz e1b33bc586 Merge pull request #2264 from fengzeroz/main
cid ut
2024-10-23 14:23:20 +08:00
fengzeroz e85b0be2c8 Merge pull request #2265 from hxy7yx/main-3
remove attribute: STATIC
2024-10-23 14:00:47 +08:00
hxy7yx ee5687527a remove attribute: STATIC 2024-10-23 13:41:19 +08:00
fengzero cc75d8ce8e cid ut 2024-10-23 03:15:25 +00:00
fengzeroz 2a79f11a39 Merge pull request #2263 from fengzeroz/main
import cid
2024-10-22 17:14:47 +08:00
fengzero ae30128dd3 cid: import and parse 2024-10-22 08:57:07 +00:00
fengzeroz 2f3462f46b Merge pull request #2260 from hxy7yx/main-1
feat(modbus):support opentelemetry
2024-10-22 15:43:40 +08:00
hxy7yx 4a608906ad feat(modbus):support opentelemetry 2024-10-22 14:11:11 +08:00
fengzeroz 5f5a376859 Merge pull request #2257 from ZhouBox/main
otel:add new api and support ns
2024-10-16 10:31:22 +08:00
xiang.zhou 51333961d6 otel:support ns and add span status 2024-10-16 10:18:25 +08:00
xiang.zhou a4f2671867 otel:add api and use new api 2024-10-16 10:18:18 +08:00
fengzeroz caec4d1585 Merge pull request #2251 from hxy7yx/main-1
feat(modbus):support device degradation
2024-10-15 10:24:22 +08:00
hxy7yx c22aaf25d4 feat(modbus):support start address base 0 or 1 2024-10-14 17:13:57 +08:00
hxy7yx 64467a28a7 feat(modbus):supoort configuring endianness in node configuration 2024-10-14 14:06:44 +08:00
hxy7yx 965c4ef081 feat(modbus):support device degradation 2024-10-14 10:54:46 +08:00
fengzeroz 5866f6ac7a Merge pull request #2250 from ZhouBox/main
plugin:rm so and schema file when remove custom plugin && mqtt trace:add resp playload
2024-09-30 10:44:10 +08:00
xiang.zhou 7a1198014b mqtt trace:add resp playload 2024-09-29 16:32:28 +08:00
xiang.zhou aeee3083aa plugin:rm so and schema file when remove custom plugin 2024-09-29 16:31:54 +08:00
fengzeroz 3f5caf1431 Merge pull request #2247 from ZhouBox/main
plugin:modify schema file path when update plugins
2024-09-29 14:01:05 +08:00
xiang.zhou b3c400782a plugin:modify schema file path when update plugins 2024-09-29 13:31:26 +08:00
fengzeroz fa70f58562 Merge pull request #2242 from hxy7yx/main-1
update mqtt schema
2024-09-26 14:14:44 +08:00
hxy7yx 7ede720318 update mqtt schema 2024-09-26 13:33:59 +08:00
fengzeroz d728490a7a Merge pull request #2233 from ZhouBox/feat-sample
feat(otel):add sample support
2024-09-25 15:00:18 +08:00
xiang.zhou efefc1233c otel:mqtt trace and update uuid imple 2024-09-25 13:21:26 +08:00
xiang.zhou 7636aa849c otel:rm log 2024-09-24 15:48:16 +08:00
fengzeroz 737107eae8 Merge pull request #2238 from fengzeroz/main
custom type
2024-09-24 15:16:35 +08:00
fengzero c4921a0fd4 custom type 2024-09-24 06:16:35 +00:00
xiang.zhou bbe24b812b otel:del cache 2024-09-23 17:41:47 +08:00
xiang.zhou edd062a393 rm debug log 2024-09-23 17:41:38 +08:00
xiang.zhou 6fa636f45d feat(otel):add sample support 2024-09-23 15:15:42 +08:00
fengzero 3d0d427c81 custom type 2024-09-23 06:49:16 +00:00
fengzeroz 00b82696e8 Merge pull request #2229 from fengzeroz/main
rm file plugin
2024-09-20 10:52:02 +08:00
fengzero a84414aab5 rm file plugin 2024-09-20 02:32:14 +00:00
fengzero cc5b772819 fix str cpy 2024-09-20 02:00:40 +00:00
fengzeroz ea772a0517 Merge pull request #2228 from fengzeroz/main
meta size 8
2024-09-19 14:42:02 +08:00
fengzero c0c66d2d64 meta size 8 2024-09-19 06:38:52 +00:00
fengzeroz 24fffc48c1 Merge pull request #2220 from hxy7yx/main-1
fix(read paginate):handle only_write tags
2024-09-19 10:46:30 +08:00
hxy7yx 2143f91220 fix(read paginate):handle only_write tags 2024-09-18 15:54:38 +08:00
fengzeroz ae693ada96 Merge pull request #2216 from ZhouBox/main
otel:add new api and modify old api
2024-09-14 10:38:24 +08:00
xiang.zhou 8301028684 otel:add new api and modify old api 2024-09-14 10:28:03 +08:00
fengzeroz 0f3974e1b6 Merge pull request #2214 from hxy7yx/main-1
ft(mqtt):upload driver states
2024-09-14 10:23:19 +08:00
hxy7yx 402f8b48e9 ft(mqtt):upload driver states 2024-09-12 16:02:22 +08:00
fengzeroz 27d021b972 Merge pull request #2213 from fengzeroz/main
read/write file
2024-09-12 15:30:19 +08:00
fengzero 9c1baebb0d read/write file 2024-09-12 06:59:42 +00:00
fengzeroz 1f0355f8ca Merge pull request #2212 from hxy7yx/mqtt
feat(mqtt):upload driver states
2024-09-12 13:51:17 +08:00
fengzeroz 6dde07b35e Merge pull request #2211 from ZhouBox/main
feat(otel):comm rest api,mqtt,ekuiper
2024-09-12 10:51:46 +08:00
fengzeroz 2f74cba1a2 Merge pull request #2210 from hxy7yx/mqtt5
MQTT plugin defaults to v311, Azure&AWS fixes v311
2024-09-12 10:37:53 +08:00
hxy7yx e4f6409bfa feat(mqtt):upload driver states 2024-09-12 10:09:44 +08:00
xiang.zhou 8ff3dc5f16 otel:api modify 2024-09-11 16:41:12 +08:00
xiang.zhou 9095e3bd32 feat(otel):comm rest api,mqtt,ekuiper 2024-09-10 14:54:29 +08:00
hxy7yx f0638afa3b mqtt default version: V311 2024-09-10 11:23:10 +08:00
fengzeroz b91c10dedb Merge pull request #2204 from fengzeroz/main
ci: clang-format
2024-09-09 10:57:45 +08:00
fengzero 44ee1fcfd0 format 2024-09-09 02:54:13 +00:00
fengzero 3d60180098 ci: clang-format 2024-09-09 02:52:51 +00:00
fengzeroz 85b5211958 Merge pull request #2201 from hxy7yx/mqtt5
MQTT default version v5
2024-09-09 10:38:57 +08:00
hxy7yx a64e844349 MQTT default version v5 2024-09-06 13:50:03 +08:00
fengzeroz bcbdeb3433 Merge pull request #2200 from hxy7yx/mqtt5
mqtt supports otel
2024-09-06 10:07:54 +08:00
hxy7yx ef2099414e mqtt supports otel 2024-09-05 11:56:31 +08:00
fengzeroz 2eb8801db2 Merge pull request #2199 from ZhouBox/main
feat(otel):new api
2024-09-05 10:41:29 +08:00
fengzeroz 8e4c5eba39 Merge pull request #2198 from hxy7yx/main-1
feat(mqtt): support mqtt v5 for otel tracing
2024-09-05 10:24:29 +08:00
xiang.zhou b17274917c feat(otel):new api 2024-09-04 17:41:31 +08:00
hxy7yx 4981173cee feat(mqtt): support mqtt v5 for otel tracing 2024-09-04 16:46:52 +08:00
fengzeroz 79f6c300cb Merge pull request #2197 from emqx/QQDQ-patch-1
Update README.md
2024-09-03 16:38:32 +08:00
QQDQ 7f981841b8 Update README.md 2024-09-03 16:18:27 +08:00
fengzeroz d8f51626bf Merge pull request #2195 from ZhouBox/main
add api about doing with basic data type
2024-08-30 16:56:39 +08:00
fengzeroz 7f63995367 Merge pull request #2194 from ZhouBox/feat-otel
feat(otel):add traces
2024-08-30 15:32:06 +08:00
xiang.zhou d4b2feebe4 add api about doing with basic data type 2024-08-29 14:28:41 +08:00
xiang.zhou fe772b6e63 feat(otel):add traces 2024-08-29 10:50:48 +08:00
fengzeroz 2364e82861 Merge pull request #2184 from hxy7yx/main-1
chore(mqtt): add reason for connection & disconnection
2024-08-20 16:20:08 +08:00
hxy7yx 49a1f7891e chore(mqtt): add reason for connection & disconnection 2024-08-20 14:40:02 +08:00
fengzeroz cbb3f3e8b5 Merge pull request #2176 from hxy7yx/main-1
guard against empty mqtt subscription topic
2024-08-15 10:03:25 +08:00
hxy7yx 2b162b8479 guard against empty mqtt subscription topic 2024-08-14 14:46:49 +08:00
fengzeroz 2f13b1f97a Merge pull request #2173 from hxy7yx/main-1
fix(modbus):clear value when update
2024-08-07 10:11:39 +08:00
fengzeroz 824cb12678 Merge pull request #2171 from eeff/main
feat(mqtt): remove mqtt cache db when node deleted
2024-08-07 10:11:19 +08:00
hxy7yx 7a7ff99e60 fix(modbus):clear value when update 2024-08-02 17:14:52 +08:00
eeff bd0f786406 feat(mqtt): remove mqtt cache db when node deleted 2024-08-01 15:50:49 +08:00
fengzeroz 333d4398c6 Merge pull request #2168 from hxy7yx/main-2
feat(modbus tcp):configure optional message header verification
2024-07-29 14:31:12 +08:00
fengzeroz ac664f90fc Merge pull request #2150 from hxy7yx/main-1
feat:core subscription supports filtering error tags
2024-07-29 14:30:13 +08:00
hxy7yx 5eb09ce853 feat(modbus tcp):configure optional message header verification 2024-07-29 10:58:35 +08:00
fengzeroz b74e23fc14 Merge pull request #2167 from eeff/main
chore: clean setting description
2024-07-29 10:00:41 +08:00
eeff cc84c7f620 chore(mqtt): clean setting description 2024-07-28 23:25:09 +08:00
eeff 5cf55b8a71 chore(modbus): clean setting description 2024-07-28 23:19:54 +08:00
hxy7yx 8e3ee3fde4 feat:core subscription supports filtering error messages 2024-07-26 15:30:51 +08:00
fengzeroz 384676b522 Merge pull request #2166 from fengzeroz/main
Revert "cyclic reporting does not detect change"
2024-07-26 15:24:39 +08:00
fengzero c107ea22fc Revert "cyclic reporting does not detect change"
This reverts commit b819021a6f.
2024-07-26 07:22:35 +00:00
fengzeroz 59f814134f Merge pull request #2164 from fengzeroz/main
2.10.0 alpha
2024-07-24 16:07:00 +08:00
fengzero 0c644d39e7 fix plugin ut 2024-07-24 08:00:47 +00:00
fengzeroz 4b333976a7 Merge pull request #2163 from ZhouBox/main
feat(rest):add api about configure status
2024-07-24 13:59:30 +08:00
fengzero b819021a6f cyclic reporting does not detect change 2024-07-24 05:58:28 +00:00
fengzero 81a742ac00 2.10.0 alpha 2024-07-24 05:57:01 +00:00
xiang.zhou 0108a36236 feat(rest):add api about configure status 2024-07-24 13:29:17 +08:00
fengzeroz c2656ae4f0 Merge pull request #2159 from hxy7yx/main-3
fix:correction of field name length detection
2024-07-24 10:25:00 +08:00
fengzeroz f831468ade Merge pull request #2155 from hxy7yx/main-2
fix(modbus):reconnect when recv error messages
2024-07-24 10:24:22 +08:00
hxy7yx e108f9d543 fix:correction of field name length detection 2024-07-23 17:24:39 +08:00
hxy7yx 824f856b85 fix(modbus):reconnect when recv error messages 2024-07-23 16:30:03 +08:00
fengzeroz d653145ac8 Merge pull request #2142 from hxy7yx/main-1
refactor(read paginate): optimize efficiency without filtering errors
2024-07-18 10:12:13 +08:00
hxy7yx 216d02e35f refactor(read paginate): optimize efficiency without filtering errors 2024-07-15 14:35:05 +08:00
fengzeroz c723a113dc Merge pull request #2141 from gc87/scan-tags
fix(scan): add ctx field to scan ft api
2024-07-15 14:21:09 +08:00
gc87 1acd50c821 fix(scan): add ctx field to scan api 2024-07-15 13:58:16 +08:00
fengzeroz cdd4ff8ae0 Merge pull request #2137 from gc87/scan-tags
fix(scan): rm tags type field
2024-07-12 09:42:58 +08:00
gc87 b7f6512b84 fix(scan): rm tags type field 2024-07-11 17:04:22 +08:00
fengzeroz 0624437afb Merge pull request #2132 from gc87/scan-tags
fix(scan): add ctx field
2024-07-10 16:02:53 +08:00
fengzeroz 34bfac36af Merge pull request #2133 from eeff/main
fix(core): set metric to init value when reset
2024-07-10 10:08:48 +08:00
gc87 3f72cfbed2 fix(scan): tag type 2024-07-09 23:02:10 +08:00
eeff 3e0ba09495 fix(core): set metric to init value when reset 2024-07-09 15:17:58 +08:00
fengzeroz 1c8bac3721 Merge pull request #2130 from eeff/main
fix(core): event loop check stop flag
2024-07-09 11:33:07 +08:00
gc87 005439c1da fix(scan): add ctx field 2024-07-08 17:16:56 +08:00
eeff 501d68a78e fix(core): event loop check stop flag 2024-07-08 10:17:39 +08:00
fengzeroz 5e25f90556 Merge pull request #2120 from eeff/main
chore: add error code `NEU_ERR_BODY_TOO_BIG`
2024-07-01 09:56:57 +08:00
eeff 12c93d175c chore: add error code NEU_ERR_BODY_TOO_BIG 2024-06-27 00:03:01 +08:00
fengzeroz 1ebafcc429 Merge pull request #2116 from hxy7yx/main-2
refactor(modbus)
2024-06-25 14:21:37 +08:00
fengzeroz 6c16dae529 Merge pull request #2105 from hxy7yx/main-1
modbus: support read sync
2024-06-25 14:20:55 +08:00
hxy7yx 6c508f9f00 refactor(modbus) 2024-06-21 16:18:57 +08:00
fengzeroz 9b861fadc8 Merge pull request #2114 from ZhouBox/main
add notice log about node,group,sub
2024-06-21 10:09:14 +08:00
xiang.zhou 40b87e1605 add notice log about node,group,sub 2024-06-18 17:00:00 +08:00
fengzeroz cdf3b4af31 Merge pull request #2106 from hxy7yx/main-2
rename precision when read floating-tag
2024-06-18 13:59:47 +08:00
hxy7yx cf6bf33a2c rename precision when read floating-tag 2024-06-18 13:46:54 +08:00
hxy7yx 997ac04c63 modbus: support read sync 2024-06-17 15:59:05 +08:00
fengzeroz e0ea70ddc6 Merge pull request #2099 from hxy7yx/main-2
fix(test read): stop group timer while testing
2024-06-14 15:29:51 +08:00
fengzeroz 412003f9db Merge pull request #2101 from hxy7yx/main-1
fix(manager): exit after sending uninit msg failed
2024-06-14 15:28:39 +08:00
hxy7yx 18e0d51373 fix(manager): exit even if send uninit msg failed 2024-06-14 14:58:42 +08:00
hxy7yx 12d53feb9c fix(test read): stop group timer while testing 2024-06-14 11:12:29 +08:00
fengzeroz ee589eeb7f Merge pull request #2094 from ZhouBox/main
display optimization for float and double types when setting bias
2024-06-14 09:52:25 +08:00
fengzeroz 0ee05461fd Merge pull request #2092 from eeff/main
fix(core): read_report_group add tag bias
2024-06-14 09:51:57 +08:00
eeff cd4daa52b9 fix(core): read_report_group add tag bias 2024-06-13 14:57:13 +08:00
xiang.zhou 682b499279 display optimization for float and double types when setting bias 2024-06-13 14:55:19 +08:00
fengzeroz a872ad3460 Merge pull request #2089 from hxy7yx/main-1
fix(write): write *.0
2024-06-13 13:46:06 +08:00
hxy7yx 62de43327a fix(write): write *.0 2024-06-13 10:54:50 +08:00
fengzeroz 492bafa0d7 Merge pull request #2087 from hxy7yx/main-1
ft(test read)
2024-06-12 09:40:52 +08:00
fengzeroz 5a548ff634 Merge pull request #2088 from eeff/main
feat(core): add `interval` field to struct neu_plugin_group
2024-06-12 09:40:36 +08:00
eeff d8f7980586 feat(core): add interval field to struct neu_plugin_group 2024-06-12 01:02:39 +08:00
hxy7yx 71216aeceb ft(test read) 2024-06-11 17:57:19 +08:00
fengzeroz f51e8817ff Merge pull request #2086 from gc87/jwt-exp
fix(jwt): add jwt encode for test
2024-06-11 16:15:35 +08:00
gc87 46ba471c9b fix(jwt): add jwt encode for test 2024-06-11 15:33:04 +08:00
fengzeroz 6689c31f72 Merge pull request #2076 from hxy7yx/main-1
feat(core & modbus tcp): test read tag
2024-06-11 14:35:42 +08:00
fengzeroz 6eaf49957b Merge pull request #2082 from gc87/jwt-exp
fix(jwt): replacing expired tokens
2024-06-11 14:33:22 +08:00
gc87 14aeaa0688 fix(jwt): replacing expired tokens 2024-06-11 14:17:36 +08:00
fengzeroz a09b0f773c Merge pull request #2080 from ZhouBox/main
async queue:add api about length
2024-06-07 15:44:00 +08:00
xiang.zhou 64fe2e1994 async queue:add api about length 2024-06-07 15:24:55 +08:00
hxy7yx 5925bf257a feat(core & modbus tcp): test read tag 2024-06-07 14:51:25 +08:00
fengzeroz 4b0532fedc Merge pull request #2054 from hxy7yx/main-3
feat(read):support pagination and filter(error) when reading tags
2024-06-05 15:42:21 +08:00
fengzeroz f5a3e0fc3b Merge pull request #2070 from fengzeroz/main
set node start if loading node state is ready
2024-06-05 14:54:18 +08:00
fengzero f9770052c2 fix init msg state init 2024-06-05 06:36:13 +00:00
fengzero 13a953a8cb start node if node state is ready 2024-06-05 06:30:26 +00:00
fengzeroz 584cd3c77d Merge pull request #2067 from eeff/main
feat(mqtt): schema client-id and write req/resp topic default value
2024-06-05 10:43:26 +08:00
eeff 2a686ed283 feat(mqtt): schema client-id and write req/resp topic default value 2024-06-05 10:40:02 +08:00
hxy7yx 411cdc4f02 feat(read):support pagination and filter(error) when reading tags 2024-06-04 15:53:12 +08:00
fengzeroz a5f912b658 Merge pull request #2058 from ZhouBox/main
display optimization for float and double types
2024-06-03 17:24:14 +08:00
xiang.zhou c768652274 display optimization for float and double types 2024-06-03 17:09:24 +08:00
fengzeroz d71610da30 Merge pull request #2050 from hxy7yx/main-3
fix: memory leak
2024-05-31 15:12:56 +08:00
hxy7yx c7c60e461d fix: memory leak 2024-05-31 14:40:22 +08:00
fengzeroz 085f9dcc33 Merge pull request #2044 from fengzeroz/main
fix(update): update error when value is error
2024-05-30 11:24:24 +08:00
fengzero ac779c9f87 fix(update): update error when value is error 2024-05-30 03:11:27 +00:00
fengzeroz bcf21ab507 Merge pull request #2039 from hxy7yx/main-1
check and handle NaN for float and double in read and report operations
2024-05-29 17:29:50 +08:00
hxy7yx 8b5bd7f92a check and handle NaN for float and double in read and report operations 2024-05-29 16:55:02 +08:00
fengzeroz 859c84ceae Merge pull request #2033 from hxy7yx/main-3
metric: reset send&recv bytes when restart node
2024-05-29 14:48:14 +08:00
fengzeroz c48ce41298 Merge pull request #2035 from eeff/main
fix: update trans_data metric only when plugin is started
2024-05-29 14:47:36 +08:00
eeff ffd149a970 fix(mqtt): update trans_data metric only when plugin is started 2024-05-29 14:27:52 +08:00
eeff 2b3f2f94d4 fix(ekuiper): update trans_data metric only when plugin is started 2024-05-29 14:27:09 +08:00
hxy7yx d851eb1ad5 metric: reset send&recv bytes when restart node 2024-05-29 13:35:05 +08:00
fengzeroz 0c346d0542 Merge pull request #2008 from gc87/scan-tags
feat: add scan tags reqest & response
2024-05-24 09:48:44 +08:00
fengzeroz 4c73f227f7 Merge pull request #2013 from ZhouBox/main
driver:change log level
2024-05-24 09:48:12 +08:00
fengzeroz 75ef81e21c Merge pull request #2016 from hxy7yx/main-2
fix(write): write *.0
2024-05-24 09:47:56 +08:00
hxy7yx eb243d6cfc feat(read): response precision when read float or double tags 2024-05-23 17:55:38 +08:00
hxy7yx c361580254 fix(write): write *.0 2024-05-23 12:01:34 +08:00
xiang.zhou 22ddf97eaa driver:change log level 2024-05-21 15:20:47 +08:00
gc87 1d9d5b2181 feat: add scan tags api 2024-05-20 17:55:55 +08:00
gc87 0effd044d2 feat: add scan tags reqest & response 2024-05-20 16:01:53 +08:00
fengzeroz 7461693cff Merge pull request #2004 from eeff/main
feat(aws-iot): remove config default value
2024-05-17 15:52:37 +08:00
eeff 8dd2d1d9c0 feat(aws-iot): remove config default value 2024-05-17 15:43:22 +08:00
fengzeroz 86e2ed532f Merge pull request #1992 from hxy7yx/main-1
check if the written value conforms to the standard
2024-05-17 10:21:26 +08:00
fengzeroz d1ef1c06ab Merge pull request #1996 from ZhouBox/main
prgfile:add del flag
2024-05-16 14:15:55 +08:00
xiang.zhou 20855be480 prgfile:add del flag 2024-05-16 13:16:45 +08:00
hxy7yx 0b19e0b17b check if the written value conforms to the standard 2024-05-15 17:04:29 +08:00
fengzeroz baf1cbe3d4 Merge pull request #1991 from ZhouBox/main
prgfile:modify msg struct about upload prgfile
2024-05-15 16:35:09 +08:00
xiang.zhou 7183e37d2e prgfile:modify msg struct about upload prgfile 2024-05-15 16:27:41 +08:00
fengzeroz 6bac9517a6 Merge pull request #1990 from ZhouBox/main
dlclose dl when release version
2024-05-15 16:17:44 +08:00
xiang.zhou 11272bcc2a dlclose dl when release version 2024-05-15 15:53:06 +08:00
fengzeroz c86adfb1a9 Merge pull request #1984 from ZhouBox/main
fixbug:no close dl when del node
2024-05-14 16:58:35 +08:00
xiang.zhou df1c7f38e7 check handle 2024-05-14 15:58:57 +08:00
xiang.zhou 7a10c697d0 fixbug:no close dl when del node 2024-05-14 15:38:32 +08:00
fengzeroz 2e7c046116 Merge pull request #1978 from hxy7yx/main-1
ft:test launch configuration
2024-05-10 13:54:47 +08:00
hxy7yx c3309a5a29 ft:test launch configuration 2024-05-09 10:31:41 +08:00
fengzeroz 263c996991 Merge pull request #1977 from eeff/main
test(azure): add ft
2024-05-09 09:45:18 +08:00
eeff 68ca03f197 ci: Azure IoT plugin codecov report 2024-05-07 15:35:40 +08:00
eeff c39747b585 test(azure): add ft 2024-05-07 14:26:52 +08:00
eeff f2d851a5fa fix(azure): clean configuration keys 2024-05-07 14:26:52 +08:00
eeff ea8369ae98 feat(core): mqtt client subscription support wildcard 2024-05-07 14:26:52 +08:00
fengzeroz 3e1e6d0269 Merge pull request #1976 from hxy7yx/main-1
increase test coverage
2024-05-07 09:43:55 +08:00
hxy7yx f9718bc63a increase test coverage 2024-05-06 18:13:48 +08:00
fengzeroz dc041d102c Merge pull request #1966 from eeff/main
feat: add Azure IoT plugin
2024-05-06 09:46:47 +08:00
fengzeroz 8d6696fb78 Merge pull request #1972 from ZhouBox/main
fixbug:incomplete value print
2024-05-06 09:44:48 +08:00
fengzeroz b7205e1309 Merge pull request #1973 from eeff/eeff/dev
fix(restful): invalid free
2024-05-06 09:43:52 +08:00
eeff 8779c6558f fix(restful): invalid free 2024-04-30 16:27:06 +08:00
xiang.zhou bde8459aa2 fixbug:incomplete value print 2024-04-30 16:23:15 +08:00
eeff 19c44a0735 feat(azure): handle data upload 2024-04-29 16:07:43 +08:00
fengzeroz bbbb7c2b1a Merge pull request #1965 from hxy7yx/main-2
increase test coverage
2024-04-29 15:55:31 +08:00
eeff 8b9d275834 feat: add Azure IoT plugin 2024-04-29 15:06:03 +08:00
fengzeroz d724c52cb2 Merge pull request #1963 from eeff/main
fix: reset metrics when node stopped
2024-04-29 09:43:44 +08:00
hxy7yx 407f650fe1 increase test coverage 2024-04-28 17:35:38 +08:00
eeff 0ac0e0aa86 fix: start/stop group timer when driver started/stopped 2024-04-26 15:40:37 +08:00
eeff 2350cb87b0 feat: add metric type no reset flag 2024-04-26 15:34:24 +08:00
fengzeroz 1e30eea3f6 Merge pull request #1958 from fengzeroz/main
change update log level
2024-04-24 14:34:36 +08:00
fengzero 94023446c7 change update log level 2024-04-24 05:50:19 +00:00
fengzeroz 600e5ee56f Merge pull request #1956 from hxy7yx/main-1
test(tag):fix utf8 check & improve ft cov
2024-04-23 13:43:55 +08:00
fengzeroz f0d19af977 Merge pull request #1957 from eeff/main
chore: add AWS IoT to default plugins
2024-04-23 13:43:20 +08:00
eeff 0b4fed4693 chore: add AWS IoT to default plugins 2024-04-23 11:44:43 +08:00
hxy7yx 4c10678318 test(tag):fix utf8 check & improve ft cov 2024-04-22 15:07:43 +08:00
fengzeroz 719653c132 Merge pull request #1950 from hxy7yx/main-1
ft:add api for modbus address_base configuration
2024-04-22 09:38:13 +08:00
fengzeroz 84e0a6554c Merge pull request #1952 from hxy7yx/main-2
locating core dump files
2024-04-22 09:37:54 +08:00
fengzeroz 24789945d5 Merge pull request #1951 from eeff/main
feat(aws-iot): add aws-iot plugin
2024-04-22 09:36:25 +08:00
hxy7yx 8eb945e5f9 locating core dump files, adapting to NeuronEX 2024-04-19 17:56:51 +08:00
hxy7yx ee6199f2e5 ft:add api for modbus address_base configuration 2024-04-18 16:38:18 +08:00
eeff 27113aaeb4 feat(aws-iot): add aws-iot plugin 2024-04-17 18:25:53 +08:00
eeff ad5fa417ca refactor(mqtt): split plugin interface callback into separate translation unit 2024-04-16 15:27:12 +08:00
fengzeroz 7c611fd151 Merge pull request #1946 from eeff/main
fix(restful): read api invalid free
2024-04-15 15:35:34 +08:00
fengzeroz 0cc9631c9d Merge pull request #1944 from hxy7yx/main-2
remove the default values that carry variables in the schema
2024-04-15 11:38:57 +08:00
fengzeroz 8e0cc62c29 Merge pull request #1943 from hxy7yx/main-1
Revert "check if the written value conforms to the standard"
2024-04-15 11:38:13 +08:00
eeff 020026ae04 fix(restful): read api invalid free 2024-04-15 11:29:38 +08:00
hxy7yx 2a05178800 remove the default values that carry variables in the schema 2024-04-15 11:12:43 +08:00
hxy7yx 245a019082 Revert "check if the written value conforms to the standard"
This reverts commit d9157687ed.
2024-04-15 10:41:58 +08:00
fengzeroz 35d34721a4 Merge pull request #1941 from eeff/main
feat(ekuiper): support write multiple tags
2024-04-12 15:19:33 +08:00
eeff 173aa17eb9 test: add eKuiper write tags ft 2024-04-12 09:44:08 +08:00
eeff 0b67a088c1 feat(ekuiper): support write multiple tags 2024-04-12 09:44:08 +08:00
fengzeroz 6c43d599bc Merge pull request #1936 from eeff/main
feat(core): add tag bias field
2024-04-11 10:08:08 +08:00
eeff 1ed9a7d595 test: add ft for reading tag bias value 2024-04-10 14:42:36 +08:00
eeff 43aec2e5f2 feat(core): return bias tag value if needed 2024-04-10 14:42:36 +08:00
eeff 96bebcd81e test: tag bias ft 2024-04-10 14:42:36 +08:00
eeff bb793f6e14 feat(core): add tag bias field 2024-04-10 14:42:36 +08:00
eeff 7f9aa4cfc8 feat(persist): persist tag bias field 2024-04-10 14:42:36 +08:00
eeff 76914637c9 feat(persist): add SQL schema for tag bias field 2024-04-10 14:42:36 +08:00
fengzeroz 6f0ff2a862 Merge pull request #1937 from hxy7yx/main-1
determine whether tag(string) set endianness
2024-04-10 13:42:39 +08:00
hxy7yx 94d4a8db6e determine whether tag(string) set endianness 2024-04-10 11:47:59 +08:00
Rory 5d26cb1d77 ci: add code cov token in workflow (#1940)
Signed-off-by: Rory Z <16801068+Rory-Z@users.noreply.github.com>
2024-04-10 10:33:37 +08:00
fengzeroz 5f20e6dde3 Merge pull request #1932 from hxy7yx/main-1
supoort configuring endianness in node configuration
2024-03-29 16:57:31 +08:00
hxy7yx fbff7e68fd supoort configuring endianness in node configuration 2024-03-29 16:51:39 +08:00
fengzeroz 05d3e324d7 Merge pull request #1929 from hxy7yx/main-1
determine whether tag set endianness
2024-03-29 14:40:53 +08:00
hxy7yx c09b401e4a determine whether tag set endianness 2024-03-29 13:40:53 +08:00
fengzeroz 3d2d169935 Merge pull request #1924 from eeff/main
fix(ekuiper): check received aio NULL msg
2024-03-27 10:02:36 +08:00
eeff f831e71ad3 fix(ekuiper): check received aio data race 2024-03-26 10:29:47 +08:00
fengzeroz 6a13aeed8a Merge pull request #1923 from fengzeroz/main
ft time type
2024-03-25 10:19:45 +08:00
fengzero 76ce5acaf3 ft time type 2024-03-25 02:17:06 +00:00
fengzeroz 0c2c4fa920 Merge pull request #1919 from eeff/main
feat(core): add NEU_TYPE_TIME and NEU_TYPE_DATA_AND_TIME
2024-03-22 16:27:32 +08:00
eeff e76d24cd15 feat(persist): add SQL schema for NEU_TYPE_TIME/NEU_TYPE_DATA_AND_TIME 2024-03-22 16:08:15 +08:00
eeff a98e9ae904 feat(core): add NEU_TYPE_TIME and NEU_TYPE_DATA_AND_TIME 2024-03-22 16:08:15 +08:00
fengzeroz ce1e53d653 Merge pull request #1916 from fengzeroz/main
fix(conn): check offset reset
2024-03-21 09:54:27 +08:00
fengzero bf5fbdb31d fix(conn): check offset reset 2024-03-21 01:37:23 +00:00
fengzeroz ef991d9a6e Merge pull request #1913 from eeff/main
feat(modbus_tty_simlator): enhance command line interface
2024-03-19 15:45:58 +08:00
eeff 3eba902519 feat(modbus_tty_simlator): enhance command line interface 2024-03-19 11:53:41 +08:00
fengzeroz 7f3b698f69 Merge pull request #1910 from hxy7yx/main-1
move MAX_GROUPS check to validate function
2024-03-15 13:49:46 +08:00
hxy7yx 68d5bcec71 move MAX_GROUPS check to validate function 2024-03-15 12:03:53 +08:00
fengzeroz 5019983ce3 Merge pull request #1905 from hxy7yx/main-1
plugin(modbus): fix invalid message check
2024-03-14 16:57:11 +08:00
hxy7yx afd72ce259 plugin(modbus): fix invalid message check 2024-03-14 16:52:41 +08:00
fengzeroz 840f1aac3d Merge pull request #1900 from hxy7yx/main-1
plugin(modbus): fix modbus rtu slave check
2024-03-13 16:37:13 +08:00
hxy7yx 1d5d6de72c plugin(modbus): fix modbus rtu slave check 2024-03-13 16:15:09 +08:00
fengzeroz 7039ec3055 Merge pull request #1899 from hxy7yx/main-1
ft: move robotframework tests to pytest
2024-03-13 10:29:38 +08:00
hxy7yx 2eb52906e9 ft: move robotframework tests to pytest 2024-03-12 13:37:47 +08:00
fengzeroz c14b1e96e6 Merge pull request #1893 from hxy7yx/main-2
fix(add gtags): correct tag count when tag name conflict
2024-03-08 17:48:21 +08:00
hxy7yx d37bb5aa50 fix(add gtags): correct tag count when tag name conflict 2024-03-08 17:38:45 +08:00
fengzeroz 8ad0fdcf73 Merge pull request #1885 from eeff/main
fix(core): eliminate NEU_REQ_ADD_DRIVERS request data race
2024-03-08 13:52:23 +08:00
eeff 5478fd0fc5 fix(core): eliminate NEU_REQ_ADD_DRIVERS request data race 2024-03-08 11:34:26 +08:00
fengzeroz 74b45c91ee Merge pull request #1882 from eeff/main
fix(core): persist group when adding gtags
2024-03-07 17:34:01 +08:00
eeff 79fca4b18f fix(core): persist group when adding gtags 2024-03-07 17:30:47 +08:00
fengzeroz 142f31beff Merge pull request #1878 from eeff/main
feat(core): set domain socket to block mode and 1s timeout
2024-03-07 11:08:14 +08:00
eeff f17ab92e1f feat(core): set domain socket to block mode and 1s timeout 2024-03-07 10:45:15 +08:00
fengzeroz 32b4a251ae Merge pull request #1877 from fengzeroz/main
test
2024-03-06 18:11:59 +08:00
fengzero 8271e93af6 Revert "test"
This reverts commit 0c9c12c0e4.
2024-03-06 09:47:36 +00:00
fengzeroz a117ee2ba4 Merge pull request #1876 from fengzeroz/main
test
2024-03-06 17:20:24 +08:00
fengzero 0c9c12c0e4 test 2024-03-06 09:14:24 +00:00
fengzeroz b3d1b56084 Merge pull request #1875 from ZhouBox/main
check module name when update plugin
2024-03-06 11:20:58 +08:00
xiang.zhou 26e480982d check module name when update plugin 2024-03-06 10:59:59 +08:00
fengzeroz 45fa293fbc Merge pull request #1869 from eeff/main
fix: notify north app about driver group deletion
2024-03-06 09:44:49 +08:00
eeff b996ad1ac5 fix(ekuiper): handle NEU_REQ_DEL_GROUP 2024-03-05 17:59:41 +08:00
eeff 579df5c023 test(mqtt): data upload when driver group deleted 2024-03-05 17:59:41 +08:00
eeff 025fb8c30a fix(mqtt): handle NEU_REQ_DEL_GROUP 2024-03-05 17:59:41 +08:00
eeff f7d0be2e05 fix(core): notify app about driver group deletion 2024-03-05 17:59:41 +08:00
385 changed files with 114975 additions and 439703 deletions
+24 -64
View File
@@ -9,7 +9,7 @@ on:
jobs:
clang_format_check:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
# checkout
@@ -18,15 +18,16 @@ jobs:
submodules: recursive
- name: Run clang-format style check for C/C++ programs.
uses: DoozyX/clang-format-lint-action@v0.12
uses: DoozyX/clang-format-lint-action@v0.18
with:
source: 'src plugins include tests'
exclude: 'include/neuron/utils/uthash.h include/neuron/utils/utarray.h include/neuron/utils/utlist.h include/neuron/utils/zlog.h'
clangFormatVersion: 10
exclude: 'include/neuron/utils/uthash.h include/neuron/utils/utarray.h include/neuron/utils/utlist.h include/neuron/utils/zlog.h src/otel/trace.pb-c.h src/otel/trace.pb-c.c src/otel/resource.pb-c.h src/otel/resource.pb-c.c src/otel/common.pb-c.c src/otel/common.pb-c.h'
style: file
clangFormatVersion: 10
cppcheck:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-main
steps:
- uses: actions/checkout@v4
@@ -35,13 +36,13 @@ jobs:
- name: cppcheck
run: |
sudo apt install cppcheck
cppcheck --enable=all --error-exitcode=2 --inline-suppr --suppress=missingInclude --suppress=unusedFunction ./plugins ./src
sudo apt install -y cppcheck
cppcheck --enable=all --error-exitcode=2 --inline-suppr --suppress=missingInclude --suppress=unusedFunction --suppress=*:src/otel/trace.pb-c.c --suppress=*:src/otel/common.pb-c.c --suppress=*:src/otel/resource.pb-c.c ./plugins ./src
cppcheck --enable=all --error-exitcode=2 --inline-suppr --suppress=missingInclude --suppress=variableScope ./simulator
ut:
runs-on: ubuntu-20.04
container: ghcr.io/neugates/build:x86_64-main
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-v2.11
steps:
- uses: actions/checkout@v4
@@ -68,64 +69,20 @@ jobs:
./create_cov_report.sh ut
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
verbose: true
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
directory: ./cov_report/
files: cov-ut.info
ft:
runs-on: ubuntu-20.04
container: ghcr.io/neugates/build:x86_64-main
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: compile
run: |
git config --global --add safe.directory $(pwd)
mkdir -p build && cd build
cmake -DUSE_GCOV=1 .. -DCMAKE_TOOLCHAIN_FILE=../cmake/x86_64-linux-gnu.cmake
make -j4
- name: function test
run: |
sudo apt-get install -y mosquitto
mosquitto -v &
python3 -m pip install -U pip
python3 -m pip install -r ft/requirements.txt
python3 -m robot --maxerrorlines=600 -P ft/ -d ft/reports ft
- uses: actions/upload-artifact@v3
with:
name: ft_result
path: |
build/neuron.log
- name: create cov report
run: |
sudo apt-get update
sudo apt-get -y install lcov
mkdir -p cov_report
./create_cov_report.sh ft
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
with:
verbose: true
fail_ci_if_error: true
directory: ./cov_report/
files: cov-ft.info
files: ./cov_report/cov-ut.info
pft:
runs-on: ubuntu-20.04
container: ghcr.io/neugates/build:x86_64-main
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-v2.11
strategy:
matrix:
plugin: [core, ekuiper, modbus, mqtt, metrics]
plugin: [core, ekuiper, modbus, mqtt, azure, metrics]
steps:
- uses: actions/checkout@v4
@@ -134,9 +91,7 @@ jobs:
- name: setup dependencies
run: |
if [ "${{ matrix.plugin }}" = "mqtt" ]; then
sudo apt-get install -y mosquitto
fi
sudo apt-get install -y mosquitto
pip install -U pytest requests prometheus-client gmqtt pynng sniffio
sudo apt-get install -y socat
@@ -153,6 +108,7 @@ jobs:
pytest -s -v tests/ft \
--ignore=tests/ft/app/test_ekuiper.py \
--ignore=tests/ft/app/test_mqtt.py \
--ignore=tests/ft/app/test_azure.py \
--ignore=tests/ft/driver/test_modbus.py \
--ignore=tests/ft/metrics/test_metrics.py
elif [ "${{ matrix.plugin }}" = "ekuiper" ]; then
@@ -161,6 +117,8 @@ jobs:
pytest -s -v tests/ft/driver/"test_modbus.py"
elif [ "${{ matrix.plugin }}" = "mqtt" ]; then
pytest -s -v tests/ft/app/"test_mqtt.py"
elif [ "${{ matrix.plugin }}" = "azure" ]; then
pytest -s -v tests/ft/app/"test_azure.py"
else
pytest -s -v tests/ft/metrics/"test_metrics.py"
fi
@@ -173,8 +131,10 @@ jobs:
./create_cov_report.sh ${{ matrix.plugin }}
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
verbose: true
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
directory: ./cov_report/
files: cov-${{ matrix.plugin }}.info
files: ./cov_report/cov-${{ matrix.plugin }}.info
+22 -12
View File
@@ -8,20 +8,20 @@ on:
- published
env:
VERSION: 2.7.0
VERSION: 2.11.4
UI_VERSION: 2.6.1
BRANCH: main
BRANCH: v2.11
jobs:
cross-build:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
matrix:
arch:
- [aarch64-linux-gnu, aarch64, arm64]
- [arm-linux-gnueabihf, armv4, armhf]
- [x86_64-linux-gnu, x86_64, amd64]
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.11
steps:
- uses: actions/checkout@v4
@@ -52,19 +52,19 @@ jobs:
run: |
./package-sdk.sh -p ${{ matrix.arch[2] }} -n neuron-sdk-$VERSION
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: neuron-sdk
name: neuron-sdk-${{ matrix.arch[2] }}
path: |
neuron-sdk-*.tar.gz
build-debug-sdk:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
matrix:
arch:
- [x86_64-linux-gnu, x86_64, amd64]
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.11
steps:
- uses: actions/checkout@v4
@@ -83,9 +83,9 @@ jobs:
run: |
./package-sdk.sh -p ${{ matrix.arch[2] }} -n neuron-sdk-debug-$VERSION
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: neuron-sdk
name: neuron-sdk-debug
path: |
neuron-sdk-debug-*.tar.gz
@@ -102,9 +102,19 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: neuron-sdk
name: neuron-sdk-debug
- uses: actions/download-artifact@v4
with:
name: neuron-sdk-arm64
- uses: actions/download-artifact@v4
with:
name: neuron-sdk-armhf
- uses: actions/download-artifact@v4
with:
name: neuron-sdk-amd64
- uses: softprops/action-gh-release@v1
env:
+24 -6
View File
@@ -54,14 +54,17 @@ add_custom_target(neuron-version
${CMAKE_CURRENT_SOURCE_DIR}/cmake/neuron-version.cmake)
find_package(nng CONFIG REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(Threads)
if (CMAKE_STAGING_PREFIX)
include_directories(${CMAKE_STAGING_PREFIX}/include)
link_directories(${CMAKE_STAGING_PREFIX}/lib)
include_directories(${CMAKE_STAGING_PREFIX}/include/libxml2)
else()
include_directories(/usr/local/include)
link_directories(/usr/local/lib)
include_directories(/usr/local/include/libxml2)
endif()
set(PERSIST_SOURCES
@@ -69,6 +72,7 @@ set(PERSIST_SOURCES
src/persist/sqlite.c
src/persist/json/persist_json_plugin.c)
aux_source_directory(src/parser NEURON_SRC_PARSE)
aux_source_directory(src/otel NEURON_SRC_OTEL)
set(NEURON_BASE_SOURCES
src/base/tag.c
src/base/neu_plugin_common.c
@@ -89,6 +93,7 @@ set(NEURON_BASE_SOURCES
src/utils/base64.c
src/utils/async_queue.c
src/utils/log.c
src/utils/cid.c
${PERSIST_SOURCES})
if (SMART_LINK)
@@ -103,13 +108,24 @@ if (CLIB)
endif()
if (USE_MQTT_SM)
message(STATUS "use mqtt sm")
add_definitions(-DNEU_USE_MQTT_SM)
endif()
if(CMAKE_BUILD_TYPE STREQUAL "Release")
message(STATUS "build release")
add_definitions(-DNEU_RELEASE)
endif()
add_library(neuron-base SHARED)
target_sources(neuron-base PRIVATE ${NEURON_BASE_SOURCES} ${NEURON_SRC_PARSE})
target_sources(neuron-base PRIVATE ${NEURON_BASE_SOURCES} ${NEURON_SRC_PARSE} ${NEURON_SRC_OTEL})
target_include_directories(neuron-base
PRIVATE include/neuron src)
target_link_libraries(neuron-base libssl.a libcrypto.a)
target_link_libraries(neuron-base nng libzlog.so jansson jwt
${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(neuron-base nng libzlog.so jansson jwt xml2
${CMAKE_THREAD_LIBS_INIT} -lm protobuf-c)
add_dependencies(neuron-base neuron-version)
# dependency imposed by nng
@@ -142,6 +158,10 @@ set(NEURON_SOURCES
plugins/restful/group_config_handle.c
plugins/restful/plugin_handle.c
plugins/restful/version_handle.c
plugins/restful/scan_handle.c
plugins/restful/otel_handle.c
plugins/restful/cid_handle.c
plugins/restful/system_handle.c
plugins/restful/rest.c
plugins/restful/user.c)
@@ -149,7 +169,7 @@ set(CMAKE_BUILD_RPATH ./)
add_executable(neuron)
target_sources(neuron PRIVATE ${NEURON_SOURCES})
target_include_directories(neuron PRIVATE include/neuron src plugins)
target_link_libraries(neuron dl neuron-base sqlite3 -lm)
target_link_libraries(neuron dl neuron-base sqlite3 -lm xml2)
target_link_options(neuron PRIVATE "LINKER:--dynamic-list-data")
#copy file for run
@@ -158,8 +178,6 @@ file(COPY ${CMAKE_SOURCE_DIR}/dev.conf DESTINATION ${CMAKE_BINARY_DIR}/config)
file(COPY ${CMAKE_SOURCE_DIR}/neuron.json DESTINATION ${CMAKE_BINARY_DIR}/config)
file(COPY ${CMAKE_SOURCE_DIR}/.gitkeep DESTINATION ${CMAKE_BINARY_DIR}/logs)
file(COPY ${CMAKE_SOURCE_DIR}/.gitkeep DESTINATION ${CMAKE_BINARY_DIR}/persistence)
file(COPY ${CMAKE_SOURCE_DIR}/neuron.key DESTINATION ${CMAKE_BINARY_DIR}/config)
file(COPY ${CMAKE_SOURCE_DIR}/neuron.pem DESTINATION ${CMAKE_BINARY_DIR}/config)
file(GLOB SQL_SCHEMAS ${CMAKE_SOURCE_DIR}/persistence/*.sql)
file(COPY ${SQL_SCHEMAS} DESTINATION ${CMAKE_BINARY_DIR}/config)
file(COPY ${CMAKE_SOURCE_DIR}/default_plugins.json DESTINATION ${CMAKE_BINARY_DIR}/config)
+27
View File
@@ -55,3 +55,30 @@ $ tar xzf sqlite3.tar.gz --strip-components=1 -C sqlite3
$ cd sqlite3
$ ./configure CFLAGS=-fPIC && make && sudo make install
```
[protobuf](https://github.com/protocolbuffers/protobuf)
```shell
$ wget --no-check-certificate --content-disposition https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protobuf-cpp-3.20.1.tar.gz
$ tar -xzvf protobuf-cpp-3.20.1.tar.gz
$ cd protobuf-3.20.1
$ ./configure --enable-shared=no CFLAGS=-fPIC CXXFLAGS=-fPIC
$ make && sudo make install
```
[protobuf-c](https://github.com/protobuf-c/protobuf-c.git)
```shell
$ git clone -b v1.4.0 https://github.com/protobuf-c/protobuf-c.git
$ cd protobuf-c
$ ./autogen.sh
$ ./configure --disable-protoc --enable-shared=no CFLAGS=-fPIC CXXFLAGS=-fPIC
$ make && sudo make install
```
[libxml2](https://github.com/GNOME/libxml2.git)
```shell
$ git clone -b v2.9.14 https://github.com/GNOME/libxml2.git
$ cd libxml2
$ ./autogen.sh
$ ./configure --enable-shared=no CFLAGS=-fPIC CXXFLAGS=-fPIC
$ make && sudo make install
```
+2 -1
View File
@@ -43,7 +43,8 @@ Next, please follow the [getting started guide](https://neugates.io/docs/en/late
>
> Neuron open source edition only includes Modbus and MQTT drivers.
>
> [Apply for a 15-day trial license](https://www.emqx.com/en/apply-licenses/neuron) to load all drivers.
> If you need more driver protocol support and edge computing services, you can choose Neuron's commercial version [NeuronEX](https://www.emqx.com/en/products/neuronex).
> NeuronEX comes with a built-in license for 30 data tags that can be applied to all southbound drivers. And NeuronEX also supports edge intelligent analysis of industrial data to enable you to quickly gain business insights. To download NeuronEX, please click [here](https://www.emqx.com/en/downloads-and-install/neuronex).
#### More installation options
+1 -1
View File
@@ -1,7 +1,7 @@
set(CMAKE_SYSTEM_NAME Linux)
set(COMPILER_PREFIX aarch64-linux-gnu)
set(CMAKE_SYSTEM_PROCESSOR aarch64)
set(LIBRARY_DIR /home/neuron/main/libs)
set(LIBRARY_DIR /home/neuron/v2.11/libs)
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
+1 -1
View File
@@ -1,7 +1,7 @@
set(CMAKE_SYSTEM_NAME Linux)
set(COMPILER_PREFIX arm-linux-gnueabi)
set(CMAKE_SYSTEM_PROCESSOR armv5tejl)
set(LIBRARY_DIR /home/neuron/main/libs)
set(LIBRARY_DIR /home/neuron/v2.11/libs)
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
+1 -1
View File
@@ -1,7 +1,7 @@
set(CMAKE_SYSTEM_NAME Linux)
set(COMPILER_PREFIX arm-linux-gnueabihf)
set(CMAKE_SYSTEM_PROCESSOR armv7l)
set(LIBRARY_DIR /home/neuron/main/libs)
set(LIBRARY_DIR /home/neuron/v2.11/libs)
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
+1 -1
View File
@@ -1,7 +1,7 @@
set(CMAKE_SYSTEM_NAME Linux)
set(COMPILER_PREFIX x86_64-linux-gnu)
set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(LIBRARY_DIR /home/neuron/main/libs)
set(LIBRARY_DIR /home/neuron/v2.11/libs)
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
+8
View File
@@ -0,0 +1,8 @@
ignore:
- "src/otel/*.pb-c.c"
coverage:
status:
project:
default:
target: auto # the required coverage value
threshold: 0.1% # the leniency in hitting the target
+4
View File
@@ -39,6 +39,10 @@ case $1 in
lcov -c -d build/plugins/mqtt/CMakeFiles/plugin-mqtt.dir -o cov_report/cov-mqtt.info
cd cov_report
gen_trace -a cov-mqtt.info -o cov-mqtt.info;;
(azure)
lcov -c -d build/plugins/mqtt/CMakeFiles/plugin-azure-iot.dir -o cov_report/cov-azure.info
cd cov_report
gen_trace -a cov-azure.info -o cov-azure.info;;
(core)
cd cov_report
gen_trace -o cov-core.info;;
+3 -1
View File
@@ -1,8 +1,10 @@
{
"plugins": [
"libplugin-mqtt.so",
"libplugin-aws-iot.so",
"libplugin-azure-iot.so",
"libplugin-ekuiper.so",
"libplugin-modbus-tcp.so",
"libplugin-modbus-rtu.so"
]
}
}
-258
View File
@@ -1,258 +0,0 @@
import asyncio
import time
from collections import defaultdict, deque
from robot.api import logger
from robot.api.deco import keyword, library
from gmqtt import Client as MQTTClient, Subscription
from gmqtt.mqtt.constants import MQTTv311
ROBOT_AUTO_KEYWORDS = False
@library
class Client:
"""A keyword library for Robot Framework. It provides keywords for
performing various operations on an MQTT broker. See http://mqtt.org/
for more details on MQTT specification.
This library uses gmqtt: Python async MQTT client. For more information
on underlying methods and documentation, see:
https://github.com/wialon/gmqtt
"""
ROBOT_LIBRARY_SCOPE = "GLOBAL"
ROBOT_LIBRARY_VERSION = "0.1.0"
def __init__(self, reconnect_retries=5, reconnect_delay=0):
"""
`reconnect_retries` number of reconnect attempt in case of lost
connections, default to 5
`reconnect_delay` delay between reconnect attemps in seconds,
default to 0
"""
self._client = None
self._reconnect_retries = reconnect_retries
self._reconnect_delay = reconnect_delay
self._messages = defaultdict(deque)
self._subcribed = asyncio.Event()
self._unsubcribed = asyncio.Event()
self._recved = asyncio.Event()
self._run = asyncio.get_event_loop().run_until_complete
@keyword
def connect(
self,
host,
port=1883,
client_id="",
username="",
password="",
keepalive=60,
clean_session=True,
):
"""Connect to an MQTT broker. This is a pre-requisite step for publish
and subscribe keywords.
`host` MQTT broker host
`port` broker port (default 1883)
`client_id` if not specified, a random id is generated
`username` user name, default to ""
`password` user password, default to ""
`keepalive` keepalive in seconds
`clean_session` specifies the clean session flag for the connection
Examples:
Connect to a broker with default port and client id
| Connect | 127.0.0.1 |
Connect to a broker by specifying the port and client id explicitly
| Connect | 127.0.0.1 | 1883 | test.client |
Connect to a broker with clean session flag set to false
| Connect | 127.0.0.1 | clean_session=${false} |
"""
client = MQTTClient(client_id, clean_session=clean_session)
client.on_connect = self._on_connect
client.on_message = self._on_message
client.on_disconnect = self._on_disconnect
client.on_subscribe = self._on_subscribe
client.on_unsubscribe = self._on_unsubscribe
client.set_config(
{
"reconnect_retries": self._reconnect_retries,
"reconnect_delay": self._reconnect_delay,
}
)
self._client = client
self._run(self._client.connect(host, port, version=MQTTv311))
@keyword
def disconnect(self):
"""Disconnect from MQTT Broker.
Example:
| Disconnect |
"""
self._run(self._client.disconnect())
self._messages.clear()
@keyword
def unsubscribe_all_and_clear_messages(self):
"""Unsubscribe all subscriptions and clear all messages in queue."""
for topic in self._messages:
self.unsubscribe(topic)
self._messages.clear()
@keyword
def subscribe(self, topic, qos=0, timeout=1):
"""Subscribe to a topic and return a message payload received
within the specified time.
`topic` topic to subscribe to
`qos` quality of service for the subscription, default to QoS 0
`timeout` duration of subscription, default to 1 second
Examples:
Subscribe and get a list of all messages received within 5 seconds
| ${messages}= | Subscribe | test/test | qos=1 | timeout=5 |
"""
timeout = 1 if timeout < 1 else timeout
self._client.subscribe(Subscription(topic, qos))
if self._wait(self._subcribed, timeout=timeout):
raise Exception(
"MQTT client subscribe timeout topic=%s qos=%s" % (topic, qos))
logger.info("MQTT client subscribed to topic=%s qos=%s" % (topic, qos))
@keyword
def unsubscribe(self, topic, timeout=1):
"""Unsubscribe the client from the specified topic.
`topic` topic to unsubscribe from
`timeout` duration of unsubscription, default to 1 second
Example:
| Unsubscribe | test/mqtt_test |
"""
timeout = 1 if timeout < 1 else timeout
self._client.unsubscribe(topic)
if self._wait(self._unsubcribed, timeout=timeout):
raise Exception("MQTT client unsubscribe timeout topic=%s" % topic)
logger.info("MQTT client unsubscribed topic=%s" % topic)
@keyword
def publish(self, topic, payload, qos=0, retain=False):
"""Publish a message to a topic with specified qos and retained flag.
It is required that a connection has been established using `Connect`
keyword before using this keyword.
`topic` topic to which the message will be published
`paylod` message payload to publish
`qos` qos of the message, default to QoS 0
`retain` retained flag
Examples:
| Publish | test/test | test message | 1 | ${false} |
"""
self._client.publish(topic, payload, qos=qos, retain=retain)
@keyword
def listen(self, topic, timeout=1):
"""Listen to a topic and return a message payload received within the
specified time. Requires an Subscribe to have been called previously.
`topic` topic to listen to
`timeout` duration to listen, default to 1 second
Examples:
Listen and get a message received within 5 seconds
| ${messages}= | Listen | test/test | timeout=5 |
"""
timeout = 1 if timeout < 1 else timeout
start = time.time()
while True:
if topic in self._messages and self._messages[topic]:
msg = self._messages[topic].popleft()
return msg
if (
self._wait(self._recved, timeout=timeout)
or (time.time() - start) >= timeout
):
break
def _wait(self, event, timeout):
"""Waits for the given event within timeout.
Returns true on timeout, false otherwise."""
try:
self._run(asyncio.wait_for(event.wait(), timeout))
event.clear()
except asyncio.TimeoutError:
return True
return False
def _on_connect(self, client, flags, rc, properties):
logger.info("MQTT client connected")
def _on_message(self, client, topic, payload, qos, properties):
logger.info("MQTT client received: topic=%s qos=%s payload=%s" %
(topic, qos, payload))
self._messages[topic].append(payload.decode())
self._recved.set()
return 0
def _on_disconnect(self, client, packet, exc=None):
logger.info("MQTT client disconnected")
def _on_subscribe(self, client, mid, qos, properties):
self._subcribed.set()
def _on_unsubscribe(self, client, mid, granted_qos):
self._unsubcribed.set()
if __name__ == "__main__":
# import logging
# logging.basicConfig(level=logging.DEBUG)
host = "127.0.0.1"
topic = "test/test_mqtt"
client = Client()
client.connect(host)
client.subscribe(topic)
for i in range(3):
client.publish(topic, "hello world %s" % i)
msg = client.listen(topic)
print("MQTT client receive: topic=%s msg=%s" % (topic, msg))
client.unsubscribe(topic)
client.disconnect()
-235
View File
@@ -1,235 +0,0 @@
from os import remove
import os
import random
import subprocess
import shutil
import time
def prepare_persistence_dir():
os.system("mkdir -p build/persistence")
class Neuron(object):
process = 0
profiler_process = None
def __init__(self):
pass
def Start_Neuron(self):
prepare_persistence_dir()
self.process = subprocess.Popen(['./neuron', '--log'], cwd='build/')
return self.process
def Stop_Neuron(self, remove_persistence_data=True):
if self.profiler_process is not None:
# wait for plotting
time.sleep(5)
self.process.kill()
if remove_persistence_data:
os.system("rm build/persistence/sqlite.db")
prepare_persistence_dir()
def End_Neuron(self, process):
process.kill()
def Remove_Persistence(self):
os.system("rm build/persistence/sqlite.db")
prepare_persistence_dir()
def Profile_Neuron(self, interval, result_dir):
cmd = [
'psrecord', str(self.process.pid),
'--interval', str(interval),
'--plot', result_dir + '/cpu_mem.svg'
]
self.profiler_process = subprocess.Popen(cmd)
class Tool(object):
def __init__(self):
pass
def Array_Len(self, array):
return len(array)
class Plugin(object):
def __init__(self):
pass
def Get_Plugin_By_Name(self, splugins, name):
for plugin in splugins:
if plugin['name'] == name:
return plugin['id']
return 0
def Plugin_With_Name_Sholud_Exist(self, splugins, name):
assert 0 != self.Get_Plugin_By_Name(splugins, name)
def Plugin_With_Name_Should_Not_Exist(self, splugins, name):
assert 0 == self.Get_Plugin_By_Name(splugins, name)
class GrpConfig(object):
def __init__(self):
pass
def Get_Interval_In_Group_Config(self, gconfigs, gname):
for gconfig in gconfigs[0]:
if gconfig['name'] == gname:
return gconfig['interval']
return 0
def Group_Config_Size(self, gconfigs):
size = 0
for gconfig in gconfigs[0]:
size = size + 1
return size
def Get_Random_Group_Config(self, gconfigs):
return random.choice(gconfigs)['name']
def Group_Config_Check(self, gconfigs, name, interval):
ret = -1
for gconfig in gconfigs:
if gconfig['name'] == name:
if gconfig['interval'] == int(interval):
ret = 0
break
return ret
def Get_Group_Config_By_Name(self, sgconfigs, name):
for gconfig in sgconfigs:
if gconfig['name'] == name:
return gconfig['name']
return 0
class Node(object):
def __init__(self):
pass
def Get_Node_By_Name(self, snodes, name):
for node in snodes:
if node['name'] == name:
return True
return False
def Node_Should_Exist(self, snodes, name):
assert True == self.Get_Node_By_Name(snodes, name)
def Node_Should_Not_Exist(self, snodes, name):
assert False == self.Get_Node_By_Name(snodes, name)
def Node_With_Name_Should_Not_Exist(self, snodes, name):
assert 0 == self.Get_Node_By_Name(snodes, name)
def Get_Random_Node(self, snodes):
return random.choice(snodes)['id']
class Tag(object):
def __init__(self):
pass
def Tag_Check(self, tags, name, type, group_config_name, attribute, address):
ret = -1
for tag in tags:
if tag['name'] == name:
if tag['type'] == int(type) and tag['group_config_name'] == group_config_name and tag['attribute'] == int(attribute) and tag['address'] == address:
ret = 0
break
return ret
def Tag_Find_By_Name(self, tags, name):
for tag in tags:
if tag['name'] == name:
return tag
return None
class Subscribe(object):
def __init__(self):
pass
def Subscribe_Check(self, groups, node_id, group_config_name):
ret = -1
for group in groups:
if group['node_id'] == int(node_id) and group['group_config_name'] == group_config_name:
ret = 0
break
return ret
class Read(object):
def __init__(self):
pass
def Compare_Tag_Value_Bool(self, tags, name, value):
ret = -1
for tag in tags:
if tag['name'] == name:
if isinstance(value, str):
if (tag['value'] == False and value.lower() == "false" or
tag['value'] == True and value.lower() == "true"):
ret = 0
elif tag['value'] == int(value):
ret = 0
break
return ret
def Compare_Tag_Value_Int(self, tags, name, value):
ret = -1
for tag in tags:
if tag['name'] == name:
if int(tag['value']) == int(value):
ret = 0
break
return ret
def Compare_Tag_Value_Float(self, tags, name, value):
ret = -1
for tag in tags:
if tag['name'] == name:
if float(tag['value']) <= float(value) + 0.1 and float(tag['value']) >= float(value) - 0.1:
ret = 0
break
return ret
def Compare_Tag_Value_String(self, tags, name, value):
ret = -1
for tag in tags:
if tag['name'] == name:
if tag['value'] == str(value):
ret = 0
break
return ret
def Compare_Tag_Value_Strings(self, tags, name, value):
ret = -1
for tag in tags:
if tag['name'] == name:
if "\"" + tag['value'] + "\"" == str(value):
ret = 0
break
return ret
def Check_Tag_Error(self, tags, name, value):
ret = -1
for tag in tags:
if tag['name'] == name:
if int(tag['error']) == int(value):
ret = 0
break
return ret
-35
View File
@@ -1,35 +0,0 @@
# Functional test
Functional testing uses the robotframework automated testing framework, providing templates for each test case of the northbound APP and southbound DRIVER types.
Testing is divided into the following categories.
|Test case|Description|
|-----|----------|
|Core interface test|Mainly including the addition, deletion, modification, query, subscription, and other operations of the HTTP API interface for core data(PLUGIN, NODE, GROUP, TAG)|
|Southbound DRIVER test||
|Northbound APP test||
|Plugin specific test case|Such as OPC UA specific device discovery, can different devices be connected normally|
To run all functional testers
Enter the neuron/build directory.
Install Mosquito software.
```shell
$ sudo apt-get install -y mosquitto
```
Start the mosquitto server.
```shell
$ mosquitto -v &
```
Install requirements.
```shell
$ python3 -m pip install -U pip
$ python3 -m pip install -r ft/requirements.txt
```
Run functional tests and generate test reports.
```shell
$ python3 -m robot --maxerroelines=600 -P ft/ -d ft/reports ft
```
@@ -1,10 +0,0 @@
{
"nodes": [
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0000",
"state": 1
}
]
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0000",
"adapter_name": "modbus-tcp-0000"
}
@@ -1,7 +0,0 @@
{
"params": {
"host": "127.0.0.1",
"port": 60502,
"connection_mode": 0
}
}
@@ -1,11 +0,0 @@
{
"params": {
"req-topic": "Neuron/req",
"res-topic": "Neuron/resp",
"ssl": "false",
"host": "127.0.0.1",
"port": 1883,
"username": "",
"password": ""
}
}
@@ -1,10 +0,0 @@
{
"subscriptions": [
{
"sub_adapter_name": "mqtt-0000",
"group_config_name": "group-0000",
"src_adapter_name": "modbus-tcp-0000",
"read_interval": 1000
}
]
}
@@ -1,3 +0,0 @@
{
"plugins": []
}
@@ -1,10 +0,0 @@
{
"nodes": [
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0000",
"state": 1
}
]
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0000",
"adapter_name": "modbus-tcp-0000"
}
@@ -1,7 +0,0 @@
{
"params": {
"host": "127.0.0.1",
"port": 60502,
"connection_mode": 0
}
}
@@ -1,11 +0,0 @@
{
"params": {
"req-topic": "Neuron/req",
"res-topic": "Neuron/resp",
"ssl": "false",
"host": "127.0.0.1",
"port": 1883,
"username": "",
"password": ""
}
}
@@ -1,10 +0,0 @@
{
"subscriptions": [
{
"sub_adapter_name": "mqtt-0000",
"group_config_name": "group-0000",
"src_adapter_name": "modbus-tcp-0000",
"read_interval": 1000
}
]
}
@@ -1,3 +0,0 @@
{
"plugins": []
}
-124
View File
@@ -1,124 +0,0 @@
{
"nodes": [
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0000",
"state": 1
},
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0001",
"state": 1
},
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0002",
"state": 1
},
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0003",
"state": 1
},
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0004",
"state": 1
},
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0005",
"state": 1
},
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0006",
"state": 1
},
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0007",
"state": 1
},
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0008",
"state": 1
},
{
"type": 1,
"plugin_name": "modbus-tcp",
"name": "modbus-tcp-0009",
"state": 1
},
{
"type": 1,
"plugin_name": "neuron-opcua-plugin",
"name": "opcua-0000",
"state": 1
},
{
"type": 1,
"plugin_name": "neuron-opcua-plugin",
"name": "opcua-0001",
"state": 1
},
{
"type": 1,
"plugin_name": "neuron-opcua-plugin",
"name": "opcua-0002",
"state": 1
},
{
"type": 1,
"plugin_name": "neuron-opcua-plugin",
"name": "opcua-0003",
"state": 1
},
{
"type": 1,
"plugin_name": "neuron-opcua-plugin",
"name": "opcua-0004",
"state": 1
},
{
"type": 1,
"plugin_name": "neuron-opcua-plugin",
"name": "opcua-0005",
"state": 1
},
{
"type": 1,
"plugin_name": "neuron-opcua-plugin",
"name": "opcua-0006",
"state": 1
},
{
"type": 1,
"plugin_name": "neuron-opcua-plugin",
"name": "opcua-0007",
"state": 1
},
{
"type": 1,
"plugin_name": "neuron-opcua-plugin",
"name": "opcua-0008",
"state": 1
},
{
"type": 1,
"plugin_name": "neuron-opcua-plugin",
"name": "opcua-0009",
"state": 1
}
]
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0000",
"adapter_name": "modbus-tcp-0000"
}
@@ -1,604 +0,0 @@
{
"tags": [
{
"type": 4,
"name": "modbus1",
"attribute": 3,
"address": "1!400001"
},
{
"type": 4,
"name": "modbus2",
"attribute": 3,
"address": "1!400002"
},
{
"type": 4,
"name": "modbus3",
"attribute": 3,
"address": "1!400003"
},
{
"type": 4,
"name": "modbus4",
"attribute": 3,
"address": "1!400004"
},
{
"type": 4,
"name": "modbus5",
"attribute": 3,
"address": "1!400005"
},
{
"type": 4,
"name": "modbus6",
"attribute": 3,
"address": "1!400006"
},
{
"type": 4,
"name": "modbus7",
"attribute": 3,
"address": "1!400007"
},
{
"type": 4,
"name": "modbus8",
"attribute": 3,
"address": "1!400008"
},
{
"type": 4,
"name": "modbus9",
"attribute": 3,
"address": "1!400009"
},
{
"type": 4,
"name": "modbus10",
"attribute": 3,
"address": "1!400010"
},
{
"type": 4,
"name": "modbus11",
"attribute": 3,
"address": "1!400011"
},
{
"type": 4,
"name": "modbus12",
"attribute": 3,
"address": "1!400012"
},
{
"type": 4,
"name": "modbus13",
"attribute": 3,
"address": "1!400013"
},
{
"type": 4,
"name": "modbus14",
"attribute": 3,
"address": "1!400014"
},
{
"type": 4,
"name": "modbus15",
"attribute": 3,
"address": "1!400015"
},
{
"type": 4,
"name": "modbus16",
"attribute": 3,
"address": "1!400016"
},
{
"type": 4,
"name": "modbus17",
"attribute": 3,
"address": "1!400017"
},
{
"type": 4,
"name": "modbus18",
"attribute": 3,
"address": "1!400018"
},
{
"type": 4,
"name": "modbus19",
"attribute": 3,
"address": "1!400019"
},
{
"type": 4,
"name": "modbus20",
"attribute": 3,
"address": "1!400020"
},
{
"type": 4,
"name": "modbus21",
"attribute": 3,
"address": "1!400021"
},
{
"type": 4,
"name": "modbus22",
"attribute": 3,
"address": "1!400022"
},
{
"type": 4,
"name": "modbus23",
"attribute": 3,
"address": "1!400023"
},
{
"type": 4,
"name": "modbus24",
"attribute": 3,
"address": "1!400024"
},
{
"type": 4,
"name": "modbus25",
"attribute": 3,
"address": "1!400025"
},
{
"type": 4,
"name": "modbus26",
"attribute": 3,
"address": "1!400026"
},
{
"type": 4,
"name": "modbus27",
"attribute": 3,
"address": "1!400027"
},
{
"type": 4,
"name": "modbus28",
"attribute": 3,
"address": "1!400028"
},
{
"type": 4,
"name": "modbus29",
"attribute": 3,
"address": "1!400029"
},
{
"type": 4,
"name": "modbus30",
"attribute": 3,
"address": "1!400030"
},
{
"type": 4,
"name": "modbus31",
"attribute": 3,
"address": "1!400031"
},
{
"type": 4,
"name": "modbus32",
"attribute": 3,
"address": "1!400032"
},
{
"type": 4,
"name": "modbus33",
"attribute": 3,
"address": "1!400033"
},
{
"type": 4,
"name": "modbus34",
"attribute": 3,
"address": "1!400034"
},
{
"type": 4,
"name": "modbus35",
"attribute": 3,
"address": "1!400035"
},
{
"type": 4,
"name": "modbus36",
"attribute": 3,
"address": "1!400036"
},
{
"type": 4,
"name": "modbus37",
"attribute": 3,
"address": "1!400037"
},
{
"type": 4,
"name": "modbus38",
"attribute": 3,
"address": "1!400038"
},
{
"type": 4,
"name": "modbus39",
"attribute": 3,
"address": "1!400039"
},
{
"type": 4,
"name": "modbus40",
"attribute": 3,
"address": "1!400040"
},
{
"type": 4,
"name": "modbus41",
"attribute": 3,
"address": "1!400041"
},
{
"type": 4,
"name": "modbus42",
"attribute": 3,
"address": "1!400042"
},
{
"type": 4,
"name": "modbus43",
"attribute": 3,
"address": "1!400043"
},
{
"type": 4,
"name": "modbus44",
"attribute": 3,
"address": "1!400044"
},
{
"type": 4,
"name": "modbus45",
"attribute": 3,
"address": "1!400045"
},
{
"type": 4,
"name": "modbus46",
"attribute": 3,
"address": "1!400046"
},
{
"type": 4,
"name": "modbus47",
"attribute": 3,
"address": "1!400047"
},
{
"type": 4,
"name": "modbus48",
"attribute": 3,
"address": "1!400048"
},
{
"type": 4,
"name": "modbus49",
"attribute": 3,
"address": "1!400049"
},
{
"type": 4,
"name": "modbus50",
"attribute": 3,
"address": "1!400050"
},
{
"type": 4,
"name": "modbus51",
"attribute": 3,
"address": "1!400051"
},
{
"type": 4,
"name": "modbus52",
"attribute": 3,
"address": "1!400052"
},
{
"type": 4,
"name": "modbus53",
"attribute": 3,
"address": "1!400053"
},
{
"type": 4,
"name": "modbus54",
"attribute": 3,
"address": "1!400054"
},
{
"type": 4,
"name": "modbus55",
"attribute": 3,
"address": "1!400055"
},
{
"type": 4,
"name": "modbus56",
"attribute": 3,
"address": "1!400056"
},
{
"type": 4,
"name": "modbus57",
"attribute": 3,
"address": "1!400057"
},
{
"type": 4,
"name": "modbus58",
"attribute": 3,
"address": "1!400058"
},
{
"type": 4,
"name": "modbus59",
"attribute": 3,
"address": "1!400059"
},
{
"type": 4,
"name": "modbus60",
"attribute": 3,
"address": "1!400060"
},
{
"type": 4,
"name": "modbus61",
"attribute": 3,
"address": "1!400061"
},
{
"type": 4,
"name": "modbus62",
"attribute": 3,
"address": "1!400062"
},
{
"type": 4,
"name": "modbus63",
"attribute": 3,
"address": "1!400063"
},
{
"type": 4,
"name": "modbus64",
"attribute": 3,
"address": "1!400064"
},
{
"type": 4,
"name": "modbus65",
"attribute": 3,
"address": "1!400065"
},
{
"type": 4,
"name": "modbus66",
"attribute": 3,
"address": "1!400066"
},
{
"type": 4,
"name": "modbus67",
"attribute": 3,
"address": "1!400067"
},
{
"type": 4,
"name": "modbus68",
"attribute": 3,
"address": "1!400068"
},
{
"type": 4,
"name": "modbus69",
"attribute": 3,
"address": "1!400069"
},
{
"type": 4,
"name": "modbus70",
"attribute": 3,
"address": "1!400070"
},
{
"type": 4,
"name": "modbus71",
"attribute": 3,
"address": "1!400071"
},
{
"type": 4,
"name": "modbus72",
"attribute": 3,
"address": "1!400072"
},
{
"type": 4,
"name": "modbus73",
"attribute": 3,
"address": "1!400073"
},
{
"type": 4,
"name": "modbus74",
"attribute": 3,
"address": "1!400074"
},
{
"type": 4,
"name": "modbus75",
"attribute": 3,
"address": "1!400075"
},
{
"type": 4,
"name": "modbus76",
"attribute": 3,
"address": "1!400076"
},
{
"type": 4,
"name": "modbus77",
"attribute": 3,
"address": "1!400077"
},
{
"type": 4,
"name": "modbus78",
"attribute": 3,
"address": "1!400078"
},
{
"type": 4,
"name": "modbus79",
"attribute": 3,
"address": "1!400079"
},
{
"type": 4,
"name": "modbus80",
"attribute": 3,
"address": "1!400080"
},
{
"type": 4,
"name": "modbus81",
"attribute": 3,
"address": "1!400081"
},
{
"type": 4,
"name": "modbus82",
"attribute": 3,
"address": "1!400082"
},
{
"type": 4,
"name": "modbus83",
"attribute": 3,
"address": "1!400083"
},
{
"type": 4,
"name": "modbus84",
"attribute": 3,
"address": "1!400084"
},
{
"type": 4,
"name": "modbus85",
"attribute": 3,
"address": "1!400085"
},
{
"type": 4,
"name": "modbus86",
"attribute": 3,
"address": "1!400086"
},
{
"type": 4,
"name": "modbus87",
"attribute": 3,
"address": "1!400087"
},
{
"type": 4,
"name": "modbus88",
"attribute": 3,
"address": "1!400088"
},
{
"type": 4,
"name": "modbus89",
"attribute": 3,
"address": "1!400089"
},
{
"type": 4,
"name": "modbus90",
"attribute": 3,
"address": "1!400090"
},
{
"type": 4,
"name": "modbus91",
"attribute": 3,
"address": "1!400091"
},
{
"type": 4,
"name": "modbus92",
"attribute": 3,
"address": "1!400092"
},
{
"type": 4,
"name": "modbus93",
"attribute": 3,
"address": "1!400093"
},
{
"type": 4,
"name": "modbus94",
"attribute": 3,
"address": "1!400094"
},
{
"type": 4,
"name": "modbus95",
"attribute": 3,
"address": "1!400095"
},
{
"type": 4,
"name": "modbus96",
"attribute": 3,
"address": "1!400096"
},
{
"type": 4,
"name": "modbus97",
"attribute": 3,
"address": "1!400097"
},
{
"type": 4,
"name": "modbus98",
"attribute": 3,
"address": "1!400098"
},
{
"type": 4,
"name": "modbus99",
"attribute": 3,
"address": "1!400099"
},
{
"type": 4,
"name": "modbus100",
"attribute": 3,
"address": "1!400100"
}
]
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0001",
"adapter_name": "modbus-tcp-0000"
}
@@ -1,604 +0,0 @@
{
"tags": [
{
"type": 4,
"name": "modbus101",
"attribute": 3,
"address": "1!400101"
},
{
"type": 4,
"name": "modbus102",
"attribute": 3,
"address": "1!400102"
},
{
"type": 4,
"name": "modbus103",
"attribute": 3,
"address": "1!400103"
},
{
"type": 4,
"name": "modbus104",
"attribute": 3,
"address": "1!400104"
},
{
"type": 4,
"name": "modbus105",
"attribute": 3,
"address": "1!400105"
},
{
"type": 4,
"name": "modbus106",
"attribute": 3,
"address": "1!400106"
},
{
"type": 4,
"name": "modbus107",
"attribute": 3,
"address": "1!400107"
},
{
"type": 4,
"name": "modbus108",
"attribute": 3,
"address": "1!400108"
},
{
"type": 4,
"name": "modbus109",
"attribute": 3,
"address": "1!400109"
},
{
"type": 4,
"name": "modbus110",
"attribute": 3,
"address": "1!400110"
},
{
"type": 4,
"name": "modbus111",
"attribute": 3,
"address": "1!400111"
},
{
"type": 4,
"name": "modbus112",
"attribute": 3,
"address": "1!400112"
},
{
"type": 4,
"name": "modbus113",
"attribute": 3,
"address": "1!400113"
},
{
"type": 4,
"name": "modbus114",
"attribute": 3,
"address": "1!400114"
},
{
"type": 4,
"name": "modbus115",
"attribute": 3,
"address": "1!400115"
},
{
"type": 4,
"name": "modbus116",
"attribute": 3,
"address": "1!400116"
},
{
"type": 4,
"name": "modbus117",
"attribute": 3,
"address": "1!400117"
},
{
"type": 4,
"name": "modbus118",
"attribute": 3,
"address": "1!400118"
},
{
"type": 4,
"name": "modbus119",
"attribute": 3,
"address": "1!400119"
},
{
"type": 4,
"name": "modbus120",
"attribute": 3,
"address": "1!400120"
},
{
"type": 4,
"name": "modbus121",
"attribute": 3,
"address": "1!400121"
},
{
"type": 4,
"name": "modbus122",
"attribute": 3,
"address": "1!400122"
},
{
"type": 4,
"name": "modbus123",
"attribute": 3,
"address": "1!400123"
},
{
"type": 4,
"name": "modbus124",
"attribute": 3,
"address": "1!400124"
},
{
"type": 4,
"name": "modbus125",
"attribute": 3,
"address": "1!400125"
},
{
"type": 4,
"name": "modbus126",
"attribute": 3,
"address": "1!400126"
},
{
"type": 4,
"name": "modbus127",
"attribute": 3,
"address": "1!400127"
},
{
"type": 4,
"name": "modbus128",
"attribute": 3,
"address": "1!400128"
},
{
"type": 4,
"name": "modbus129",
"attribute": 3,
"address": "1!400129"
},
{
"type": 4,
"name": "modbus130",
"attribute": 3,
"address": "1!400130"
},
{
"type": 4,
"name": "modbus131",
"attribute": 3,
"address": "1!400131"
},
{
"type": 4,
"name": "modbus132",
"attribute": 3,
"address": "1!400132"
},
{
"type": 4,
"name": "modbus133",
"attribute": 3,
"address": "1!400133"
},
{
"type": 4,
"name": "modbus134",
"attribute": 3,
"address": "1!400134"
},
{
"type": 4,
"name": "modbus135",
"attribute": 3,
"address": "1!400135"
},
{
"type": 4,
"name": "modbus136",
"attribute": 3,
"address": "1!400136"
},
{
"type": 4,
"name": "modbus137",
"attribute": 3,
"address": "1!400137"
},
{
"type": 4,
"name": "modbus138",
"attribute": 3,
"address": "1!400138"
},
{
"type": 4,
"name": "modbus139",
"attribute": 3,
"address": "1!400139"
},
{
"type": 4,
"name": "modbus140",
"attribute": 3,
"address": "1!400140"
},
{
"type": 4,
"name": "modbus141",
"attribute": 3,
"address": "1!400141"
},
{
"type": 4,
"name": "modbus142",
"attribute": 3,
"address": "1!400142"
},
{
"type": 4,
"name": "modbus143",
"attribute": 3,
"address": "1!400143"
},
{
"type": 4,
"name": "modbus144",
"attribute": 3,
"address": "1!400144"
},
{
"type": 4,
"name": "modbus145",
"attribute": 3,
"address": "1!400145"
},
{
"type": 4,
"name": "modbus146",
"attribute": 3,
"address": "1!400146"
},
{
"type": 4,
"name": "modbus147",
"attribute": 3,
"address": "1!400147"
},
{
"type": 4,
"name": "modbus148",
"attribute": 3,
"address": "1!400148"
},
{
"type": 4,
"name": "modbus149",
"attribute": 3,
"address": "1!400149"
},
{
"type": 4,
"name": "modbus150",
"attribute": 3,
"address": "1!400150"
},
{
"type": 4,
"name": "modbus151",
"attribute": 3,
"address": "1!400151"
},
{
"type": 4,
"name": "modbus152",
"attribute": 3,
"address": "1!400152"
},
{
"type": 4,
"name": "modbus153",
"attribute": 3,
"address": "1!400153"
},
{
"type": 4,
"name": "modbus154",
"attribute": 3,
"address": "1!400154"
},
{
"type": 4,
"name": "modbus155",
"attribute": 3,
"address": "1!400155"
},
{
"type": 4,
"name": "modbus156",
"attribute": 3,
"address": "1!400156"
},
{
"type": 4,
"name": "modbus157",
"attribute": 3,
"address": "1!400157"
},
{
"type": 4,
"name": "modbus158",
"attribute": 3,
"address": "1!400158"
},
{
"type": 4,
"name": "modbus159",
"attribute": 3,
"address": "1!400159"
},
{
"type": 4,
"name": "modbus160",
"attribute": 3,
"address": "1!400160"
},
{
"type": 4,
"name": "modbus161",
"attribute": 3,
"address": "1!400161"
},
{
"type": 4,
"name": "modbus162",
"attribute": 3,
"address": "1!400162"
},
{
"type": 4,
"name": "modbus163",
"attribute": 3,
"address": "1!400163"
},
{
"type": 4,
"name": "modbus164",
"attribute": 3,
"address": "1!400164"
},
{
"type": 4,
"name": "modbus165",
"attribute": 3,
"address": "1!400165"
},
{
"type": 4,
"name": "modbus166",
"attribute": 3,
"address": "1!400166"
},
{
"type": 4,
"name": "modbus167",
"attribute": 3,
"address": "1!400167"
},
{
"type": 4,
"name": "modbus168",
"attribute": 3,
"address": "1!400168"
},
{
"type": 4,
"name": "modbus169",
"attribute": 3,
"address": "1!400169"
},
{
"type": 4,
"name": "modbus170",
"attribute": 3,
"address": "1!400170"
},
{
"type": 4,
"name": "modbus171",
"attribute": 3,
"address": "1!400171"
},
{
"type": 4,
"name": "modbus172",
"attribute": 3,
"address": "1!400172"
},
{
"type": 4,
"name": "modbus173",
"attribute": 3,
"address": "1!400173"
},
{
"type": 4,
"name": "modbus174",
"attribute": 3,
"address": "1!400174"
},
{
"type": 4,
"name": "modbus175",
"attribute": 3,
"address": "1!400175"
},
{
"type": 4,
"name": "modbus176",
"attribute": 3,
"address": "1!400176"
},
{
"type": 4,
"name": "modbus177",
"attribute": 3,
"address": "1!400177"
},
{
"type": 4,
"name": "modbus178",
"attribute": 3,
"address": "1!400178"
},
{
"type": 4,
"name": "modbus179",
"attribute": 3,
"address": "1!400179"
},
{
"type": 4,
"name": "modbus180",
"attribute": 3,
"address": "1!400180"
},
{
"type": 4,
"name": "modbus181",
"attribute": 3,
"address": "1!400181"
},
{
"type": 4,
"name": "modbus182",
"attribute": 3,
"address": "1!400182"
},
{
"type": 4,
"name": "modbus183",
"attribute": 3,
"address": "1!400183"
},
{
"type": 4,
"name": "modbus184",
"attribute": 3,
"address": "1!400184"
},
{
"type": 4,
"name": "modbus185",
"attribute": 3,
"address": "1!400185"
},
{
"type": 4,
"name": "modbus186",
"attribute": 3,
"address": "1!400186"
},
{
"type": 4,
"name": "modbus187",
"attribute": 3,
"address": "1!400187"
},
{
"type": 4,
"name": "modbus188",
"attribute": 3,
"address": "1!400188"
},
{
"type": 4,
"name": "modbus189",
"attribute": 3,
"address": "1!400189"
},
{
"type": 4,
"name": "modbus190",
"attribute": 3,
"address": "1!400190"
},
{
"type": 4,
"name": "modbus191",
"attribute": 3,
"address": "1!400191"
},
{
"type": 4,
"name": "modbus192",
"attribute": 3,
"address": "1!400192"
},
{
"type": 4,
"name": "modbus193",
"attribute": 3,
"address": "1!400193"
},
{
"type": 4,
"name": "modbus194",
"attribute": 3,
"address": "1!400194"
},
{
"type": 4,
"name": "modbus195",
"attribute": 3,
"address": "1!400195"
},
{
"type": 4,
"name": "modbus196",
"attribute": 3,
"address": "1!400196"
},
{
"type": 4,
"name": "modbus197",
"attribute": 3,
"address": "1!400197"
},
{
"type": 4,
"name": "modbus198",
"attribute": 3,
"address": "1!400198"
},
{
"type": 4,
"name": "modbus199",
"attribute": 3,
"address": "1!400199"
},
{
"type": 4,
"name": "modbus200",
"attribute": 3,
"address": "1!400200"
}
]
}
@@ -1,7 +0,0 @@
{
"params": {
"host":"127.0.0.1",
"port":60502,
"connection_mode":0
}
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0000",
"adapter_name": "modbus-tcp-0001"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0001",
"adapter_name": "modbus-tcp-0001"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0002",
"adapter_name": "modbus-tcp-0001"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0003",
"adapter_name": "modbus-tcp-0001"
}
@@ -1,7 +0,0 @@
{
"params": {
"host":"127.0.0.1",
"port":60502,
"connection_mode":0
}
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0000",
"adapter_name": "modbus-tcp-0002"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0001",
"adapter_name": "modbus-tcp-0002"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0002",
"adapter_name": "modbus-tcp-0002"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0003",
"adapter_name": "modbus-tcp-0002"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0004",
"adapter_name": "modbus-tcp-0002"
}
@@ -1,7 +0,0 @@
{
"params": {
"host":"127.0.0.1",
"port":60502,
"connection_mode":0
}
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0000",
"adapter_name": "modbus-tcp-0003"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0001",
"adapter_name": "modbus-tcp-0003"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0002",
"adapter_name": "modbus-tcp-0003"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0003",
"adapter_name": "modbus-tcp-0003"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0004",
"adapter_name": "modbus-tcp-0003"
}
@@ -1,7 +0,0 @@
{
"params": {
"host":"127.0.0.1",
"port":60502,
"connection_mode":0
}
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0000",
"adapter_name": "modbus-tcp-0004"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0001",
"adapter_name": "modbus-tcp-0004"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0002",
"adapter_name": "modbus-tcp-0004"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0003",
"adapter_name": "modbus-tcp-0004"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0004",
"adapter_name": "modbus-tcp-0004"
}
@@ -1,7 +0,0 @@
{
"params": {
"host":"127.0.0.1",
"port":60502,
"connection_mode":0
}
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0000",
"adapter_name": "modbus-tcp-0005"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0001",
"adapter_name": "modbus-tcp-0005"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0002",
"adapter_name": "modbus-tcp-0005"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0003",
"adapter_name": "modbus-tcp-0005"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0004",
"adapter_name": "modbus-tcp-0005"
}
@@ -1,7 +0,0 @@
{
"params": {
"host":"127.0.0.1",
"port":60502,
"connection_mode":0
}
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0000",
"adapter_name": "modbus-tcp-0006"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0001",
"adapter_name": "modbus-tcp-0006"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0002",
"adapter_name": "modbus-tcp-0006"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0003",
"adapter_name": "modbus-tcp-0006"
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0004",
"adapter_name": "modbus-tcp-0006"
}
@@ -1,7 +0,0 @@
{
"params": {
"host":"127.0.0.1",
"port":60502,
"connection_mode":0
}
}
@@ -1,5 +0,0 @@
{
"read_interval": 1000,
"group_config_name": "group-0000",
"adapter_name": "modbus-tcp-0007"
}

Some files were not shown because too many files have changed in this diff Show More