final code review

Author: 2bndy5

circuitpython_nrf24l01/rf24.py

@@ -134,7 +134,7 @@ def __init__(
 
     def __enter__(self):
         self._ce_pin.value = False
-        self._config |= 2
+        self._config = (self._config & 0xFC) | 2
         if self._aa & 1:
             self._open_pipes |= 1
             self._reg_write_bytes(_RX_ADDR_P0, self._tx_address)
@@ -148,12 +148,13 @@ def __enter__(self):
         self._reg_write(_SETUP_RETR, self._retry_setup)
         for i, addr in enumerate(self._pipes):
             self.set_payload_length(self._pl_len[i], i)
-            if not i:  # skip pipe 0 RX address because we're going into TX mode
+            if not i and self._aa & 1:
+                # skip pipe 0 RX address because we're going into TX mode
                 continue
-            if i == 1:
+            elif i < 2:
                 self._reg_write_bytes(_RX_ADDR_P0 + i, addr)
             else:
-                self._reg_write(_RX_ADDR_P0 + i + 1, addr)
+                self._reg_write(_RX_ADDR_P0 + i, addr)
         self._reg_write_bytes(_TX_ADDR, self._tx_address)
         self._reg_write(0x05, self._channel)
         self._reg_write(0x03, self._addr_len - 2)

examples/nrf24l01_network_test.py

@@ -123,6 +123,9 @@ def idle(timeout: int = 30, strict_timeout: bool = False):
             if not strict_timeout:
                 start_timer = time.monotonic()  # reset timer
             frame = nrf.read()
+            if frame is None:
+                # should never get here because we check network.available() first
+                continue
             message_len = len(frame.message)
             print("Received payload", end=" ")
             # TMRh20 examples only use 1 or 2 long ints as small messages
@@ -220,7 +223,7 @@ def set_role():
             pass  # continue example until 'Q' is entered
     except KeyboardInterrupt:
         print(" Keyboard Interrupt detected. Powering down radio...")
-        nrf.power = 0
+        nrf.power = False
 elif nrf.node_address != NETWORK_DEFAULT_ADDR:
     print("    Run emit(<node number>) to transmit.")
     print("    Run idle() to receive or forward messages in the network.")