Merge branch 'master' into feature-asyncio

Author: sveinse

.gitignore

@@ -11,7 +11,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
-venv/
+venv*/
 build/
 develop-eggs/
 dist/

canopen/pdo/base.py

@@ -508,7 +508,7 @@ def save(self) -> None:
                 self._fill_map(sdo.raw)
             else:
                 # NOTE: Blocking call
-                sdo.set_raw(value)
+                sdo.raw = value
 
     async def asave(self) -> None:
         """Read PDO configuration for this map using SDO, async variant."""

canopen/sdo/client.py

@@ -28,8 +28,8 @@ class SdoClient(SdoBase):
     #: Seconds to wait before sending a request, for rate limiting
     PAUSE_BEFORE_SEND = 0.0
 
-    #: Seconds to wait after sending a request
-    PAUSE_AFTER_SEND = 0.1
+    #: Seconds to wait before retrying a request after a send error
+    RETRY_DELAY = 0.1
 
     def __init__(self, rx_cobid, tx_cobid, od):
         """
@@ -56,21 +56,19 @@ async def aon_response(self, can_id, data, timestamp):
     @ensure_not_async  # NOTE: Safeguard for accidental async use
     def send_request(self, request):
         retries_left = self.MAX_RETRIES
+        if self.PAUSE_BEFORE_SEND:
+            time.sleep(self.PAUSE_BEFORE_SEND)
         while True:
             try:
-                if self.PAUSE_BEFORE_SEND:
-                    # NOTE: Blocking call
-                    time.sleep(self.PAUSE_BEFORE_SEND)
                 self.network.send_message(self.rx_cobid, request)
             except CanError as e:
                 # Could be a buffer overflow. Wait some time before trying again
                 retries_left -= 1
                 if not retries_left:
                     raise
                 logger.info(str(e))
-                if self.PAUSE_AFTER_SEND:
-                    # NOTE: Blocking call
-                    time.sleep(self.PAUSE_AFTER_SEND)
+                if self.RETRY_DELAY:
+                    time.sleep(self.RETRY_DELAY)
             else:
                 break