CrackNuts 0.0.3__tar.gz → 0.0.3.dev0__tar.gz

{cracknuts-0.0.3/src/cracknuts.egg-info → cracknuts-0.0.3.dev0}/PKG-INFO

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

{cracknuts-0.0.3 → cracknuts-0.0.3.dev0}/src/cracknuts/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.3"
+__version__ = "0.0.3.dev0"
 
 
 def version():

{cracknuts-0.0.3 → cracknuts-0.0.3.dev0}/src/cracknuts/cracker/basic_cracker.py

@@ -337,34 +337,12 @@ class CrackerS1(AbsCnpCracker):
         self._logger.debug(f"scrat_force payload: {payload}")
         return self.send_with_command(Commands.OSC_FORCE, payload=payload)
 
-    def osc_set_clock_base_freq_mul_div(self, mult_int: int, mult_fra: int, div: int):
-        payload = struct.pack(">BHB", mult_int, mult_fra, div)
-        self._logger.debug(f"osc_set_clock_base_freq_mul_div payload: {payload.hex()}")
-        return self.send_with_command(Commands.OSC_CLOCK_BASE_FREQ_MUL_DIV, payload=payload)
-
-    def osc_set_sample_divisor(self, div_int: int, div_frac: int):
-        payload = struct.pack(">BH", div_int, div_frac)
-        self._logger.debug(f"osc_set_sample_divisor payload: {payload.hex()}")
-        return self.send_with_command(Commands.OSC_CLOCK_SAMPLE_DIVISOR, payload=payload)
+    def osc_set_sample_clock(self, clock: int):
+        payload = struct.pack(">I", clock)
+        self._logger.debug(f"scrat_sample_clock payload: {payload.hex()}")
+        return self.send_with_command(Commands.OSC_SAMPLE_CLOCK, payload=payload)
 
     def osc_set_sample_phase(self, phase: int):
         payload = struct.pack(">I", phase)
-        self._logger.debug(f"osc_set_sample_phase payload: {payload.hex()}")
-        return self.send_with_command(Commands.OSC_CLOCK_SAMPLE_PHASE, payload=payload)
-
-    def set_clock_nut_divisor(self, div: int):
-        payload = struct.pack(">B", div)
-        self._logger.debug(f"set_clock_nut_divisor payload: {payload.hex()}")
-        return self.send_with_command(Commands.OSC_CLOCK_NUT_DIVISOR, payload=payload)
-
-    # def osc_set_sample_clock(self, clock: int):
-    #     # payload = struct.pack(">I", clock)
-    #     # self._logger.debug(f"scrat_sample_clock payload: {payload.hex()}")
-    #     # return self.send_with_command(Commands.OSC_SAMPLE_CLOCK, payload=payload)
-    #     ...
-    #
-    # def osc_set_sample_phase(self, phase: int):
-    #     # payload = struct.pack(">I", phase)
-    #     # self._logger.debug(f"scrat_sample_phase payload: {payload.hex()}")
-    #     # return self.send_with_command(Commands.OSC_SAMPLE_PHASE, payload=payload)
-    #     ...
+        self._logger.debug(f"scrat_sample_phase payload: {payload.hex()}")
+        return self.send_with_command(Commands.OSC_SAMPLE_PHASE, payload=payload)

{cracknuts-0.0.3 → cracknuts-0.0.3.dev0}/src/cracknuts/cracker/cracker.py

@@ -85,14 +85,6 @@ class Cracker(typing.Protocol):
 
     def osc_set_sample_len(self, length: int): ...
 
-    def osc_set_clock_base_freq_mul_div(self, mult_int: int, mult_fra: int, div: int): ...
-
-    def osc_set_sample_divisor(self, div_int: int, div_frac: int): ...
-
-    def osc_set_sample_phase(self, phase: int): ...
-
-    def set_clock_nut_divisor(self, div: int): ...
-
     def osc_single(self): ...
 
     def osc_force(self): ...
@@ -107,9 +99,9 @@ class Cracker(typing.Protocol):
 
     def osc_set_analog_gain_raw(self, channel: int, gain: int): ...
 
-    # def osc_set_sample_clock(self, clock: int): ...
-    #
-    # def osc_set_sample_phase(self, phase: int): ...
+    def osc_set_sample_clock(self, clock: int): ...
+
+    def osc_set_sample_phase(self, phase: int): ...
 
     def nut_enable(self, enable: int): ...
 
@@ -175,14 +167,10 @@ class Commands:
     OSC_ANALOG_VOLTAGE = 0x0102
     OSC_ANALOG_BIAS_VOLTAGE = 0x0103
     OSC_ANALOG_GAIN = 0x0104
-    OSC_ANALOG_GAIN_RAW = 0x0105
-    OSC_CLOCK_BASE_FREQ_MUL_DIV = 0x0106
-    OSC_CLOCK_SAMPLE_DIVISOR = 0x0107
-    OSC_CLOCK_SAMPLE_PHASE = 0x0108
-    OSC_CLOCK_NUT_DIVISOR = 0x0109
+    OSC_ANALOG_GAIN_RAW = 0x0107
 
