makcu 0.1.2__tar.gz → 0.1.3__tar.gz

{makcu-0.1.2/makcu.egg-info → makcu-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makcu
-Version: 0.1.2
+Version: 0.1.3
 Summary: Python library to interact with Makcu devices.
 Author: SleepyTotem
 License: GPL
@@ -307,4 +307,4 @@ Please open an issue on the project repository and I will get to it asap
 ## 🌐 Links
 
 - 🔗 [Project Homepage](https://github.com/SleepyTotem/makcu-py-lib)
-- 🔗 [PyPi Homepage](https://github.com/SleepyTotem/makcu-py-lib)
+- 🔗 [PyPI Homepage](https://pypi.org/project/makcu/)

{makcu-0.1.2 → makcu-0.1.3}/README.md

@@ -295,4 +295,4 @@ Please open an issue on the project repository and I will get to it asap
 ## 🌐 Links
 
 - 🔗 [Project Homepage](https://github.com/SleepyTotem/makcu-py-lib)
-- 🔗 [PyPi Homepage](https://github.com/SleepyTotem/makcu-py-lib)
+- 🔗 [PyPI Homepage](https://pypi.org/project/makcu/)

{makcu-0.1.2 → makcu-0.1.3}/makcu/__main__.py

@@ -33,7 +33,7 @@ def debug_console():
 def test_port(port):
     try:
         print(f"Trying to connect to {port} (without init command)...")
-        controller = create_controller(send_init=False)
+        controller = create_controller(fallback_com_port=port, send_init=False)
         print(f"✅ Successfully connected to {port}")
         controller.disconnect()
     except MakcuConnectionError as e:
@@ -47,14 +47,14 @@ def run_tests():
     package_dir = Path(__file__).resolve().parent
     test_file = package_dir / "test_suite.py"
 
-    sys.exit(pytest.main([
+    result = pytest.main([
         str(test_file),
         "--rootdir", str(package_dir),
         "-v", "--tb=short",
         "--capture=tee-sys",
         "--html=latest_pytest.html",
         "--self-contained-html"
-    ]))
+    ])
 
     report_path = os.path.abspath("latest_pytest.html")
     if os.path.exists(report_path):
@@ -63,11 +63,13 @@ def run_tests():
     else:
         print("❌ Report not found. Something went wrong.")
 
-    if result.returncode != 0:
+    if result != 0:
         print("❌ Some tests failed.")
     else:
         print("✅ All tests passed.")
 
+    sys.exit(result)
+    
 def main():
     args = sys.argv[1:]
 

{makcu-0.1.2 → makcu-0.1.3}/makcu/connection.py

@@ -153,7 +153,6 @@ class SerialTransport:
         return self._is_connected
 
     def send_command(self, command, expect_response=False):
-        time.sleep(0.06)
         if not self._is_connected or not self.serial or not self.serial.is_open:
             raise MakcuConnectionError("Serial connection not open.")
         with self._lock:
@@ -170,15 +169,13 @@ class SerialTransport:
             finally:
                 self._pause_listener = False
 
+
     def get_button_states(self):
         return dict(self._button_states)
 
     def get_button_mask(self) -> int:
-        mask = 0
-        for i, name in self.button_map.items():
-            if self._button_states.get(name, False):
-                mask |= (1 << i)
-        return mask
+        return self._last_mask
+
 
     def enable_button_monitoring(self, enable: bool = True):
         self.send_command("km.buttons(1)" if enable else "km.buttons(0)")
@@ -226,46 +223,49 @@ class SerialTransport:
 
             try:
                 byte = self.serial.read(1)
-                if byte:
-                    value = byte[0]
-
-                    if value != self._last_mask:
-                        byte_str = str(byte)
+                if not byte:
+                    continue
 
-                        if "b'\\x00" in byte_str:
-                            for bit in self.button_map:
-                                button_states[bit] = False
+                value = byte[0]
+                byte_str = str(byte)
 
-                        elif "b'\\x" in byte_str:
-                            for bit, name in self.button_map.items():
-                                is_pressed = bool(value & (1 << bit))
-                                if is_pressed != button_states[bit]:
-                                    button_states[bit] = is_pressed
+                if not byte_str.startswith("b'\\x"):
+                    continue
 
+                if value != self._last_mask:
+                    if byte_str.startswith("b'\\x00"):
                         for bit, name in self.button_map.items():
-                            self._button_states[name] = button_states[bit]
+                            button_states[bit] = False
+                            self._button_states[name] = False
+                            if debug:
+                                print(f"{name} -> False")
+                    else:
+                        for bit, name in self.button_map.items():
+                            is_pressed = bool(value & (1 << bit))
+                            button_states[bit] = is_pressed
+                            self._button_states[name] = is_pressed
+                            if debug:
+                                print(f"{name} -> {is_pressed}")
 
-                        if self._button_callback:
-                            for bit, name in self.button_map.items():
-                                previous = bool(self._last_mask & (1 << bit))
-                                current = bool(value & (1 << bit))
-                                if previous != current:
-                                    button_enum = self._button_enum_map.get(bit)
-                                    if button_enum:
-                                        self._button_callback(button_enum, current)
+                    if self._button_callback:
+                        for bit, name in self.button_map.items():
+                            previous = bool(self._last_mask & (1 << bit))
+                            current = bool(value & (1 << bit))
+                            if previous != current:
+                                button_enum = self._button_enum_map.get(bit)
+                                if button_enum:
+                                    self._button_callback(button_enum, current)
 
-                        self._last_mask = value
+                    self._last_mask = value
 
-                        if debug:
-                            pressed = [name for bit, name in self.button_map.items() if button_states[bit]]
-                            button_str = ", ".join(pressed) if pressed else "No buttons pressed"
-                            self._log(f"Byte: {value} (0x{value:02X}) -> {button_str}")
+                    if debug:
+                        pressed = [name for bit, name in self.button_map.items() if button_states[bit]]
+                        button_str = ", ".join(pressed) if pressed else "No buttons pressed"
+                        self._log(f"Byte: {value} (0x{value:02X}) -> {button_str}")
 
             except serial.SerialException as e:
                 if "ClearCommError failed" not in str(e):
                     self._log(f"Serial error during listening: {e}")
                     break
 
-            time.sleep(0.0001)
-
         self._log("Listener thread exiting")

{makcu-0.1.2 → makcu-0.1.3}/makcu/controller.py

@@ -25,8 +25,8 @@ class MakcuController:
 
     def click(self, button: MouseButton):
         self._check_connection()
-        self.mouse.press(button)
-        self.mouse.release(button)
+        self._send_button_command(button, 1)
+        self._send_button_command(button, 0)
 
     def move(self, dx: int, dy: int):
         self._check_connection()
@@ -72,6 +72,14 @@ class MakcuController:
         self._check_connection()
         self.mouse.lock_side2(lock)
 
+    def lock_x(self, lock: bool):
+        self._check_connection()
+        self.mouse.lock_x(lock)
+
+    def lock_y(self, lock: bool):
+        self._check_connection()
+        self.mouse.lock_y(lock)
+
     def spoof_serial(self, serial: str):
         self._check_connection()
         self.mouse.spoof_serial(serial)
@@ -96,13 +104,18 @@ class MakcuController:
         self._check_connection()
         return self.mouse.is_button_locked(button)
 
-    def capture(self, button: MouseButton):
-        self._check_connection()
-        self.mouse.begin_capture(button.name)
+    #def capture(self, button: MouseButton):
+    #    self._check_connection()
+    #    self.mouse.begin_capture(button.name)
 
-    def get_captured_clicks(self, button: MouseButton) -> int:
-        self._check_connection()
-        return self.mouse.stop_capturing_clicks(button.name)
+
+    #def stop_capturing_clicks(self, button: str) -> int:
+    #    self._check_connection()
+    #    return self.mouse.stop_capturing_clicks(button)
+    
+    #def get_captured_clicks(self, button: MouseButton) -> int:
+    #    self._check_connection()
+    #    return self.mouse.stop_capturing_clicks(button.name)
 
 
     def click_human_like(self, button: MouseButton, count: int = 1,
@@ -110,15 +123,15 @@ class MakcuController:
         self._check_connection()
 
         timing_profiles = {
-            "normal": {"min_down": 60,  "max_down": 120, "min_wait": 100, "max_wait": 180},
-            "fast":   {"min_down": 30,  "max_down": 60,  "min_wait": 50,  "max_wait": 100},
-            "slow":   {"min_down": 100, "max_down": 180, "min_wait": 150, "max_wait": 300},
+            "normal": (60, 120, 100, 180),
+            "fast": (30, 60, 50, 100),
+            "slow": (100, 180, 150, 300),
         }
 
         if profile not in timing_profiles:
             raise ValueError(f"Invalid profile: {profile}. Choose from {list(timing_profiles.keys())}")
 
-        t = timing_profiles[profile]
+        min_down, max_down, min_wait, max_wait = timing_profiles[profile]
 
         for _ in range(count):
             if jitter > 0:
@@ -126,10 +139,10 @@ class MakcuController:
                 dy = random.randint(-jitter, jitter)
                 self.mouse.move(dx, dy)
 
-            self.mouse.press(button)
-            time.sleep(random.uniform(t["min_down"], t["max_down"]) / 1000.0)
+            self.press(button)
+            time.sleep(random.uniform(min_down, max_down) / 1000.0)
             self.mouse.release(button)
-            time.sleep(random.uniform(t["min_wait"], t["max_wait"]) / 1000.0)
+            time.sleep(random.uniform(min_wait, max_wait) / 1000.0)
     
     def enable_button_monitoring(self, enable: bool = True):
         self._check_connection()
@@ -142,18 +155,17 @@ class MakcuController:
     def get_all_lock_states(self) -> dict:
         self._check_connection()
         return self.mouse.get_all_lock_states()
-
-    def stop_capturing_clicks(self, button: str) -> int:
-        self._check_connection()
-        return self.mouse.stop_capturing_clicks(button)
+    
+    def _send_button_command(self, button: MouseButton, state: int):
+        self.mouse._send_button_command(button, state)
 
     def press(self, button: MouseButton):
         self._check_connection()
-        self.mouse.press(button)
+        self._send_button_command(button, 1)
 
     def release(self, button: MouseButton):
         self._check_connection()
-        self.mouse.release(button)
+        self._send_button_command(button, 0)
         
     def get_button_states(self) -> dict:
         self._check_connection()

{makcu-0.1.2 → makcu-0.1.3}/makcu/mouse.py

@@ -6,27 +6,17 @@ class Mouse:
     def __init__(self, transport):
         self.transport = transport
 
-    def press(self, button: MouseButton):
-        cmd = {
-            MouseButton.LEFT: "km.left(1)",
-            MouseButton.RIGHT: "km.right(1)",
-            MouseButton.MIDDLE: "km.middle(1)"
-        }.get(button)
-        if cmd:
-            self.transport.send_command(cmd)
-        else:
-            raise MakcuCommandError(f"Unsupported button for press(): {button}")
-
-    def release(self, button: MouseButton):
-        cmd = {
-            MouseButton.LEFT: "km.left(0)",
-            MouseButton.RIGHT: "km.right(0)",
-            MouseButton.MIDDLE: "km.middle(0)"
-        }.get(button)
-        if cmd:
-            self.transport.send_command(cmd)
-        else:
-            raise MakcuCommandError(f"Unsupported button for release(): {button}")
+    def _send_button_command(self, button: MouseButton, state: int):
+        command_map = {
+            MouseButton.LEFT: "left",
+            MouseButton.RIGHT: "right",
+            MouseButton.MIDDLE: "middle",
+            MouseButton.MOUSE4: "ms1",
+            MouseButton.MOUSE5: "ms2",
+        }
+        if button not in command_map:
+            raise MakcuCommandError(f"Unsupported button: {button}")
+        self.transport.send_command(f"km.{command_map[button]}({state})")
 
     def move(self, x: int, y: int):
         self.transport.send_command(f"km.move({x},{y})")
@@ -40,7 +30,9 @@ class Mouse:
     def scroll(self, delta: int):
         self.transport.send_command(f"km.wheel({delta})")
 
-    def lock_left(self, lock: bool): self.transport.send_command(f"km.lock_ml({int(lock)})")
+    def lock_left(self, lock: bool): 
+        self.transport.send_command(f"km.lock_ml({int(lock)})")
+        print(f"km.lock_ml({int(lock)})")
     def lock_middle(self, lock: bool): self.transport.send_command(f"km.lock_mm({int(lock)})")
     def lock_right(self, lock: bool): self.transport.send_command(f"km.lock_mr({int(lock)})")
     def lock_side1(self, lock: bool): self.transport.send_command(f"km.lock_ms1({int(lock)})")

{makcu-0.1.2 → makcu-0.1.3}/makcu/test_suite.py

@@ -1,22 +1,17 @@
-import pytest
+import pytest, time
 from makcu import MouseButton
 
-def test_is_button_pressed(makcu):
-    assert makcu.is_button_pressed(MouseButton.LEFT) in [True, False]
-
 def test_press_and_release(makcu):
     makcu.press(MouseButton.LEFT)
     makcu.release(MouseButton.LEFT)
 
 def test_firmware_version(makcu):
-    print("Getting firmware version...")
     version = makcu.mouse.get_firmware_version()
-    print(f"Firmware version: {version}")
     assert version and len(version.strip()) > 0
 
 def test_middle_click(makcu):
-    makcu.mouse.press(MouseButton.MIDDLE)
-    makcu.mouse.release(MouseButton.MIDDLE)
+    makcu.press(MouseButton.MIDDLE)
+    makcu.release(MouseButton.MIDDLE)
 
 def test_device_info(makcu):
     print("Fetching device info...")
@@ -34,9 +29,9 @@ def test_capture_right_clicks(makcu):
     assert makcu.mouse.is_button_locked(MouseButton.RIGHT)
 
     makcu.mouse.begin_capture("RIGHT")
-    makcu.mouse.press(MouseButton.RIGHT)
+    makcu.press(MouseButton.RIGHT)
     makcu.mouse.release(MouseButton.RIGHT)
-    makcu.mouse.press(MouseButton.RIGHT)
+    makcu.press(MouseButton.RIGHT)
     makcu.mouse.release(MouseButton.RIGHT)
 
     makcu.mouse.lock_right(False)
@@ -61,6 +56,8 @@ def test_lock_state(makcu):
     print("Locking LEFT button...")
     makcu.lock_left(True)
 
+    time.sleep(0.1)
+
     print("Querying lock state while LEFT is locked...")
     assert makcu.is_button_locked(MouseButton.LEFT)
 
@@ -71,6 +68,11 @@ def test_lock_state(makcu):
     assert all_states["LEFT"] is True
     assert isinstance(all_states["RIGHT"], bool)
 
+    makcu.press(MouseButton.LEFT)
+    makcu.release(MouseButton.LEFT)
+
+    time.sleep(0.1)
+
     print("Unlocking LEFT button...")
     makcu.lock_left(False)
 

{makcu-0.1.2 → makcu-0.1.3/makcu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makcu
-Version: 0.1.2
+Version: 0.1.3
 Summary: Python library to interact with Makcu devices.
 Author: SleepyTotem
 License: GPL
@@ -307,4 +307,4 @@ Please open an issue on the project repository and I will get to it asap
 ## 🌐 Links
 
 - 🔗 [Project Homepage](https://github.com/SleepyTotem/makcu-py-lib)
-- 🔗 [PyPi Homepage](https://github.com/SleepyTotem/makcu-py-lib)
+- 🔗 [PyPI Homepage](https://pypi.org/project/makcu/)

{makcu-0.1.2 → makcu-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "makcu"
-version = "0.1.2"
+version = "0.1.3"
 description = "Python library to interact with Makcu devices."
 readme = "README.md"
 requires-python = ">=3.7"