Merge branch 'develop' into feature/asctimestamp

Author: hardbyte

can/bus.py

@@ -368,6 +368,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
     def state(self):
         """
         Return the current state of the hardware
+
         :return: ACTIVE, PASSIVE or ERROR
         :rtype: NamedTuple
         """
@@ -377,6 +378,7 @@ def state(self):
     def state(self, new_state):
         """
         Set the new state of the hardware
+
         :param new_state: BusState.ACTIVE, BusState.PASSIVE or BusState.ERROR
         """
         raise NotImplementedError("Property is not implemented.")