makcu 0.1.1__tar.gz → 0.1.3__tar.gz

makcu-0.1.3/MANIFEST.in

@@ -0,0 +1,7 @@
+include README.md
+include LICENSE
+include pyproject.toml
+include pytest.ini
+
+recursive-include makcu *.py
+prune makcu/tests

{makcu-0.1.1 → makcu-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makcu
-Version: 0.1.1
+Version: 0.1.3
 Summary: Python library to interact with Makcu devices.
 Author: SleepyTotem
 License: GPL
@@ -65,7 +65,7 @@ python -m makcu --runtest
 ```python
 from makcu import create_controller, MouseButton
 
-makcu = create_controller()
+makcu = create_controller("COM1") # Fallback port
 makcu.click(MouseButton.LEFT)
 makcu.move(100, 50)
 makcu.scroll(-1)
@@ -85,7 +85,7 @@ makcu = create_controller(debug=True, send_init=True)
 #### Set fallback port manually
 
 ```python
-makcu.set_port("COM4")  # use before create_controller()
+makcu = create_controller("COM4")  # Optional fallback com port
 ```
 
 ---
@@ -189,17 +189,9 @@ def on_button_event(button, pressed):
 makcu.set_button_callback(on_button_event)
 ```
 
-### Configure Debounce
-
-```python
-makcu.set_callback_debounce_time(100)  # milliseconds
-```
-
 ---
 
-## Click Capturing
-
-### ❌ **Currently broken (Pending Firmware Update)**
+## ❌ Click Capturing (Pending Firmware Update)
 
 Click capturing will allow you to detect and count click events in software.
 
@@ -248,6 +240,8 @@ if makcu.is_button_pressed(MouseButton.RIGHT):
 ### Send raw serial commands
 
 ```python
+from makcu import create_controller
+makcu = create_controller()
 response = makcu.transport.send_command("km.version()", expect_response=True)
 print(response)
 ```
@@ -313,3 +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://pypi.org/project/makcu/)

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

@@ -53,7 +53,7 @@ python -m makcu --runtest
 ```python
 from makcu import create_controller, MouseButton
 
-makcu = create_controller()
+makcu = create_controller("COM1") # Fallback port
 makcu.click(MouseButton.LEFT)
 makcu.move(100, 50)
 makcu.scroll(-1)
@@ -73,7 +73,7 @@ makcu = create_controller(debug=True, send_init=True)
 #### Set fallback port manually
 
 ```python
-makcu.set_port("COM4")  # use before create_controller()
+makcu = create_controller("COM4")  # Optional fallback com port
 ```
 
 ---
@@ -177,17 +177,9 @@ def on_button_event(button, pressed):
 makcu.set_button_callback(on_button_event)
 ```
 
-### Configure Debounce
-
-```python
-makcu.set_callback_debounce_time(100)  # milliseconds
-```
-
 ---
 
-## Click Capturing
-
-### ❌ **Currently broken (Pending Firmware Update)**
+## ❌ Click Capturing (Pending Firmware Update)
 
 Click capturing will allow you to detect and count click events in software.
 
@@ -236,6 +228,8 @@ if makcu.is_button_pressed(MouseButton.RIGHT):
 ### Send raw serial commands
 
 ```python
+from makcu import create_controller
+makcu = create_controller()
 response = makcu.transport.send_command("km.version()", expect_response=True)
 print(response)
 ```
@@ -300,4 +294,5 @@ 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)
+- 🔗 [Project Homepage](https://github.com/SleepyTotem/makcu-py-lib)
+- 🔗 [PyPI Homepage](https://pypi.org/project/makcu/)

{makcu-0.1.1 → makcu-0.1.3}/makcu/__init__.py

@@ -2,8 +2,8 @@ from .controller import MakcuController
 from .enums import MouseButton
 from .errors import MakcuError, MakcuConnectionError
 
-def create_controller(debug=False, send_init=True):
-    makcu = MakcuController(debug=debug, send_init=send_init)
+def create_controller(fallback_com_port="", debug=False, send_init=True):
+    makcu = MakcuController(fallback_com_port, debug=debug, send_init=send_init)
     makcu.connect()
     return makcu
 

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

@@ -1,9 +1,8 @@
-# makcu/__main__.py
-
 import sys
-import subprocess
 import webbrowser
 import os
+from pathlib import Path
+import pytest
 from makcu import create_controller, MakcuConnectionError
 
 def debug_console():
@@ -34,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:
@@ -44,15 +43,33 @@ def test_port(port):
 
 def run_tests():
     print("🧪 Running Pytest Suite...")
-    subprocess.run([
-        sys.executable, "-m", "pytest",
-        "--html=latest_pytest.html", "--self-contained-html"
+
+    package_dir = Path(__file__).resolve().parent
+    test_file = package_dir / "test_suite.py"
+
+    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")
-    print(f"📄 Opening test report: {report_path}")
-    webbrowser.open(f"file://{report_path}")
+    if os.path.exists(report_path):
+        print(f"📄 Opening test report: {report_path}")
+        webbrowser.open(f"file://{report_path}")
+    else:
+        print("❌ Report not found. Something went wrong.")
+
+    if result != 0:
+        print("❌ Some tests failed.")
+    else:
+        print("✅ All tests passed.")
 
+    sys.exit(result)
+    
 def main():
     args = sys.argv[1:]
 

makcu-0.1.3/makcu/conftest.py

@@ -0,0 +1,22 @@
+import pytest
+from makcu import create_controller
+import time
+
+@pytest.fixture(scope="session")
+def makcu():
+    ctrl = create_controller()
+    yield ctrl
+    ctrl.disconnect()
+    time.sleep(0.2)
+
+@pytest.fixture(autouse=True)
+def ensure_clean_exit(makcu):
+    yield
+    makcu.mouse.lock_left(False)
+    makcu.mouse.lock_right(False)
+    makcu.mouse.lock_middle(False)
+    makcu.mouse.lock_side1(False)
+    makcu.mouse.lock_side2(False)
+    makcu.mouse.lock_x(False)
+    makcu.mouse.lock_y(False)
+    makcu.enable_button_monitoring(False)

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

@@ -6,7 +6,6 @@ from .errors import MakcuConnectionError, MakcuTimeoutError
 from .enums import MouseButton
 
 class SerialTransport:
-    global fallback_com_port
     baud_change_command = bytearray([0xDE, 0xAD, 0x05, 0x00, 0xA5, 0x00, 0x09, 0x3D, 0x00])
 
     button_map = {
@@ -17,7 +16,8 @@ class SerialTransport:
         4: 'mouse5'
     }
 
-    def __init__(self, debug=False, send_init=True):        
+    def __init__(self, fallback, debug=False, send_init=True):        
+        self._fallback_com_port = fallback
         self._log_messages = []
         self.debug = debug
         self.send_init = send_init
@@ -28,7 +28,6 @@ class SerialTransport:
         self._stop_event = threading.Event()
         self._listener_thread = None
         self._button_states = {btn: False for btn in self.button_map.values()}
-        self._debounce_time_ms = 50
         self._last_callback_time = {bit: 0 for bit in self.button_map}
         self._pause_listener = False
 
@@ -48,6 +47,7 @@ class SerialTransport:
         self.serial = None
         self._current_baud = None
 
+
     def receive_response(self, max_bytes=1024, max_lines=3, sent_command: str = "") -> str:
         lines = []
         try:
@@ -69,9 +69,6 @@ class SerialTransport:
             lines.remove(command_clean)
         return "\n".join(lines)
 
-    def set_debounce_time(self, ms: int):
-        self._debounce_time_ms = ms
-
     def set_button_callback(self, callback):
         self._button_callback = callback
 
@@ -84,22 +81,20 @@ class SerialTransport:
         print(entry, flush=True)
 
     def find_com_port(self):
-        global fallback_com_port
         self._log("Searching for CH343 device...")
 
         for port in list_ports.comports():
-            if "USB-Enhanced-SERIAL CH343" in port.description:
+            if "VID:PID=1A86:55D3" in port.hwid.upper():
                 self._log(f"Device found: {port.device}")
                 return port.device
 
-        if fallback_com_port and "COM" in fallback_com_port:
-            self._log(f"CH343 not found. Falling back to specified port: {fallback_com_port}")
-            return fallback_com_port
+        if self._fallback_com_port:
+            self._log(f"Device not found. Falling back to specified port: {self._fallback_com_port}")
+            return self._fallback_com_port
         else:
-            self._log("Fallback port is not valid.")
+            self._log("Fallback port not specified or invalid.")
             return None
 
-
     def _open_serial_port(self, port, baud_rate):
         try:
             self._log(f"Trying to open {port} at {baud_rate} baud.")
@@ -113,18 +108,14 @@ class SerialTransport:
             self._log("Sending baud rate switch command to 4M.")
             self.serial.write(self.baud_change_command)
             self.serial.flush()
-            port = self.serial.name
-            self.serial.close()
-            time.sleep(0.1)
-            self.serial = self._open_serial_port(port, 4000000)
-            if self.serial:
-                self._current_baud = 4000000
-                self._log("Switched to 4M baud successfully.")
-                return True
-            else:
-                self._log("Failed to reopen port at 4M baud.")
+            time.sleep(0.05)
+            self.serial.baudrate = 4000000
+            self._current_baud = 4000000
+            self._log("Switched to 4M baud successfully.")
+            return True
         return False
 
+
     def connect(self):
         if self._is_connected:
             self._log("Already connected.")
@@ -162,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:
@@ -179,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)")
@@ -224,54 +212,60 @@ class SerialTransport:
 
     def _listen(self, debug=False):
         self._log("Started listener thread")
-        last_value = None
         button_states = {i: False for i in self.button_map}
         self._last_mask = 0
+        self._last_callback_time = {bit: 0 for bit in self.button_map}
 
         while self._is_connected and not self._stop_event.is_set():
             if self._pause_listener:
                 time.sleep(0.001)
                 continue
+
             try:
                 byte = self.serial.read(1)
-                if byte:
-                    value = byte[0]
-                    mask = 0
-                    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 is_pressed:
-                            mask |= (1 << bit)
+                if not byte:
+                    continue
+
+                value = byte[0]
+                byte_str = str(byte)
+
+                if not byte_str.startswith("b'\\x"):
+                    continue
 
-                    for bit, name in self.button_map.items():
-                        self._button_states[name] = button_states[bit]
+                if value != self._last_mask:
+                    if byte_str.startswith("b'\\x00"):
+                        for bit, name in self.button_map.items():
+                            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}")
 
-                    now = time.time() * 1000 
-                    if self._button_callback and mask != self._last_mask:
+                    if self._button_callback:
                         for bit, name in self.button_map.items():
                             previous = bool(self._last_mask & (1 << bit))
-                            current = bool(mask & (1 << bit))
+                            current = bool(value & (1 << bit))
                             if previous != current:
-                                last_time = self._last_callback_time.get(bit, 0)
-                                if now - last_time >= self._debounce_time_ms:
-                                    button_enum = self._button_enum_map.get(bit)
-                                    if button_enum:
-                                        self._button_callback(button_enum, current)
-                                        self._last_callback_time[bit] = now
+                                button_enum = self._button_enum_map.get(bit)
+                                if button_enum:
+                                    self._button_callback(button_enum, current)
 
-                    self._last_mask = mask
+                    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}")
 
-                    last_value = value
             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.1 → makcu-0.1.3}/makcu/controller.py

