Merge pull request #48 from ifm/add_o2u_device

Add o2u device to meta data and restructure example code in corresponding device type folders
ifm · Oct 30, 2024 · edef040 · edef040
2 parents 5a85f7f + 92a845c
commit edef040
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 3 deletions.
diff --git a/examples/code_reader_sql_db.py → examples/O2I5xx/code_reader_sql_db.py b/examples/code_reader_sql_db.py → examples/O2I5xx/code_reader_sql_db.py
diff --git a/examples/LogicGraph_GPIO_example.py → examples/O2X5xx/LogicGraph_GPIO_example.py b/examples/LogicGraph_GPIO_example.py → examples/O2X5xx/LogicGraph_GPIO_example.py
diff --git a/...es/O_commands_to_DIGITAL_OUTx_5PIN.o2xlgc → ...es/O_commands_to_DIGITAL_OUTx_5PIN.o2xlgc b/...es/O_commands_to_DIGITAL_OUTx_5PIN.o2xlgc → ...es/O_commands_to_DIGITAL_OUTx_5PIN.o2xlgc
diff --git a/...es/O_commands_to_DIGITAL_OUTx_8PIN.o2xlgc → ...es/O_commands_to_DIGITAL_OUTx_8PIN.o2xlgc b/...es/O_commands_to_DIGITAL_OUTx_8PIN.o2xlgc → ...es/O_commands_to_DIGITAL_OUTx_8PIN.o2xlgc
diff --git a/...Templates/logic_export_Hello_World.o2xlgc → ...Templates/logic_export_Hello_World.o2xlgc b/...Templates/logic_export_Hello_World.o2xlgc → ...Templates/logic_export_Hello_World.o2xlgc
diff --git a/examples/PCIC_TCP_config_example.py → examples/O2X5xx/PCIC_TCP_config_example.py b/examples/PCIC_TCP_config_example.py → examples/O2X5xx/PCIC_TCP_config_example.py
diff --git a/...TCP_templates/Image_IDs_and_BLOBs.o2xpcic → ...TCP_templates/Image_IDs_and_BLOBs.o2xpcic b/...TCP_templates/Image_IDs_and_BLOBs.o2xpcic → ...TCP_templates/Image_IDs_and_BLOBs.o2xpcic
diff --git a/...ates/TCP_IP_interface_Hello_World.o2xpcic → ...ates/TCP_IP_interface_Hello_World.o2xpcic b/...ates/TCP_IP_interface_Hello_World.o2xpcic → ...ates/TCP_IP_interface_Hello_World.o2xpcic
diff --git a/examples/create_application.py → examples/O2X5xx/create_application.py b/examples/create_application.py → examples/O2X5xx/create_application.py
diff --git a/examples/create_rawimage_application.py → ...les/O2X5xx/create_rawimage_application.py b/examples/create_rawimage_application.py → ...les/O2X5xx/create_rawimage_application.py
diff --git a/examples/device_discovery.py → examples/O2X5xx/device_discovery.py b/examples/device_discovery.py → examples/O2X5xx/device_discovery.py
diff --git a/examples/image_recorder.py → examples/O2X5xx/image_recorder.py b/examples/image_recorder.py → examples/O2X5xx/image_recorder.py
diff --git a/examples/image_viewer.py → examples/O2X5xx/image_viewer.py b/examples/image_viewer.py → examples/O2X5xx/image_viewer.py
diff --git a/examples/output_recorder.py → examples/O2X5xx/output_recorder.py b/examples/output_recorder.py → examples/O2X5xx/output_recorder.py
diff --git a/examples/update_scripts/README.md → examples/O2X5xx/update_scripts/README.md b/examples/update_scripts/README.md → examples/O2X5xx/update_scripts/README.md
diff --git a/...update_scripts/o2x5xx_multi_fw_updater.py → ...update_scripts/o2x5xx_multi_fw_updater.py b/...update_scripts/o2x5xx_multi_fw_updater.py → ...update_scripts/o2x5xx_multi_fw_updater.py
diff --git a/source/rpc/client.py b/source/rpc/client.py
@@ -9,6 +9,7 @@
 import io
 import numpy as np
 import matplotlib.image as mpimg
+import warnings
 
 
 SOCKET_TIMEOUT = 10
@@ -81,8 +82,8 @@ def _getDeviceMeta(self):
         result = DevicesMeta.getData(key="DeviceType", value=_deviceType)
         if not result:
             _articleNumber = self.getParameter(value="ArticleNumber")
-            raise TypeError("Device {} with DeviceType {} is not supported by this library!"
-                            .format(_articleNumber, _deviceType))
+            warnings.warn("Device {} with DeviceType {} and IP {} may not be supported by this library!"
+                          .format(_articleNumber, _deviceType, self.address), ResourceWarning)
         return result
 
     def getParameter(self, value: str) -> str:

diff --git a/source/static/devices.py b/source/static/devices.py
@@ -23,7 +23,7 @@ class DevicesMeta(enum.Enum):
     O2I5xx = {"ArticleNumber": ["O2I5xx",
                                 "O2I510", "O2I511", "O2I512",
                                 "O2I513", "O2I514", "O2I500",
-                                "O2I515", "O2I501",  "O2I502",
+                                "O2I515", "O2I501", "O2I502",
                                 "O2I503", "O2I504", "O2I505"],
               "DeviceType": ["1:256", 0x100],
               "LogicGraphConfigExtension": ".o2xlgc",
@@ -39,6 +39,14 @@ class DevicesMeta(enum.Enum):
               "ApplicationConfigExtension": ".o2i4xxapp",
               "DeviceConfigExtension": ".o2i4xxcfg",
               "PCICConfigExtension": ".o2xpcic"}
+    O2U5xx = {"ArticleNumber": ["O2U5xx",
+                                "O2U530", "O2U532", "O2U534",
+                                "O2U540", "O2U542", "O2U544"],
+              "DeviceType": ["1:384", 0x180],
+              "LogicGraphConfigExtension": ".o2xlgc",
+              "ApplicationConfigExtension": ".o2u5xxapp",
+              "DeviceConfigExtension": ".o2u5xxcfg",
+              "PCICConfigExtension": ".o2xpcic"}
 
     @classmethod
     def getData(cls, key, value):