Linting with pep8

2022-08-14 14:08:57 +02:00
parent 0f279f1ee8
commit 82d407bfe2
4 changed files with 74 additions and 75 deletions
--- a/pydualsense/enums.py
+++ b/pydualsense/enums.py
@@ -1,41 +1,47 @@
 from enum import IntFlag

+
 class ConnectionType(IntFlag):
-    BT = 0x0,
+    BT = 0x0
    USB = 0x1
+
+
 class LedOptions(IntFlag):
-    Off=0x0,
-    PlayerLedBrightness=0x1,
-    UninterrumpableLed=0x2,
+    Off = 0x0
+    PlayerLedBrightness = 0x1
+    UninterrumpableLed = 0x2
    Both = 0x01 | 0x02

+
 class PulseOptions(IntFlag):
-    Off=0x0,
-    FadeBlue=0x1,
+    Off = 0x0
+    FadeBlue = 0x1
    FadeOut = 0x2

+
 class Brightness(IntFlag):
-    high = 0x0,
-    medium = 0x1,
+    high = 0x0
+    medium = 0x1
    low = 0x2

+
 class PlayerID(IntFlag):
-    player1 = 4,
-    player2 = 10,
-    player3 = 21,
-    player4 = 27,
+    player1 = 4
+    player2 = 10
+    player3 = 21
+    player4 = 27
    all = 31


 class TriggerModes(IntFlag):
-    Off = 0x0, # no resistance
-    Rigid = 0x1, # continous resistance
-    Pulse = 0x2, # section resistance
-    Rigid_A = 0x1 | 0x20,
-    Rigid_B = 0x1 | 0x04,
-    Rigid_AB = 0x1 | 0x20 | 0x04,
-    Pulse_A = 0x2 | 0x20,
-    Pulse_B = 0x2 | 0x04,
-    Pulse_AB = 0x2 | 0x20 | 0x04,
+    Off = 0x0  # no resistance
+    Rigid = 0x1  # continous resistance
+    Pulse = 0x2  # section resistance
+    Rigid_A = 0x1 | 0x20
+    Rigid_B = 0x1 | 0x04
+    Rigid_AB = 0x1 | 0x20 | 0x04
+    Pulse_A = 0x2 | 0x20
+    Pulse_B = 0x2 | 0x04
+    Pulse_AB = 0x2 | 0x20 | 0x04
    Calibration = 0xFC

--- a/pydualsense/hidguardian.py
+++ b/pydualsense/hidguardian.py
@@ -1,13 +1,15 @@
 import winreg
 import sys

+
 def check_hide() -> bool:
-        """check if hidguardian is used and controller is hidden
+    """
+    check if hidguardian is used and controller is hidden
    """
    if sys.platform.startswith('win32'):
        try:
            access_reg = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
-                access_key = winreg.OpenKey(access_reg, 'SYSTEM\CurrentControlSet\Services\HidGuardian\Parameters', 0, winreg.KEY_READ)
+            access_key = winreg.OpenKey(access_reg, r'SYSTEM\CurrentControlSet\Services\HidGuardian\Parameters', 0, winreg.KEY_READ)
            affected_devices = winreg.QueryValueEx(access_key, 'AffectedDevices')[0]
            if "054C" in affected_devices and "0CE6" in affected_devices:
                return True
--- a/pydualsense/pydualsense.py
+++ b/pydualsense/pydualsense.py
@@ -1,6 +1,7 @@

 # needed for python > 3.8
-import os, sys
+import os
+import sys
 from sys import platform

 if platform.startswith('Windows') and sys.version_info >= (3, 8):
@@ -9,6 +10,8 @@ if platform.startswith('Windows') and sys.version_info >= (3,8):
 import hidapi
 from .enums import (LedOptions, PlayerID, PulseOptions, TriggerModes, Brightness, ConnectionType) # type: ignore
 import threading
+
+
 class pydualsense:

    def __init__(self, verbose: bool = False) -> None:#
@@ -18,7 +21,6 @@ class pydualsense:
        self.leftMotor = 0
        self.rightMotor = 0

-
    def init(self):
        """initialize module and device states
        """
@@ -37,7 +39,6 @@ class pydualsense:
            self.input_report_length = 64
            self.output_report_length = 64

-
        # thread for receiving and sending
        self.ds_thread = True
        self.report_thread = threading.Thread(target=self.sendReport)
@@ -54,7 +55,6 @@ class pydualsense:
            self.output_report_length = 78
            return ConnectionType.BT

-
    def close(self):
        """
        Stops the report thread and closes the HID device