@@ -6,8 +6,8 @@ from .errors import MakcuConnectionError
 from .enums import MouseButton
 
 class MakcuController:
-    def __init__(self, debug=False, send_init=True):
-        self.transport = SerialTransport(debug=debug, send_init=send_init)
+    def __init__(self, fallback_com_port, debug=False, send_init=True):
+        self.transport = SerialTransport(fallback_com_port, debug=debug, send_init=send_init)
         self.mouse = Mouse(self.transport)
 
     def connect(self):
@@ -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)
@@ -92,21 +100,22 @@ class MakcuController:
         self._check_connection()
         return self.transport.get_button_mask()
 
-    def is_locked(self, target: str) -> bool:
-        self._check_connection()
-        return self.mouse.is_locked(target)
-
     def is_button_locked(self, button: MouseButton) -> bool:
         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,
@@ -114,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:
@@ -130,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()
@@ -147,51 +156,21 @@ class MakcuController:
         self._check_connection()
         return self.mouse.get_all_lock_states()
     
-    def set_callback_debounce_time(self, ms: int):
-        self._check_connection()
-        self.transport.set_debounce_time(ms)
-
-    def start_capturing_clicks(self, button: str):
-        self._check_connection()
-        self.transport._capture_counts[button] = 0
-        self.transport._capture_active[button] = True
-        self.transport._capture_last_state[button] = None
-        self.mouse.begin_capture(button)
-
-    def stop_capturing_clicks(self, button: str) -> int:
-        self._check_connection()
-        self.transport._capture_active[button] = False
-        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)
-
-    def set_port(self, port: str):
-        import makcu.connection
-        makcu.connection.fallback_com_port = port
-    
+        self._send_button_command(button, 0)
+        
     def get_button_states(self) -> dict:
         self._check_connection()
         return self.transport.get_button_states()
 
     def is_button_pressed(self, button: MouseButton) -> bool:
         self._check_connection()
