cracknuts 0.0.1.dev2__tar.gz → 0.0.2.dev3__tar.gz

{cracknuts-0.0.1.dev2/src/cracknuts.egg-info → cracknuts-0.0.2.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cracknuts
-Version: 0.0.1.dev2
+Version: 0.0.2.dev3
 Summary: A library for cracknuts device.
 Author-email: Dingzb <dingzibiao@gmail.com>
 Maintainer-email: Dingzb <dingzibiao@gmail.com>

{cracknuts-0.0.1.dev2 → cracknuts-0.0.2.dev3}/src/cracknuts/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.1.dev2"
+__version__ = "0.0.2.dev3"
 
 
 def version():

{cracknuts-0.0.1.dev2 → cracknuts-0.0.2.dev3}/src/cracknuts/cracker/basic_cracker.py

@@ -30,6 +30,20 @@ class CrackerS1(AbsCnpCracker):
         _, res = self.send_and_receive(protocol.build_send_message(Commands.GET_VERSION))
         return res.decode("ascii") if res is not None else None
 
+    def cracker_read_register(self, base_address: int, offset: int) -> tuple[int, bytes]:
+        payload = struct.pack(">II", base_address, offset)
+        self._logger.debug(f"cracker_read_register payload: {payload.hex()}")
+        return self.send_with_command(Commands.CRACKER_READ_REGISTER, payload=payload)
+
+    def cracker_write_register(self, base_address: int, offset: int, data: int | str) -> tuple[int, bytes]:
+        if isinstance(data, str):
+            if data.startswith("0x") or data.startswith("0X"):
+                data = data[2:]
+            data = bytes.fromhex(data)
+        payload = struct.pack(">III", base_address, offset, data)
+        self._logger.debug(f"cracker_write_register payload: {payload.hex()}")
+        return self.send_with_command(Commands.CRACKER_WRITE_REGISTER, payload=payload)
+
     def osc_set_analog_channel_enable(self, enable: dict[int, bool]):
         self._channel_enable = enable
         payload = 0

{cracknuts-0.0.1.dev2 → cracknuts-0.0.2.dev3}/src/cracknuts/cracker/cracker.py

@@ -44,6 +44,23 @@ class Cracker(typing.Protocol):
 
     def get_version(self) -> str | None: ...
 
+    def cracker_read_register(self, base_address: int, offset: int) -> tuple[int, bytes]:
+        """Read register
+        :param base_address: the base address of the register
+        :param offset: the offset of the register
+        :return: the result of reading the register
+        """
+        ...
+
+    def cracker_write_register(self, base_address: int, offset: int, data) -> tuple[int, bytes]:
+        """Write register
+        :param base_address: the base address of the register
+        :param offset: the offset of the register
+        :param data: the data to be written
+        :return: the result of writing the register
+        """
+        ...
+
     def osc_set_analog_channel_enable(self, enable: dict[int, bool]): ...
 
     def osc_set_analog_coupling(self, coupling: dict[int, int]): ...
@@ -142,6 +159,9 @@ class Commands:
     GET_NAME = 0x0002
     GET_VERSION = 0x0003
 
+    CRACKER_READ_REGISTER = 0x0004
+    CRACKER_WRITE_REGISTER = 0x0005
+
     OSC_ANALOG_CHANNEL_ENABLE = 0x0100
     OSC_ANALOG_COUPLING = 0x0101
     OSC_ANALOG_VOLTAGE = 0x0102
@@ -247,13 +267,16 @@ class AbsCnpCracker(ABC, Cracker):
     Cracker
     """
 
-    def __init__(self, server_address=None):
+    def __init__(self, address: tuple | str | None = None):
         """
-        :param server_address: Cracker device address (ip, port)
+        :param address: Cracker device address (ip, port) or "cnp://xxx:xx"
         """
         self._command_lock = threading.Lock()
         self._logger = logger.get_logger(self)
-        self._server_address = server_address
+        if isinstance(address, tuple):
+            self._server_address = address
+        elif isinstance(address, str):
+            self.set_uri(address)
         self._socket: socket.socket | None = None
         self._connection_status = False
         self._channel_enable: dict = {
@@ -294,6 +317,9 @@ class AbsCnpCracker(ABC, Cracker):
             if not self._socket:
                 self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                 self._socket.settimeout(5)
+            if self._connection_status:
+                self._logger.debug("Already connected, reuse.")
+                return
             self._socket.connect(self._server_address)
             self._connection_status = True
             self._logger.info(f"Connected to cracker: {self._server_address}")
@@ -415,6 +441,12 @@ class AbsCnpCracker(ABC, Cracker):
     def get_version(self) -> str | None:
         return super().get_version()
 
+    @abc.abstractmethod
+    def cracker_read_register(self, base_address: int, offset: int) -> tuple[int, bytes]: ...
+
+    @abc.abstractmethod
+    def cracker_write_register(self, base_address: int, offset: int, data) -> tuple[int, bytes]: ...
+
     @abc.abstractmethod
     def osc_set_analog_channel_enable(self, enable: dict[int, bool]): ...
 

{cracknuts-0.0.1.dev2 → cracknuts-0.0.2.dev3}/src/cracknuts/cracker/stateful_cracker.py

@@ -73,6 +73,12 @@ class StatefulCracker(Cracker):
     def get_version(self) -> str:
         return self._cracker.get_version()
 
+    def cracker_read_register(self, base_address: int, offset: int) -> tuple[int, bytes]:
+        return self._cracker.cracker_read_register(base_address, offset)
+
+    def cracker_write_register(self, base_address: int, offset: int, data) -> tuple[int, bytes]:
+        return self._cracker.cracker_write_register(base_address, offset, data)
+
     def osc_set_analog_channel_enable(self, enable: dict[int, bool]):
         self._config.osc_analog_channel_enable = enable
         return self._cracker.osc_set_analog_channel_enable(enable)

{cracknuts-0.0.1.dev2 → cracknuts-0.0.2.dev3/src/cracknuts.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cracknuts
-Version: 0.0.1.dev2
+Version: 0.0.2.dev3
 Summary: A library for cracknuts device.
 Author-email: Dingzb <dingzibiao@gmail.com>
 Maintainer-email: Dingzb <dingzibiao@gmail.com>