@@ -63,7 +63,6 @@ class pydualsense:
        self.report_thread.join()
        self.device.close()

-
    def __find_device(self) -> hidapi.Device:
        """
        find HID device and open it
@@ -87,8 +86,7 @@ class pydualsense:
            if device.vendor_id == 0x054c and device.product_id == 0x0CE6:
                detected_device = device

-
-        if detected_device == None:
+        if detected_device is None:
            raise Exception('No device detected')

        dual_sense = hidapi.Device(vendor_id=detected_device.vendor_id, product_id=detected_device.product_id)
@@ -112,7 +110,6 @@ class pydualsense:
            raise Exception('maximum intensity is 255')
        self.leftMotor = intensity

-
    def setRightMotor(self, intensity: int):
        """
        set right motor rumble
@@ -131,7 +128,6 @@ class pydualsense:
            raise Exception('maximum intensity is 255')
        self.rightMotor = intensity

-
    def sendReport(self):
        """background thread handling the reading of the device and updating its states
        """
@@ -143,7 +139,6 @@ class pydualsense:
            # decrypt the packet and bind the inputs
            self.readInput(inReport)

-
            # prepare new report for device
            outReport = self.prepareReport()

@@ -174,7 +169,6 @@ class pydualsense:
        self.state.cross = (buttonState & (1 << 5)) != 0
        self.state.square = (buttonState & (1 << 4)) != 0

-
        # dpad
        dpad_state = buttonState & 0x0F
        self.state.setDPadState(dpad_state)
@@ -194,7 +188,6 @@ class pydualsense:
        self.state.touchBtn = (misc2 & 0x02) != 0
        self.state.micBtn = (misc2 & 0x04) != 0

-
        # trackpad touch
        self.state.trackPadTouch0.ID = inReport[33] & 0x7F
        self.state.trackPadTouch0.isActive = (inReport[33] & 0x80) == 0
@@ -217,7 +210,6 @@ class pydualsense:
        # TODO: implement gyrometer and accelerometer
        # TODO: control mouse with touchpad for fun as DS4Windows

-
    def writeReport(self, outReport):
        """
        write the report to the device
@@ -227,7 +219,6 @@ class pydualsense:
        """
        self.device.write(bytes(outReport))

-
    def prepareReport(self):
        """
        prepare the output to be send to the controller
@@ -240,7 +231,6 @@ class pydualsense:
        # packet type
        outReport[0] = 0x2

-
        # flags determing what changes this packet will perform
        # 0x01 set the main motors (also requires flag 0x02); setting this by itself will allow rumble to gracefully terminate and then re-enable audio haptics, whereas not setting it will kill the rumble instantly and re-enable audio haptics.
        # 0x02 set the main motors (also requires flag 0x01; without bit 0x01 motors are allowed to time out without re-enabling audio haptics)
@@ -270,7 +260,7 @@ class pydualsense:
        # set Micrphone LED, setting doesnt effect microphone settings
        outReport[9] = self.audio.microphone_led # [9]

-        outReport[10] = 0x10 if self.audio.microphone_mute == True else 0x00
+        outReport[10] = 0x10 if self.audio.microphone_mute is True else 0x00

        # add right trigger mode + parameters to packet
        outReport[11] = self.triggerR.mode.value
@@ -302,6 +292,7 @@ class pydualsense:
            print(outReport)
        return outReport

+
 class DSTouchpad:
    def __init__(self) -> None:
        """
@@ -312,6 +303,7 @@ class DSTouchpad:
        self.X = 0
        self.Y = 0

+
 class DSState:

    def __init__(self) -> None:
@@ -460,7 +452,6 @@ class DSLight:
            raise Exception('colors have values from 0 to 255 only')
        self.TouchpadColor = (r, g, b)

-
    def setColorT(self, color: tuple) -> None:
        """
        Sets the Color around the Touchpad as a tuple