Merge pull request #1811 from fengzeroz/v2.7

plugin version: 2.7.2
2026-10-31 08:29:03 +08:00 · 2024-01-11 17:00:10 +08:00 · 2024-01-11 08:59:33 +00:00 · 2024-01-11 16:26:54 +08:00 · 2024-01-11 08:26:19 +00:00 · 2024-01-11 16:06:15 +08:00
5 changed files with 6 additions and 12 deletions
@@ -8,7 +8,7 @@ on:
      - published

 env:
-  VERSION: 2.7.1
+  VERSION: 2.7.2
  UI_VERSION: 2.6.3
  BRANCH: v2.7

@@ -24,7 +24,7 @@

 #define NEU_VERSION_MAJOR 2
 #define NEU_VERSION_MINOR 7
-#define NEU_VERSION_FIX 1
+#define NEU_VERSION_FIX 2

 #define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16)
 #define NEU_GET_VERSION_MINOR(V) ((0x0000ff00 & V) >> 8)
@@ -40,7 +40,7 @@
 #define NEU_DEFAULT_GROUP_INTERVAL 100
 #define NEU_NODE_NAME_LEN 128
 #define NEU_PLUGIN_NAME_LEN 32
-#define NEU_PLUGIN_LIBRARY_LEN 32
+#define NEU_PLUGIN_LIBRARY_LEN 64
 #define NEU_PLUGIN_DESCRIPTION_LEN 512
 #define NEU_TEMPLATE_NAME_LEN 128
 #define NEU_DRIVER_TAG_CACHE_EXPIRE_TIME 60
@@ -467,17 +467,11 @@ int neu_json_decode_gtag_json(void *json_obj, neu_json_gtag_t *gtag_p)
    gtag_p->n_tag    = arr.len;
    gtag_p->tags     = arr.tags;

-    goto decode_exit;
+    return 0;

 decode_fail:
    free(gtag_elems[0].v.val_str);
    return -1;
-
-decode_exit:
-    if (json_obj != NULL) {
-        neu_json_decode_free(json_obj);
-    }
-    return 0;
 }

 void neu_json_decode_gtag_fini(neu_json_gtag_t *gtag)
@@ -979,7 +979,7 @@ class TestModbus:
            node=param[0], group='group', tag=hold_string_l1[0]['name'], value='a')
        api.write_tag_check(
            node=param[0], group='group', tag=hold_string_l2[0]['name'], value='b')
-        time.sleep(0.3)
+        time.sleep(0.5)
        assert 'a' == api.read_tag(
            node=param[0], group='group', tag=hold_string_l1[0]['name'])
        assert 'b' == api.read_tag(
@@ -1 +1 @@
-2.7.1
+2.7.2
Author	SHA1	Message	Date
fengzeroz	10c89daf5e	Merge pull request #1811 from fengzeroz/v2.7 plugin version: 2.7.2	2024-01-11 17:00:10 +08:00
fengzero	94e492652a	plugin version: 2.7.2	2024-01-11 08:59:33 +00:00
fengzeroz	87aac219d7	Merge pull request #1810 from fengzeroz/v2.7 version: 2.7.2	2024-01-11 16:26:54 +08:00
fengzero	7fdd4c4f79	version: 2.7.2	2024-01-11 08:26:19 +00:00
fengzeroz	7c46a3ec06	Merge pull request #1809 from eeff/v2.7 Pick to v2.7 fix: enlarge plugin lib length	2024-01-11 16:06:15 +08:00
eeff	065d77dd5d	fix: enlarge plugin lib length	2024-01-11 15:59:16 +08:00
fengzeroz	68d8632fcd	Merge pull request #1806 from hxy7yx/v2.7-1 fix(add_gtag): parser memory free	2024-01-10 17:31:51 +08:00
hxy7yx	84ca0952e8	fix(add_gtag): payload parser memory free	2024-01-10 17:25:01 +08:00
@@ -1 +1 @@
 .7.1
 .7.2