organize directoies

Panduza · Nov 6, 2023 · 127476c · 127476c
1 parent e7b276a
commit 127476c
Show file tree

Hide file tree

Showing 46 changed files with 55 additions and 149 deletions.
diff --git a/client/panduza/old/ftdi_spi_client.py → old/old_client/ftdi_spi_client.py b/client/panduza/old/ftdi_spi_client.py → old/old_client/ftdi_spi_client.py
diff --git a/client/panduza/old/modbus_client.py → old/old_client/modbus_client.py b/client/panduza/old/modbus_client.py → old/old_client/modbus_client.py
diff --git a/..._need_to_be_reworked/aardvark/__init__.py → ..._need_to_be_reworked/aardvark/__init__.py b/..._need_to_be_reworked/aardvark/__init__.py → ..._need_to_be_reworked/aardvark/__init__.py
diff --git a/...ed/aardvark/driver_aardvark_spi_master.py → ...ed/aardvark/driver_aardvark_spi_master.py b/...ed/aardvark/driver_aardvark_spi_master.py → ...ed/aardvark/driver_aardvark_spi_master.py
diff --git a/...rs_need_to_be_reworked/aimtti/__init__.py → ...rs_need_to_be_reworked/aimtti/__init__.py b/...rs_need_to_be_reworked/aimtti/__init__.py → ...rs_need_to_be_reworked/aimtti/__init__.py
diff --git a/...ed_to_be_reworked/aimtti/driver_ql355p.py → ...ed_to_be_reworked/aimtti/driver_ql355p.py b/...ed_to_be_reworked/aimtti/driver_ql355p.py → ...ed_to_be_reworked/aimtti/driver_ql355p.py
diff --git a/...ivers_need_to_be_reworked/dio/__init__.py → ...ivers_need_to_be_reworked/dio/__init__.py b/...ivers_need_to_be_reworked/dio/__init__.py → ...ivers_need_to_be_reworked/dio/__init__.py
diff --git a/...need_to_be_reworked/dio/pza_modbus_dio.py → ...need_to_be_reworked/dio/pza_modbus_dio.py b/...need_to_be_reworked/dio/pza_modbus_dio.py → ...need_to_be_reworked/dio/pza_modbus_dio.py
diff --git a/...vers_need_to_be_reworked/driver_hm7044.py → ...vers_need_to_be_reworked/driver_hm7044.py b/...vers_need_to_be_reworked/driver_hm7044.py → ...vers_need_to_be_reworked/driver_hm7044.py
diff --git a/...vers_need_to_be_reworked/driver_ka005p.py → ...vers_need_to_be_reworked/driver_ka005p.py b/...vers_need_to_be_reworked/driver_ka005p.py → ...vers_need_to_be_reworked/driver_ka005p.py
diff --git a/...ed_to_be_reworked/driver_modbus_client.py → ...ed_to_be_reworked/driver_modbus_client.py b/...ed_to_be_reworked/driver_modbus_client.py → ...ed_to_be_reworked/driver_modbus_client.py
diff --git a/...vers_need_to_be_reworked/driver_serial.py → ...vers_need_to_be_reworked/driver_serial.py b/...vers_need_to_be_reworked/driver_serial.py → ...vers_need_to_be_reworked/driver_serial.py
diff --git a/.../panduza_platform/drivers/dio/__init__.py → ...ed_to_be_reworked/drivers/dio/__init__.py b/.../panduza_platform/drivers/dio/__init__.py → ...ed_to_be_reworked/drivers/dio/__init__.py
diff --git a/...drivers/dio/drv_ftdi_boundary_scan_dio.py → ...drivers/dio/drv_ftdi_boundary_scan_dio.py b/...drivers/dio/drv_ftdi_boundary_scan_dio.py → ...drivers/dio/drv_ftdi_boundary_scan_dio.py
diff --git a/...tform/drivers/dio/drv_panduza_fake_dio.py → ...orked/drivers/dio/drv_panduza_fake_dio.py b/...tform/drivers/dio/drv_panduza_fake_dio.py → ...orked/drivers/dio/drv_panduza_fake_dio.py
diff --git a/...anduza_platform/drivers/relay/__init__.py → ..._to_be_reworked/drivers/relay/__init__.py b/...anduza_platform/drivers/relay/__init__.py → ..._to_be_reworked/drivers/relay/__init__.py
diff --git a/...m/drivers/relay/drv_panduza_fake_relay.py → ...d/drivers/relay/drv_panduza_fake_relay.py b/...m/drivers/relay/drv_panduza_fake_relay.py → ...d/drivers/relay/drv_panduza_fake_relay.py
diff --git a/...vers_need_to_be_reworked/ftdi/__init__.py → ...vers_need_to_be_reworked/ftdi/__init__.py b/...vers_need_to_be_reworked/ftdi/__init__.py → ...vers_need_to_be_reworked/ftdi/__init__.py
diff --git a/...e_reworked/ftdi/driver_ftdi_spi_master.py → ...e_reworked/ftdi/driver_ftdi_spi_master.py b/...e_reworked/ftdi/driver_ftdi_spi_master.py → ...e_reworked/ftdi/driver_ftdi_spi_master.py
diff --git a/...orm/old_drivers_need_to_be_reworked/io.py → old/old_drivers_need_to_be_reworked/io.py b/...orm/old_drivers_need_to_be_reworked/io.py → old/old_drivers_need_to_be_reworked/io.py
diff --git a/...ers_need_to_be_reworked/rspro/__init__.py → ...ers_need_to_be_reworked/rspro/__init__.py b/...ers_need_to_be_reworked/rspro/__init__.py → ...ers_need_to_be_reworked/rspro/__init__.py
diff --git a/...need_to_be_reworked/rspro/driver_4303s.py → ...need_to_be_reworked/rspro/driver_4303s.py b/...need_to_be_reworked/rspro/driver_4303s.py → ...need_to_be_reworked/rspro/driver_4303s.py
diff --git a/...drivers_need_to_be_reworked/spi_master.py → ...drivers_need_to_be_reworked/spi_master.py b/...drivers_need_to_be_reworked/spi_master.py → ...drivers_need_to_be_reworked/spi_master.py
diff --git a/platform/panduza_platform/devices/hanmatek/__init__.py b/platform/panduza_platform/devices/hanmatek/__init__.py
@@ -1,4 +1,4 @@
-from .hm310t import DeviceHanmatekHm310t
+from .hm310t.dev_hm310t import DeviceHanmatekHm310t
 
 PZA_DEVICES_LIST= [ 
     DeviceHanmatekHm310t

diff --git a/platform/panduza_platform/devices/hanmatek/hm310t.py b/platform/panduza_platform/devices/hanmatek/hm310t.py
diff --git a/platform/panduza_platform/devices/hanmatek/hm310t/dev_hm310t.py b/platform/panduza_platform/devices/hanmatek/hm310t/dev_hm310t.py
@@ -0,0 +1,34 @@
+from core.platform_device import PlatformDevice
+
+USBID_VENDOR="1a86"
+USBID_MODEL="7523"
+TTY_BASE="/dev/ttyUSB"
+
+from .itf_hanmatek_hm310t_bpc import InterfaceHanmatekHm310tBpc
+from .itf_hanmatek_hm310t_ammeter import InterfaceHanmatekHM310tAmmeter
+
+class DeviceHanmatekHm310t(PlatformDevice):
+    """Power Supply From Hanmatek
+    """
+
+    def _PZA_DEV_config(self):
+        """
+        """
+        return {
+            "family": "PSU",
+            "model": "Hm310t",
+            "manufacturer": "Hanmatek"
+        }
+
+    # ---
+
+    async def _PZA_DEV_mount_interfaces(self):
+        """
+        """
+        self.mount_interface(
+            InterfaceHanmatekHm310tBpc(name=f":channel_0:_ctrl")
+        )
+        self.mount_interface(
+            InterfaceHanmatekHM310tAmmeter(name=f":channel_0:_am")
+        )
+
diff --git a/...rs/ammeter/drv_hanmatek_hm310t_ammeter.py → ...tek/hm310t/itf_hanmatek_hm310t_ammeter.py b/...rs/ammeter/drv_hanmatek_hm310t_ammeter.py → ...tek/hm310t/itf_hanmatek_hm310t_ammeter.py
@@ -2,7 +2,7 @@
 from meta_drivers.ammeter import MetaDriverAmmeter
 from connectors.modbus_client_serial import ConnectorModbusClientSerial
 
-class DriverHM310tAmmeter(MetaDriverAmmeter):
+class InterfaceHanmatekHM310tAmmeter(MetaDriverAmmeter):
     """
     """
 
@@ -18,18 +18,13 @@ async def _PZA_DRV_loop_init(self):
         """Driver initialization
         """
 
-        # Load settings
-        assert_that(tree, has_key("settings"))
-        settings = tree["settings"]
-        assert_that(settings, instance_of(dict))
-
         # Checks
-        assert_that(settings, has_key("usb_vendor"))
-        assert_that(settings, has_key("usb_model"))
-        assert_that(settings, has_key("serial_baudrate"))
+        assert_that(self.settings, has_key("usb_vendor"))
+        assert_that(self.settings, has_key("usb_model"))
+        assert_that(self.settings, has_key("serial_baudrate"))
 
         # Get the gate
-        self.modbus = await ConnectorModbusClientSerial.Get(**settings)
+        self.modbus = await ConnectorModbusClientSerial.Get(**self.settings)
 
         # 
         self.modbus_unit = 1

diff --git a/...rm/drivers/bpc/drv_hanmatek_hm310t_bpc.py → ...anmatek/hm310t/itf_hanmatek_hm310t_bpc.py b/...rm/drivers/bpc/drv_hanmatek_hm310t_bpc.py → ...anmatek/hm310t/itf_hanmatek_hm310t_bpc.py
@@ -12,7 +12,7 @@ def int_to_state_string(v_int):
     position = val_list.index(v_int)
     return key_list[position]
 
-class DrvHanmatekHm310tBpc(MetaDriverBpc):
+class InterfaceHanmatekHm310tBpc(MetaDriverBpc):
     """ Driver to manage the HM310T power supply
     """
 
@@ -35,18 +35,13 @@ async def _PZA_DRV_loop_init(self):
         """Driver initialization
         """
 
-        # Load settings
-        assert_that(tree, has_key("settings"))
-        settings = tree["settings"]
-        assert_that(settings, instance_of(dict))
-
         # Checks
-        assert_that(settings, has_key("usb_vendor"))
-        assert_that(settings, has_key("usb_model"))
-        assert_that(settings, has_key("serial_baudrate"))
+        assert_that(self.settings, has_key("usb_vendor"))
+        assert_that(self.settings, has_key("usb_model"))
+        assert_that(self.settings, has_key("serial_baudrate"))
 
         # Get the gate
-        self.modbus = await ConnectorModbusClientSerial.Get(**settings)
+        self.modbus = await ConnectorModbusClientSerial.Get(**self.settings)
 
         # 
         self.modbus_unit = 1

diff --git a/platform/panduza_platform/devices/korad/__init__.py b/platform/panduza_platform/devices/korad/__init__.py
@@ -1,4 +1,4 @@
-from .ka3005 import DeviceKoradKA3005P
+from .ka3005.dev_ka3005 import DeviceKoradKA3005P
 
 PZA_DEVICES_LIST= [ 
     DeviceKoradKA3005P

diff --git a/.../panduza_platform/devices/korad/ka3005.py → ...atform/devices/korad/ka3005/dev_ka3005.py b/.../panduza_platform/devices/korad/ka3005.py → ...atform/devices/korad/ka3005/dev_ka3005.py
@@ -1,6 +1,10 @@
-
 from core.platform_device import PlatformDevice
 
+from .itf_korad_ka3005p_bpc import InterfaceKoradKa3005pBPC
+from .itf_korad_ka3005p_ammeter import InterfaceKoradKa3005pAmmeter
+from .itf_korad_ka3005p_voltmeter import InterfaceKoradKa3005pVoltmeter
+
+
 class DeviceKoradKA3005P(PlatformDevice):
     """Power Supply From Korad
     """

diff --git a/...vers/ammeter/drv_korad_ka3005p_ammeter.py → ...korad/ka3005/itf_korad_ka3005p_ammeter.py b/...vers/ammeter/drv_korad_ka3005p_ammeter.py → ...korad/ka3005/itf_korad_ka3005p_ammeter.py
@@ -5,7 +5,7 @@
 
 COMMAND_TIME_LOCK=0.1
 
-class DrvKoradKa3005pAmmeter(MetaDriverAmmeter):
+class InterfaceKoradKa3005pAmmeter(MetaDriverAmmeter):
     # =============================================================================
     # FROM MetaDriverAmmeter
 

diff --git a/...form/drivers/bpc/drv_korad_ka3005p_bpc.py → ...ces/korad/ka3005/itf_korad_ka3005p_bpc.py b/...form/drivers/bpc/drv_korad_ka3005p_bpc.py → ...ces/korad/ka3005/itf_korad_ka3005p_bpc.py
@@ -8,7 +8,7 @@
 
 COMMAND_TIME_LOCK=0.1
 
-class DrvKoradKa3005pBPC(MetaDriverBpc):
+class InterfaceKoradKa3005pBPC(MetaDriverBpc):
     # =============================================================================
     # FROM MetaDriverBpc
 

diff --git a/.../voltmeter/drv_korad_ka3005p_voltmeter.py → ...rad/ka3005/itf_korad_ka3005p_voltmeter.py b/.../voltmeter/drv_korad_ka3005p_voltmeter.py → ...rad/ka3005/itf_korad_ka3005p_voltmeter.py
@@ -5,7 +5,7 @@
 
 COMMAND_TIME_LOCK=0.1
 
-class DrvKoradKa3005pVoltmeter(MetaDriverVoltmeter):
+class InterfaceKoradKa3005pVoltmeter(MetaDriverVoltmeter):
     # =============================================================================
     # FROM MetaDriverVoltmeter
 

diff --git a/platform/panduza_platform/devices/panduza/server/dev_server.py b/platform/panduza_platform/devices/panduza/server/dev_server.py
@@ -2,8 +2,6 @@
 
 from .itf_platform import InterfacePanduzaPlatform
 
-import asyncio
-
 class DevicePanduzaServer(PlatformDevice):
     """Represent the machine on which the platform is running
     """

diff --git a/platform/panduza_platform/devices/panduza/server/itf_platform.py b/platform/panduza_platform/devices/panduza/server/itf_platform.py
@@ -25,8 +25,6 @@ async def _PZA_DRV_loop_init(self):
         """From PlatformDriver
         """
 
-        self.log.info("!!! inin interface ???????????????????????????")
-
 
         # Set command handlers
         self.__cmd_handlers = {

diff --git a/platform/panduza_platform/devices/tenma/__init__.py b/platform/panduza_platform/devices/tenma/__init__.py
@@ -1,4 +1,4 @@
-from .t722710 import DeviceTenma722710
+from .t722710.t722710 import DeviceTenma722710
 
 PZA_DEVICES_LIST= [ 
     DeviceTenma722710

diff --git a/...tform/drivers/bpc/drv_tenma_722710_bpc.py → ...ces/tenma/t722710/drv_tenma_722710_bpc.py b/...tform/drivers/bpc/drv_tenma_722710_bpc.py → ...ces/tenma/t722710/drv_tenma_722710_bpc.py
diff --git a/...panduza_platform/devices/tenma/t722710.py → ...platform/devices/tenma/t722710/t722710.py b/...panduza_platform/devices/tenma/t722710.py → ...platform/devices/tenma/t722710/t722710.py
diff --git a/platform/panduza_platform/drivers/README.md b/platform/panduza_platform/drivers/README.md
diff --git a/platform/panduza_platform/drivers/__init__.py b/platform/panduza_platform/drivers/__init__.py
diff --git a/platform/panduza_platform/drivers/ammeter/__init__.py b/platform/panduza_platform/drivers/ammeter/__init__.py
diff --git a/platform/panduza_platform/drivers/ammeter/__init__.py.orig b/platform/panduza_platform/drivers/ammeter/__init__.py.orig
diff --git a/platform/panduza_platform/drivers/bpc/__init__.py b/platform/panduza_platform/drivers/bpc/__init__.py
diff --git a/platform/panduza_platform/drivers/bpc/__init__.py.orig b/platform/panduza_platform/drivers/bpc/__init__.py.orig
diff --git a/platform/panduza_platform/drivers/platform/__init__.py b/platform/panduza_platform/drivers/platform/__init__.py
diff --git a/platform/panduza_platform/drivers/voltmeter/__init__.py b/platform/panduza_platform/drivers/voltmeter/__init__.py