revert exposing cached TX address

Author: 2bndy5

RF24.cpp

@@ -1187,17 +1187,17 @@ void RF24::stopListening(void)
         powerUp();
     }
 #endif
-    write_register(RX_ADDR_P0, txAddress, addr_width);
+    write_register(RX_ADDR_P0, pipe0_writing_address, addr_width);
     write_register(EN_RXADDR, static_cast<uint8_t>(read_register(EN_RXADDR) | _BV(pgm_read_byte(&child_pipe_enable[0])))); // Enable RX on pipe0
 }
 
 /****************************************************************************/
 
-void RF24::stopListening(const uint8_t* tx_address)
+void RF24::stopListening(const uint8_t* txAddress)
 {
-    memcpy(txAddress, tx_address, addr_width);
+    memcpy(pipe0_writing_address, txAddress, addr_width);
     stopListening();
-    write_register(TX_ADDR, txAddress, addr_width);
+    write_register(TX_ADDR, pipe0_writing_address, addr_width);
 }
 
 /****************************************************************************/
@@ -1574,7 +1574,7 @@ void RF24::openWritingPipe(uint64_t value)
 
     write_register(RX_ADDR_P0, reinterpret_cast<uint8_t*>(&value), addr_width);
     write_register(TX_ADDR, reinterpret_cast<uint8_t*>(&value), addr_width);
-    memcpy(txAddress, &value, addr_width);
+    memcpy(pipe0_writing_address, &value, addr_width);
 }
 
 /****************************************************************************/

RF24.h

@@ -158,6 +158,7 @@ class RF24
     uint8_t status;                   /* The status byte returned from every SPI transaction */
     uint8_t payload_size;             /* Fixed size of payloads */
     uint8_t pipe0_reading_address[5]; /* Last address set on pipe 0 for reading. */
+    uint8_t pipe0_writing_address[5]; /* Last address set on pipe 0 for writing. */
     uint8_t config_reg;               /* For storing the value of the NRF_CONFIG register */
     bool _is_p_variant;               /* For storing the result of testing the toggleFeatures() affect */
     bool _is_p0_rx;                   /* For keeping track of pipe 0's usage in user-triggered RX mode. */
@@ -342,24 +343,6 @@ class RF24
      */
     void startListening(void);
 
-    /**
-     * The TX address to use on pipe 0 for writing.
-     *
-     * This is cached in the library to ensure proper auto-ack behavior on pipe 0,
-     * if pipe 0 is also used with a different RX address for receiving.
-     *
-     * Use this instead of calling openWritingPipe()
-     *
-     * ```cpp
-     * uint8_t rxNodeAddress[6] = "1Node";
-     * memcpy(radio.txAddress, rxNodeAddress, 5);
-     * radio.stopListening();
-     * ```
-     *
-     * Previously, openWritingPipe() should be called after stopListening().
-     */
-    uint8_t txAddress[5];
-
     /**
      * Stop listening for incoming messages, and switch to transmit mode.
      *
@@ -377,9 +360,10 @@ class RF24
 
     /**
      * @brief Similar to startListening(void) but changes the TX address.
-     * @param tx_address The new TX address. This value will be cached to `txAddress` member.
+     * @param txAddress The new TX address.
+     * This value will be cached for auto-ack purposes.
      */
-    void stopListening(const uint8_t* tx_address);
+    void stopListening(const uint8_t* txAddress);
 
     /**
      * Check whether there are bytes available to be read
@@ -518,7 +502,7 @@ class RF24
      * New: Open a pipe for writing via byte array. Old addressing format retained
      * for compatibility.
      *
-     * @deprecated Use `RF24::txAddress`  or `RF24::stopListening(uint8_t*)` instead.
+     * @deprecated Use `RF24::stopListening(uint8_t*)` instead.
      *
      * Only one writing pipe can be opened at once, but this function changes
      * the address that is used to transmit (ACK payloads/packets do not apply

pyRF24/pyRF24.cpp

@@ -39,21 +39,6 @@ int get_bytes_or_bytearray_ln(bp::object buf)
     return 0;
 }
 
-void set_tx_address(RF24& ref, bp::object buf)
-{
-    // set the TX address of the RX node for use on the TX pipe (pipe 0)
-    memcpy(ref.txAddress, get_bytes_or_bytearray_str(buf), get_bytes_or_bytearray_ln(buf));
-}
-
-bp::object get_tx_address(RF24& ref)
-{
-    char* buf = new char[6];
-    memcpy(buf, ref.txAddress, 5);
-    bp::object py_ba(bp::handle<>(PyByteArray_FromStringAndSize(buf, 5)));
-    delete[] buf;
-    return py_ba;
-}
-
 bp::object read_wrap(RF24& ref, int maxlen)
 {
     char* buf = new char[maxlen + 1];
@@ -340,8 +325,6 @@ BOOST_PYTHON_MODULE(RF24)
         .def("openReadingPipe", (void(::RF24::*)(::uint8_t, ::uint64_t))(&::RF24::openReadingPipe), (bp::arg("number"), bp::arg("address")))
         .def("openWritingPipe", &openWritingPipe_wrap, (bp::arg("address")))
         .def("openWritingPipe", (void(::RF24::*)(::uint64_t))(&::RF24::openWritingPipe), (bp::arg("address")))
-        .add_property("txAddress", &get_tx_address, &set_tx_address)
-        .add_property("tx_address", &get_tx_address, &set_tx_address)
         .def("powerDown", &RF24::powerDown)
         .def("powerUp", &RF24::powerUp)
         .def("printDetails", &RF24::printDetails)
@@ -365,7 +348,7 @@ BOOST_PYTHON_MODULE(RF24)
         .def("startListening", &RF24::startListening)
         .def("startWrite", &startWrite_wrap, (bp::arg("buf"), bp::arg("len"), bp::arg("multicast")))
         .def("stopListening", (void(::RF24::*)(void))(&RF24::stopListening))
-        .def("stopListening", &stopListening_wrap, (bp::arg("tx_address")))
+        .def("stopListening", &stopListening_wrap, (bp::arg("txAddress")))
         .def("testCarrier", &RF24::testCarrier)
         .def("testRPD", &RF24::testRPD)
         .def("toggleAllPipes", &RF24::toggleAllPipes)