-    # OSC_SAMPLE_CLOCK = 0x0105
-    # OSC_SAMPLE_PHASE = 0x0106
+    OSC_SAMPLE_CLOCK = 0x0105
+    OSC_SAMPLE_PHASE = 0x0106
 
     OSC_DIGITAL_CHANNEL_ENABLE = 0x0110
     OSC_DIGITAL_VOLTAGE = 0x0111
@@ -399,11 +387,11 @@ class AbsCnpCracker(ABC, Cracker):
             resp_payload = self._recv(length)
             if status >= protocol.STATUS_ERROR:
                 self._logger.error(
-                    f"Receive payload from {self._server_address}: \n{hex_util.get_bytes_matrix(resp_payload)}"
+                    "Receive payload from {self._server_address}: \n{hex_util.get_bytes_matrix(resp_payload)}"
                 )
             else:
                 self._logger.debug(
-                    f"Receive payload from {self._server_address}: \n{hex_util.get_bytes_matrix(resp_payload)}"
+                    "Receive payload from {self._server_address}: \n{hex_util.get_bytes_matrix(resp_payload)}"
                 )
             return status, resp_payload
         except OSError as e:
@@ -517,23 +505,11 @@ class AbsCnpCracker(ABC, Cracker):
     def osc_set_analog_gain_raw(self, channel: int, gain: int): ...
 
     @abc.abstractmethod
-    def osc_set_clock_base_freq_mul_div(self, mult_int: int, mult_fra: int, div: int): ...
-
-    @abc.abstractmethod
-    def osc_set_sample_divisor(self, div_int: int, div_frac: int): ...
+    def osc_set_sample_clock(self, clock: int): ...
 
     @abc.abstractmethod
     def osc_set_sample_phase(self, phase: int): ...
 
-    @abc.abstractmethod
-    def set_clock_nut_divisor(self, div: int): ...
-
-    # @abc.abstractmethod
-    # def osc_set_sample_clock(self, clock: int): ...
-    #
-    # @abc.abstractmethod
-    # def osc_set_sample_phase(self, phase: int): ...
-
     @abc.abstractmethod
     def nut_enable(self, enable: int): ...
 

{cracknuts-0.0.3 → cracknuts-0.0.3.dev0}/src/cracknuts/cracker/protocol.py

@@ -4,7 +4,7 @@ __version__ = "1.0.0"
 
 DEFAULT_PORT = 9761
 
-MAGIC_STR = b"CRAK"
+MAGIC_STR = b"AHCC"
 
 # ┌───────────────────────────────────────────┬───────┐
 # │--------------Request Header---------------│-------│
@@ -12,7 +12,7 @@ MAGIC_STR = b"CRAK"
 # │-------------------------------------------│-------│
 # │ 4B   │  2B   │   1B    │   2B  │2B │  4B  │$Length│
 # │-------------------------------------------│-------│
-# │'CRAK'│   1   │   'S'   │       │   │      │       │
+# │'AHCC'│   1   │   'S'   │       │   │      │       │
 # └───────────────────────────────────────────┴───────┘
 
 REQ_HEADER_FORMAT = ">4sH1sHHI"
@@ -24,7 +24,7 @@ REQ_HEADER_SIZE = struct.calcsize(REQ_HEADER_FORMAT)
 # │--------------------------------------│-------│
 # │ 4B   │  2B   │   1B    │  2B  │  4B  │$Length│
 # │--------------------------------------│-------│
-# │'CRAK'│   1   │   'R'   │      │      │       │
+# │'AHCC'│   1   │   'R'   │      │      │       │
 # └──────────────────────────────────────┴───────┘
 
 RES_HEADER_FORMAT = ">4sH1sHI"

{cracknuts-0.0.3 → cracknuts-0.0.3.dev0}/src/cracknuts/cracker/stateful_cracker.py

@@ -123,24 +123,12 @@ class StatefulCracker(Cracker):
     def osc_force(self):
         return self._cracker.osc_force()
 
-    def osc_set_clock_base_freq_mul_div(self, mult_int: int, mult_fra: int, div: int):
-        return self._cracker.osc_set_clock_base_freq_mul_div(mult_int, mult_fra, div)
-
-    def osc_set_sample_divisor(self, div_int: int, div_frac: int):
-        return self._cracker.osc_set_sample_divisor(div_int, div_frac)
+    def osc_set_sample_clock(self, clock: int):
+        return self._cracker.osc_set_sample_clock(clock)
 
     def osc_set_sample_phase(self, phase: int):
         return self._cracker.osc_set_sample_phase(phase)
 
-    def set_clock_nut_divisor(self, div: int):
-        return self._cracker.set_clock_nut_divisor(div)
-
-    # def osc_set_sample_clock(self, clock: int):
-    #     return self._cracker.osc_set_sample_clock(clock)
-    #
-    # def osc_set_sample_phase(self, phase: int):
-    #     return self._cracker.osc_set_sample_phase(phase)
-
     def osc_single(self):
         return self._cracker.osc_single()
 

{cracknuts-0.0.3 → cracknuts-0.0.3.dev0/src/cracknuts.egg-info}/PKG-INFO

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