Add DataSecure flag for group addresses (#306)

* Update test project to include data secure GAs * Add DataSecure flag for group addresses * typo
XKNX · Oct 16, 2023 · c1e2be5 · c1e2be5
1 parent 3cdefd5
commit c1e2be5
Show file tree

Hide file tree

Showing 12 changed files with 271 additions and 11 deletions.
diff --git a/test/resources/stubs/ets6_free.json b/test/resources/stubs/ets6_free.json
@@ -8,7 +8,7 @@
     "created_by": "ETS6",
     "schema_version": "22",
     "tool_version": "6.1.5686.0",
-    "xknxproject_version": "3.2.0",
+    "xknxproject_version": "3.3.0",
     "language_code": "de-DE"
   },
   "communication_objects": {},
@@ -53,6 +53,7 @@
       "address": "3",
       "project_uid": 16,
       "dpt": null,
+      "data_secure": false,
       "communication_object_ids": [],
       "description": "",
       "comment": ""
@@ -64,6 +65,7 @@
       "address": "2",
       "project_uid": 14,
       "dpt": null,
+      "data_secure": false,
       "communication_object_ids": [],
       "description": "",
       "comment": ""
@@ -75,6 +77,7 @@
       "address": "1",
       "project_uid": 12,
       "dpt": null,
+      "data_secure": false,
       "communication_object_ids": [],
       "description": "",
       "comment": ""
@@ -86,6 +89,7 @@
       "address": "1025",
       "project_uid": 21,
       "dpt": null,
+      "data_secure": false,
       "communication_object_ids": [],
       "description": "",
       "comment": ""

diff --git a/test/resources/stubs/ets6_two_level.json b/test/resources/stubs/ets6_two_level.json
@@ -8,7 +8,7 @@
     "created_by": "ETS6",
     "schema_version": "22",
     "tool_version": "6.1.5686.0",
-    "xknxproject_version": "3.2.0",
+    "xknxproject_version": "3.3.0",
     "language_code": "de-DE"
   },
   "communication_objects": {},
@@ -59,6 +59,7 @@
       "address": "0/1",
       "project_uid": 6,
       "dpt": null,
+      "data_secure": false,
       "communication_object_ids": [],
       "description": "",
       "comment": ""
@@ -70,6 +71,7 @@
       "address": "1/1",
       "project_uid": 8,
       "dpt": null,
+      "data_secure": false,
       "communication_object_ids": [],
       "description": "",
       "comment": ""

diff --git a/test/resources/stubs/module-definition-test.json b/test/resources/stubs/module-definition-test.json
@@ -8,7 +8,7 @@
     "created_by": "ETS5",
     "schema_version": "20",
     "tool_version": "5.7.1428.39779",
-    "xknxproject_version": "3.2.0",
+    "xknxproject_version": "3.3.0",
     "language_code": "de-DE"
   },
   "communication_objects": {
@@ -246,6 +246,7 @@
         "main": 9,
         "sub": 1
       },
+      "data_secure": false,
       "communication_object_ids": [
         "1.1.1/MD-2_M-1_MI-1_O-2-1_R-1"
       ],
@@ -262,6 +263,7 @@
         "main": 9,
         "sub": 1
       },
+      "data_secure": false,
       "communication_object_ids": [
         "1.1.1/MD-2_M-1_MI-1_O-2-2_R-3"
       ],
@@ -278,6 +280,7 @@
         "main": 9,
         "sub": 1
       },
+      "data_secure": false,
       "communication_object_ids": [
         "1.1.1/O-334_R-21"
       ],
@@ -294,6 +297,7 @@
         "main": 9,
         "sub": 1
       },
+      "data_secure": false,
       "communication_object_ids": [
         "1.1.1/MD-2_M-2_MI-1_O-2-2_R-3"
       ],
@@ -310,6 +314,7 @@
         "main": 9,
         "sub": 1
       },
+      "data_secure": false,
       "communication_object_ids": [
         "1.1.1/MD-2_M-2_MI-1_O-2-1_R-1"
       ],
@@ -326,6 +331,7 @@
         "main": 9,
         "sub": 1
       },
+      "data_secure": false,
       "communication_object_ids": [
         "1.1.2/MD-2_M-1_MI-1_O-2-2_R-3"
       ],
@@ -342,6 +348,7 @@
         "main": 9,
         "sub": 1
       },
+      "data_secure": false,
       "communication_object_ids": [
         "1.1.1/MD-2_M-1_MI-1_O-2-2_R-3",
         "1.1.1/MD-2_M-2_MI-1_O-2-2_R-3",

diff --git a/test/resources/stubs/test_project-ets4.json b/test/resources/stubs/test_project-ets4.json
@@ -8,7 +8,7 @@
     "created_by": "ETS4",
     "schema_version": "11",
     "tool_version": "ETS 4.2.0 (Build 3884)",
-    "xknxproject_version": "3.2.0",
+    "xknxproject_version": "3.3.0",
     "language_code": "de-DE"
   },
   "communication_objects": {
@@ -199,6 +199,7 @@
         "main": 1,
         "sub": null
       },
+      "data_secure": false,
       "communication_object_ids": [
         "0.0.1/M-0083_A-0013-11-A9D6_O-0_R-10000",
         "0.0.2/M-0002_A-A061-14-BE27_O-10_R-485"
@@ -216,6 +217,7 @@
         "main": 1,
         "sub": null
       },
+      "data_secure": false,
       "communication_object_ids": [
         "0.0.1/M-0083_A-0013-11-A9D6_O-5_R-10005",
         "0.0.2/M-0002_A-A061-14-BE27_O-71_R-1506"
@@ -233,6 +235,7 @@
         "main": 1,
         "sub": null
       },
+      "data_secure": false,
       "communication_object_ids": [
         "0.0.1/M-0083_A-0013-11-A9D6_O-13_R-4",
         "0.0.2/M-0002_A-A061-14-BE27_O-10_R-485"

diff --git a/test/resources/stubs/testprojekt-ets6-functions.json b/test/resources/stubs/testprojekt-ets6-functions.json
@@ -8,7 +8,7 @@
     "created_by": "ETS6",
     "schema_version": "22",
     "tool_version": "6.1.5686.0",
-    "xknxproject_version": "3.2.0",
+    "xknxproject_version": "3.3.0",
     "language_code": "de-DE"
   },
   "communication_objects": {},
@@ -56,6 +56,7 @@
         "main": 1,
         "sub": 1
       },
+      "data_secure": false,
       "communication_object_ids": [],
       "description": "Livingroom LivingroomLight",
       "comment": ""
@@ -70,6 +71,7 @@
         "main": 1,
         "sub": 1
       },
+      "data_secure": false,
       "communication_object_ids": [],
       "description": "Livingroom LivingroomLight",
       "comment": ""