Remove beginWrite() function as not necessary

nRF24 · Feb 24, 2025 · 04040bf · 04040bf
1 parent 2d47f6d
commit 04040bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/RF24Network.cpp b/RF24Network.cpp
@@ -688,31 +688,23 @@ bool ESBNetwork<radio_t>::multicast(RF24NetworkHeader& header, const void* messa
 
 /******************************************************************/
 
-template<class radio_t>
-bool ESBNetwork<radio_t>::write(RF24NetworkHeader& header, const void* message, uint16_t len)
-{
-    return beginWrite(header, message, len, NETWORK_AUTO_ROUTING);
-}
-
-/******************************************************************/
-
 template<>
-bool ESBNetwork<RF24>::beginWrite(RF24NetworkHeader& header, const void* message, uint16_t len, uint16_t writeDirect)
+bool ESBNetwork<RF24>::write(RF24NetworkHeader& header, const void* message, uint16_t len)
 {
     max_frame_size = MAX_FRAME_SIZE;
-    return write(header, message, len, writeDirect);
+    return write(header, message, len, NETWORK_AUTO_ROUTING);
 }
 
 /******************************************************************/
 #if defined(NRF52_RADIO_LIBRARY)
 template<>
-bool ESBNetwork<nrf_to_nrf>::beginWrite(RF24NetworkHeader& header, const void* message, uint16_t len, uint16_t writeDirect)
+bool ESBNetwork<nrf_to_nrf>::write(RF24NetworkHeader& header, const void* message, uint16_t len)
 {
     max_frame_size = (uint8_t)NRF_RADIO->PCNF1;
     if (radio.enableEncryption == true) {
         max_frame_size -= CCM_IV_SIZE + CCM_COUNTER_SIZE + CCM_MIC_SIZE;
     }
-    return write(header, message, len, writeDirect);
+    return write(header, message, len, NETWORK_AUTO_ROUTING);
 }
 #endif
 /******************************************************************/

diff --git a/RF24Network.h b/RF24Network.h
@@ -907,14 +907,6 @@ class ESBNetwork
      */
     bool _write(RF24NetworkHeader& header, const void* message, uint16_t len, uint16_t writeDirect);
 
-    /**
-     * A function to allow specific implementation for different specializations.
-     *
-     * This function needs to be defined for each specialization of the ESBNetwork class.
-     * Currently, only RF24 and nrf_to_nrf specializations are supported/implemented.
-     */
-    inline bool beginWrite(RF24NetworkHeader& header, const void* message, uint16_t len, uint16_t writeDirect);
-
     struct logicalToPhysicalStruct
     {
         /** The immediate destination (1 hop) of an outgoing frame */