-        return self.transport.get_button_states().get(button.name.lower(), False)
-
-    def get_raw_mask(self) -> int:
-        self._check_connection()
-        return self.transport.get_button_mask()
-
-    def get_virtual_bit_mapping(self) -> dict:
-        return {
-            "LEFT": 0,
-            "RIGHT": 1,
-            "MIDDLE": 2,
-            "MOUSE4": 3,
-            "MOUSE5": 4
-        }
+        return self.transport.get_button_states().get(button.name.lower(), False)

{makcu-0.1.1 → 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)})")
@@ -117,16 +109,6 @@ class Mouse:
         """
         return self.transport.read_captured_clicks(button)
 
-    def get_captured_clicks_enum(self, button: MouseButton) -> int:
-        mapping = {
-            MouseButton.LEFT: "LEFT",
-            MouseButton.RIGHT: "RIGHT",
-            MouseButton.MIDDLE: "MIDDLE",
-            MouseButton.MOUSE4: "MOUSE4",
-            MouseButton.MOUSE5: "MOUSE5",
-        }
-        return self.stop_capturing_clicks(mapping[button])
-
     def get_all_lock_states(self) -> dict:
         return {
             target: self.is_locked(target)

makcu-0.1.3/makcu/test_suite.py

@@ -0,0 +1,100 @@
+import pytest, time
+from makcu import MouseButton
+
+def test_press_and_release(makcu):
+    makcu.press(MouseButton.LEFT)
+    makcu.release(MouseButton.LEFT)
+
+def test_firmware_version(makcu):
+    version = makcu.mouse.get_firmware_version()
+    assert version and len(version.strip()) > 0
+
+def test_middle_click(makcu):
+    makcu.press(MouseButton.MIDDLE)
+    makcu.release(MouseButton.MIDDLE)
+
+def test_device_info(makcu):
+    print("Fetching device info...")
+    info = makcu.mouse.get_device_info()
+    print(f"Device Info: {info}")
+    assert info.get("port")
+    assert info.get("isConnected") is True
+
+def test_port_connection(makcu):
+    assert makcu.is_connected()
+
+@pytest.mark.skip(reason="Capture test disabled until firmware supports tracking clicks from software input")
+def test_capture_right_clicks(makcu):
+    makcu.mouse.lock_right(True)
+    assert makcu.mouse.is_button_locked(MouseButton.RIGHT)
+
+    makcu.mouse.begin_capture("RIGHT")
+    makcu.press(MouseButton.RIGHT)
+    makcu.mouse.release(MouseButton.RIGHT)
+    makcu.press(MouseButton.RIGHT)
+    makcu.mouse.release(MouseButton.RIGHT)
+
+    makcu.mouse.lock_right(False)
+    assert not makcu.mouse.is_button_locked(MouseButton.RIGHT)
+
+    count = makcu.mouse.stop_capturing_clicks("RIGHT")
+    assert count >= 2, f"Expected >=2 captured clicks, got {count}"
+
+def test_button_mask(makcu):
+    print("Getting button mask...")
+    mask = makcu.get_button_mask()
+    print(f"Mask value: {mask}")
+    assert isinstance(mask, int)
+
+def test_get_button_states(makcu):
+    states = makcu.get_button_states()
+    assert isinstance(states, dict)
+    for key in ['left', 'right', 'middle', 'mouse4', 'mouse5']:
+        assert key in states
+
+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)
+
+    print("Querying all lock states...")
+    all_states = makcu.get_all_lock_states()
+    print(f"All lock states: {all_states}")
+
+    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)
+
+    print("Rechecking LEFT lock state after unlock...")
+    assert not makcu.is_button_locked(MouseButton.LEFT)
+
+def test_makcu_behavior(makcu):
+    makcu.move(25, 25)
+    makcu.click(MouseButton.LEFT)
+    makcu.scroll(-2)
+
+def test_reset_all(makcu):
+    makcu.mouse.lock_left(False)
+    makcu.mouse.lock_right(False)
+    makcu.mouse.lock_middle(False)
+    makcu.mouse.lock_side1(False)
+    makcu.mouse.lock_side2(False)
+    makcu.mouse.lock_x(False)
+    makcu.mouse.lock_y(False)
+
+    states = makcu.mouse.get_all_lock_states()
+    assert all(state is False for state in states.values() if state is not None), \
+        f"Expected all unlocked, got: {states}"
+
+    makcu.enable_button_monitoring(False)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: makcu
-Version: 0.1.1
+Version: 0.1.3
 Summary: Python library to interact with Makcu devices.
 Author: SleepyTotem
 License: GPL
@@ -65,7 +65,7 @@ python -m makcu --runtest
 ```python
 from makcu import create_controller, MouseButton
 
-makcu = create_controller()
+makcu = create_controller("COM1") # Fallback port
 makcu.click(MouseButton.LEFT)
 makcu.move(100, 50)
 makcu.scroll(-1)
@@ -85,7 +85,7 @@ makcu = create_controller(debug=True, send_init=True)
 #### Set fallback port manually
 
 ```python
-makcu.set_port("COM4")  # use before create_controller()
+makcu = create_controller("COM4")  # Optional fallback com port
 ```
 
 ---
@@ -189,17 +189,9 @@ def on_button_event(button, pressed):
 makcu.set_button_callback(on_button_event)
 ```
 
-### Configure Debounce
-
-```python
-makcu.set_callback_debounce_time(100)  # milliseconds
-```
-
 ---
 
-## Click Capturing
-
-### ❌ **Currently broken (Pending Firmware Update)**
+## ❌ Click Capturing (Pending Firmware Update)
 
 Click capturing will allow you to detect and count click events in software.
 
@@ -248,6 +240,8 @@ if makcu.is_button_pressed(MouseButton.RIGHT):
 ### Send raw serial commands
 
 ```python
+from makcu import create_controller
+makcu = create_controller()
 response = makcu.transport.send_command("km.version()", expect_response=True)
 print(response)
 ```
@@ -313,3 +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://pypi.org/project/makcu/)

makcu-0.1.3/makcu.egg-info/SOURCES.txt

@@ -0,0 +1,18 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+pytest.ini
+makcu/__init__.py
+makcu/__main__.py
+makcu/conftest.py
+makcu/connection.py
+makcu/controller.py
+makcu/enums.py
+makcu/errors.py
+makcu/mouse.py
+makcu/test_suite.py
+makcu.egg-info/PKG-INFO
+makcu.egg-info/SOURCES.txt
+makcu.egg-info/dependency_links.txt
+makcu.egg-info/top_level.txt

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

@@ -1,6 +1,6 @@
 [project]
 name = "makcu"
-version = "0.1.1"
+version = "0.1.3"
 description = "Python library to interact with Makcu devices."
 readme = "README.md"
 requires-python = ">=3.7"
@@ -14,7 +14,11 @@ license = { text = "GPL" }
 
 [tool.setuptools]
 packages = ["makcu"]
+include-package-data = true
 
 [build-system]
 requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.data-files]
+"." = ["tests/*.py"]

makcu-0.1.3/pytest.ini

@@ -0,0 +1,4 @@
+[pytest]
+python_files = test_suite.py
+testpaths = makcu
+addopts = -v --tb=short --capture=tee-sys --html=latest_pytest.html --self-contained-html

makcu-0.1.1/makcu/utils.py

@@ -1,7 +0,0 @@
-from serial.tools import list_ports
-
-def find_makcu_port():
-    for port in list_ports.comports():
-        if "CH343" in port.description:
-            return port.device
-    return None

makcu-0.1.1/makcu.egg-info/SOURCES.txt

@@ -1,29 +0,0 @@
-LICENSE
-README.md
-pyproject.toml
-makcu/__init__.py
-makcu/__main__.py
-makcu/connection.py
-makcu/controller.py
-makcu/enums.py
-makcu/errors.py
-makcu/mouse.py
-makcu/utils.py
-makcu.egg-info/PKG-INFO
-makcu.egg-info/SOURCES.txt
-makcu.egg-info/dependency_links.txt
-makcu.egg-info/top_level.txt
-tests/test_button_mask.py
-tests/test_capture_right_clicks.py
-tests/test_controller_behavior.py
-tests/test_device_info.py
-tests/test_firmware_version.py
-tests/test_get_button_states.py
-tests/test_get_raw_mask.py
-tests/test_is_button_pressed.py
-tests/test_lock_state.py
-tests/test_middle_click.py
-tests/test_port_connection.py
-tests/test_press_and_release.py
-tests/test_reset_all.py
-tests/test_set_fallback_port.py

makcu-0.1.1/tests/test_button_mask.py

@@ -1,7 +0,0 @@
-# test_button_mask.py
-
-def test_button_mask(makcu):
-    print("Getting button mask...")
-    mask = makcu.get_button_mask()
-    print(f"Mask value: {mask}")
-    assert isinstance(mask, int)

makcu-0.1.1/tests/test_capture_right_clicks.py

@@ -1,21 +0,0 @@
-# test_capture_right_clicks.py
-import pytest
-from makcu import MouseButton
-
-@pytest.mark.skip(reason="Capture test disabled until firmware supports tracking clicks from software input")
-def test_capture_right_clicks(makcu):
-    makcu.mouse.lock_right(True)
-    assert makcu.mouse.is_button_locked(MouseButton.RIGHT)
-
-    makcu.mouse.begin_capture("RIGHT")
-
-    makcu.mouse.press(MouseButton.RIGHT)
-    makcu.mouse.release(MouseButton.RIGHT)
-    makcu.mouse.press(MouseButton.RIGHT)
-    makcu.mouse.release(MouseButton.RIGHT)
-
-    makcu.mouse.lock_right(False)
-    assert not makcu.mouse.is_button_locked(MouseButton.RIGHT)
-
-    count = makcu.mouse.stop_capturing_clicks("RIGHT")
-    assert count >= 2, f"Expected >=2 captured clicks, got {count}"

makcu-0.1.1/tests/test_controller_behavior.py

@@ -1,7 +0,0 @@
-# test_makcu_behavior.py
-from makcu import MouseButton
-
-def test_makcu_behavior(makcu):
-    makcu.move(25, 25)
-    makcu.click(MouseButton.LEFT)
-    makcu.scroll(-2)

makcu-0.1.1/tests/test_device_info.py

@@ -1,8 +0,0 @@
-# tests/test_device_info.py
-
-def test_device_info(makcu):
-    print("Fetching device info...")
-    info = makcu.mouse.get_device_info()
-    print(f"Device Info: {info}")
-    assert info.get("port")
-    assert info.get("isConnected") is True

makcu-0.1.1/tests/test_firmware_version.py

@@ -1,7 +0,0 @@
-# tests/test_firmware_version.py
-
-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

makcu-0.1.1/tests/test_get_button_states.py

@@ -1,16 +0,0 @@
-# test_get_button_states.py
-
-import pytest
-from makcu import create_controller
-
-@pytest.fixture(scope="module")
-def makcu():
-    ctrl = create_controller()
-    yield ctrl
-    ctrl.disconnect()
-
-def test_get_button_states(makcu):
-    states = makcu.get_button_states()
-    assert isinstance(states, dict)
-    for key in ['left', 'right', 'middle', 'mouse4', 'mouse5']:
-        assert key in states

makcu-0.1.1/tests/test_get_raw_mask.py

@@ -1,14 +0,0 @@
-# test_get_raw_mask.py
-
-import pytest
-from makcu import create_controller
-
-@pytest.fixture(scope="module")
-def makcu():
-    ctrl = create_controller()
-    yield ctrl
-    ctrl.disconnect()
-
-def test_get_raw_mask(makcu):
-    mask = makcu.get_raw_mask()
-    assert isinstance(mask, int)

makcu-0.1.1/tests/test_is_button_pressed.py

@@ -1,13 +0,0 @@
-# test_is_button_pressed.py
-
-import pytest
-from makcu import create_controller, MouseButton
-
-@pytest.fixture(scope="module")
-def makcu():
-    ctrl = create_controller()
-    yield ctrl
-    ctrl.disconnect()
-
-def test_is_button_pressed(makcu):
-    assert makcu.is_button_pressed(MouseButton.LEFT) in [True, False]

makcu-0.1.1/tests/test_lock_state.py

@@ -1,22 +0,0 @@
-# tests/test_lock_state.py
-from makcu import MouseButton
-
-def test_lock_state(makcu):
-    print("Locking LEFT button...")
-    makcu.lock_left(True)
-
-    print("Querying lock state while LEFT is locked...")
-    assert makcu.is_button_locked(MouseButton.LEFT)
-
-    print("Querying all lock states...")
-    all_states = makcu.get_all_lock_states()
-    print(f"All lock states: {all_states}")
-
-    assert all_states["LEFT"] is True
-    assert isinstance(all_states["RIGHT"], bool)
-
-    print("Unlocking LEFT button...")
-    makcu.lock_left(False)
-
-    print("Rechecking LEFT lock state after unlock...")
-    assert not makcu.is_button_locked(MouseButton.LEFT)

makcu-0.1.1/tests/test_middle_click.py

@@ -1,6 +0,0 @@
-# test_middle_click.py
-from makcu import MouseButton
-
-def test_middle_click(makcu):
-    makcu.mouse.press(MouseButton.MIDDLE)
-    makcu.mouse.release(MouseButton.MIDDLE)

makcu-0.1.1/tests/test_port_connection.py

@@ -1,4 +0,0 @@
-# test_port_connection.py
-
-def test_port_connection(makcu):
-    assert makcu.is_connected()

makcu-0.1.1/tests/test_press_and_release.py

@@ -1,14 +0,0 @@
-# test_press_and_release.py
-
-import pytest
-from makcu import create_controller, MouseButton
-
-@pytest.fixture(scope="module")
-def makcu():
-    ctrl = create_controller()
-    yield ctrl
-    ctrl.disconnect()
-
-def test_press_and_release(makcu):
-    makcu.press(MouseButton.LEFT)
-    makcu.release(MouseButton.LEFT)

makcu-0.1.1/tests/test_reset_all.py

@@ -1,20 +0,0 @@
-# test_reset_all.py
-
-def test_reset_all(makcu):
-    # Unlock all buttons
-    makcu.mouse.lock_left(False)
-    makcu.mouse.lock_right(False)
-    makcu.mouse.lock_middle(False)
-    makcu.mouse.lock_side1(False)
-    makcu.mouse.lock_side2(False)
-    makcu.mouse.lock_x(False)
-    makcu.mouse.lock_y(False)
-
-    # Check lock states to confirm everything is clean
-    states = makcu.mouse.get_all_lock_states()
-
-    assert all(state is False for state in states.values() if state is not None), \
-        f"Expected all unlocked, got: {states}"
-
-    # Optionally disable monitoring
-    makcu.enable_button_monitoring(False)

makcu-0.1.1/tests/test_set_fallback_port.py

@@ -1,3 +0,0 @@
-def test_set_fallback_port(makcu):
-    makcu.set_port("COM5")
-    assert True