Merge branch 'develop' into feat/plc4py/umas_write_support

apache · May 1, 2024 · 67274f5 · 67274f5
2 parents c0f0f67 + f9e1acc
commit 67274f5
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 75 deletions.
diff --git a/plc4go/pom.xml b/plc4go/pom.xml
@@ -511,10 +511,27 @@
 
   <profiles>
     <profile>
-      <id>.os-windows</id>
+      <id>.os-windows-x86_64</id>
       <activation>
         <os>
           <family>windows</family>
+          <arch>x86_64</arch>
+        </os>
+      </activation>
+      <properties>
+        <!--
+        Coverage doesn't work in windows because of a long path issue in cover.exe
+        Tracked upstream issue: https://github.com/golang/go/issues/60785
+        -->
+        <go.cover.flag>-v</go.cover.flag>
+      </properties>
+    </profile>
+    <profile>
+      <id>.os-windows-aarch64</id>
+      <activation>
+        <os>
+          <family>windows</family>
+          <arch>aarch64</arch>
         </os>
       </activation>
       <properties>

diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
diff --git a/...knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java b/...knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
@@ -763,7 +763,7 @@ public enum KnxManufacturer {
   M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_(
       (int) 662, (int) 720, (String) "Foshan Haydn Technology Lighting Co.,Ltd."),
   M_KNXES_COMPANY_LIMITED((int) 663, (int) 721, (String) "KNXES COMPANY LIMITED"),
-  M_THE_AKUVOX_COMPANY((int) 664, (int) 722, (String) "The Akuvox Company"),
+  M_AKUVOX((int) 664, (int) 722, (String) "Akuvox"),
   M_NINGBO_YINZHOU_SHENGRUIJIE_ELECTRONICS_CO__LTD_(
       (int) 665, (int) 723, (String) "NingBo Yinzhou ShengRuiJie Electronics Co. Ltd."),
   M_SHENZHEN_HAIZHICHUANG_TECHNOLOGY_CO___LTD(
@@ -777,9 +777,11 @@ public enum KnxManufacturer {
   M_CREATROL((int) 671, (int) 729, (String) "Creatrol"),
   M_EUTELSAT((int) 672, (int) 730, (String) "EUTELSAT"),
   M_TECNIKABEL((int) 673, (int) 731, (String) "TECNIKABEL"),
-  M_ABB___RESERVED((int) 674, (int) 43954, (String) "ABB - reserved"),
+  M_ATIOS_AG((int) 674, (int) 732, (String) "Atios AG"),
+  M_SMARTLICHT((int) 675, (int) 733, (String) "SmartLicht"),
+  M_ABB___RESERVED((int) 676, (int) 43954, (String) "ABB - reserved"),
   M_BUSCH_JAEGER_ELEKTRO___RESERVED(
-      (int) 675, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
+      (int) 677, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
   private static final Map<Integer, KnxManufacturer> map;
 
   static {

diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -688,7 +688,7 @@ public enum KnxManufacturer
         M_ARKLYFE = 661,
         M_FOSHAN_HAYDN_TECHNOLOGY_LIGHTING_CO__LTD_ = 662,
         M_KNXES_COMPANY_LIMITED = 663,
-        M_THE_AKUVOX_COMPANY = 664,
+        M_AKUVOX = 664,
         M_NINGBO_YINZHOU_SHENGRUIJIE_ELECTRONICS_CO__LTD_ = 665,
         M_SHENZHEN_HAIZHICHUANG_TECHNOLOGY_CO___LTD = 666,
         M_SHENZHEN_EASYDETEK_TECHNOLOGY_CO_LTD = 667,
@@ -698,8 +698,10 @@ public enum KnxManufacturer
         M_CREATROL = 671,
         M_EUTELSAT = 672,
         M_TECNIKABEL = 673,
-        M_ABB___RESERVED = 674,
-        M_BUSCH_JAEGER_ELEKTRO___RESERVED = 675,
+        M_ATIOS_AG = 674,
+        M_SMARTLICHT = 675,
+        M_ABB___RESERVED = 676,
+        M_BUSCH_JAEGER_ELEKTRO___RESERVED = 677,
     }
 
     public static class KnxManufacturerInfo
@@ -2593,7 +2595,7 @@ public static class KnxManufacturerInfo
                 case KnxManufacturer.M_KNXES_COMPANY_LIMITED: { /* '663' */
                     return 721;
                 }
-                case KnxManufacturer.M_THE_AKUVOX_COMPANY: { /* '664' */
+                case KnxManufacturer.M_AKUVOX: { /* '664' */
                     return 722;
                 }
                 case KnxManufacturer.M_NINGBO_YINZHOU_SHENGRUIJIE_ELECTRONICS_CO__LTD_: { /* '665' */
@@ -2626,10 +2628,16 @@ public static class KnxManufacturerInfo
                 case KnxManufacturer.M_TECNIKABEL: { /* '673' */
                     return 731;
                 }
-                case KnxManufacturer.M_ABB___RESERVED: { /* '674' */
+                case KnxManufacturer.M_ATIOS_AG: { /* '674' */
+                    return 732;
+                }
+                case KnxManufacturer.M_SMARTLICHT: { /* '675' */
+                    return 733;
+                }
+                case KnxManufacturer.M_ABB___RESERVED: { /* '676' */
                     return 43954;
                 }
-                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '675' */
+                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '677' */
                     return 43959;
                 }
                 case KnxManufacturer.M_WAREMA_RENKHOFF_SE: { /* '68' */
@@ -4631,8 +4639,8 @@ public static string Name(this KnxManufacturer value)
                 case KnxManufacturer.M_KNXES_COMPANY_LIMITED: { /* '663' */
                     return "KNXES COMPANY LIMITED";
                 }
-                case KnxManufacturer.M_THE_AKUVOX_COMPANY: { /* '664' */
-                    return "The Akuvox Company";
+                case KnxManufacturer.M_AKUVOX: { /* '664' */
+                    return "Akuvox";
                 }
                 case KnxManufacturer.M_NINGBO_YINZHOU_SHENGRUIJIE_ELECTRONICS_CO__LTD_: { /* '665' */
                     return "NingBo Yinzhou ShengRuiJie Electronics Co. Ltd.";
@@ -4664,10 +4672,16 @@ public static string Name(this KnxManufacturer value)
                 case KnxManufacturer.M_TECNIKABEL: { /* '673' */
                     return "TECNIKABEL";
                 }
-                case KnxManufacturer.M_ABB___RESERVED: { /* '674' */
+                case KnxManufacturer.M_ATIOS_AG: { /* '674' */
+                    return "Atios AG";
+                }
+                case KnxManufacturer.M_SMARTLICHT: { /* '675' */
+                    return "SmartLicht";
+                }
+                case KnxManufacturer.M_ABB___RESERVED: { /* '676' */
                     return "ABB - reserved";
                 }
-                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '675' */
+                case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '677' */
                     return "Busch-Jaeger Elektro - reserved";
                 }
                 case KnxManufacturer.M_WAREMA_RENKHOFF_SE: { /* '68' */

diff --git a/plc4py/plc4py/drivers/umas/UmasDevice.py b/plc4py/plc4py/drivers/umas/UmasDevice.py
@@ -412,6 +412,7 @@ def _sort_tags_based_on_memory_address(self, request):
                     variable.get_variable_reference(umas_tag.tag_name),
                 )
             )
+
         sorted_tag_lists: List[List[Tuple[str, VariableReadRequestReference]]] = []
         for request in tag_list:
             sorted_tags = sorted(

diff --git a/plc4py/plc4py/protocols/umas/readwrite/UmasPDUItem.py b/plc4py/plc4py/protocols/umas/readwrite/UmasPDUItem.py
@@ -211,6 +211,7 @@ def static_parse_context(
             builder = UmasPDUWriteVariableRequest.static_parse_builder(
                 read_buffer, umas_request_function_key, byte_length
             )
+
         from plc4py.protocols.umas.readwrite.UmasPDUReadUnlocatedVariableNamesRequest import (
             UmasPDUReadUnlocatedVariableNamesRequest,
         )

diff --git a/plc4py/requirements.txt b/plc4py/requirements.txt
@@ -19,20 +19,20 @@
 aenum==3.1.15
 annotated-types==0.6.0
 bitarray==2.9.2
-black==24.4.0
+black==24.4.2
 build==1.2.1
 cfgv==3.4.0
 click==8.1.7
 coverage==7.5.0
 distlib==0.3.8
-filelock==3.13.4
+filelock==3.14.0
 flake8==7.0.0
 funkify==0.4.5
 identify==2.5.36
 iniconfig==2.0.0
 mccabe==0.7.0
 mock==5.1.0
-mypy==1.9.0
+mypy==1.10.0
 mypy-extensions==1.0.0
 nodeenv==1.8.0
 packaging==24.0
@@ -43,12 +43,12 @@ pluggy==1.5.0
 pre-commit==3.7.0
 pycodestyle==2.11.1
 pyflakes==3.2.0
-pyproject_hooks==1.0.0
-pytest==8.1.1
+pyproject_hooks==1.1.0
+pytest==8.2.0
 pytest-asyncio==0.23.6
 pytest-mock==3.14.0
 PyYAML==6.0.1
 requires==0.10.5
 typing_extensions==4.11.0
-virtualenv==20.26.0
+virtualenv==20.26.1
 xtyping==0.8.2