Restore changes to avoid conflicts

can/exceptions.py

@@ -9,6 +9,7 @@
          +-- CanInitializationError
          +-- CanOperationError
          +-- CanTimeoutError
+         +-- CanBitRateError
 
 Keep in mind that some functions and methods may raise different exceptions.
 For example, validating typical arguments and parameters might result in a
@@ -111,6 +112,15 @@ class CanTimeoutError(CanError, TimeoutError):
     """
 
 
+class CanBitRateError(CanError):
+    """Indicates the invalid / unsupported bitrate.
+
+    Example scenarios:
+      - Invalid / unsupported bitrate on bus
+      - Can't convert between bit timing and bitrate
+    """
+
+
 @contextmanager
 def error_check(
     error_message: Optional[str] = None,

doc/configuration.rst

@@ -156,6 +156,8 @@ Lookup table of interface names:
 +---------------------+-------------------------------------+
 | ``"vector"``        | :doc:`interfaces/vector`            |
 +---------------------+-------------------------------------+
+| ``"zlg"``           | :doc:`interfaces/zlg`               |
++---------------------+-------------------------------------+
 | ``"virtual"``       | :doc:`interfaces/virtual`           |
 +---------------------+-------------------------------------+
 

doc/interfaces.rst

@@ -38,6 +38,7 @@ The following hardware interfaces are included in python-can:
    interfaces/systec
    interfaces/usb2can
    interfaces/vector
+   interfaces/zlg
 
 
 Additional interface types can be added via the :ref:`plugin interface`, or by installing a third party package that utilises the :ref:`plugin interface`.