Merge branch 'develop' into vectorerror_pickle

christiansandberg · web-flow · commit 444cb857f814 · 2020-06-09T19:38:56.000+02:00
diff --git a/can/interfaces/pcan/basic.py b/can/interfaces/pcan/basic.py
@@ -545,6 +545,10 @@ def __init__(self):
                 logger.error("Exception: The PEAK-driver couldn't be found!")
             finally:
                 winreg.CloseKey(aReg)
+        elif "CYGWIN" in platform.system():
+            self.__m_dllBasic = cdll.LoadLibrary("PCANBasic.dll")
+            # Unfortunately cygwin python has no winreg module, so we can't
+            # check for the registry key.
         elif platform.system() == "Darwin":
             self.__m_dllBasic = cdll.LoadLibrary("libPCBUSB.dylib")
         else:
diff --git a/doc/interfaces/pcan.rst b/doc/interfaces/pcan.rst
@@ -5,7 +5,7 @@ PCAN Basic API
 
 Interface to `Peak-System <https://www.peak-system.com/?&L=1/>`__'s PCAN-Basic API.
 
-Windows driver: https://www.peak-system.com/Downloads.76.0.html?&L=1
+Windows driver: https://www.peak-system.com/Downloads.76.0.html?&L=1 (also supported on cygwin)
 
 Linux driver: https://www.peak-system.com/fileadmin/media/linux/index.htm#download and https://www.peak-system.com/Downloads.76.0.html?&L=1 (PCAN-Basic API (Linux))
 
