Improve transfer speeds

1. Only write if network.available() returns 0
2. Rewrite if writing to TUN device fails
3. Lower delay from 2 to 1ms
4. Disable debug by default
5. Change channel to 97 from 90

Author: TMRh20

rf24totun.cpp

@@ -137,9 +137,8 @@ void radioRxTxThreadFunction() {
 
         network.update();
 
-        /**
-         * RX section
-         */
+         //RX section
+         
         while ( network.available() ) { // Is there anything ready for us?
 
             RF24NetworkHeader header;        // If so, grab it and print it out
@@ -163,10 +162,10 @@ void radioRxTxThreadFunction() {
 
         network.update();
 
-        /**
-         * TX section
-         */
-        if (!radioTxQueue.empty()) {
+
+         // TX section
+        
+        if(!radioTxQueue.empty() && !radio.available() ) {
             Message msg = radioTxQueue.pop();
 
             if (PRINT_DEBUG >= 1) {
@@ -187,7 +186,7 @@ void radioRxTxThreadFunction() {
             }
         } //End Tx
 
-        delay(2);
+		delay(1);
 
     } catch(boost::thread_interrupted&) {
         std::cerr << "radioRxThreadFunction is stopped" << std::endl;
@@ -266,7 +265,7 @@ void tunTxThreadFunction() {
         if (msg.getLength() > 0) {
 
             size_t writtenBytes = write(tunFd, msg.getPayload(), msg.getLength());
-
+			if(!writtenBytes){  writtenBytes = write(tunFd, msg.getPayload(), msg.getLength()); }
             if (writtenBytes != msg.getLength()) {
                 std::cerr << "Tun: Less bytes written to tun/tap device then requested." << std::endl;
             } else {
@@ -382,13 +381,13 @@ int main(int argc, char **argv) {
     std::cout << "Choose an address: Enter 0 for master, 1 for child, 2 for Master with 1 Arduino routing node (02), 3 for Child with Arduino routing node  (CTRL+C to exit) \n>";
     std::getline(std::cin,input);
 
-    if(input.length() == 1) {
+    if(input.length() > 0) {
         myChar = input[0];
         if(myChar == '0'){
             thisNodeAddr = 00;
-            otherNodeAddr = 01;
+            otherNodeAddr = 1;
         }else if(myChar == '1') {
-            thisNodeAddr = 01;
+            thisNodeAddr = 1;
             otherNodeAddr = 00;
 		}else if(myChar == '2') {
             thisNodeAddr = 00;

rf24totun.h

@@ -58,7 +58,7 @@
 #include <RF24Network/RF24Network.h>
 
 
-#define PRINT_DEBUG 1
+#define PRINT_DEBUG 0
 
 #ifndef IFF_MULTI_QUEUE
 	#define IFF_MULTI_QUEUE 0x0100
@@ -81,7 +81,7 @@ RF24 radio(RPI_V2_GPIO_P1_15, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ);
 RF24Network network(radio);
 uint16_t thisNodeAddr; /**< Address of our node in Octal format (01,021, etc) */
 uint16_t otherNodeAddr;     /**< Address of the other node */
-const uint8_t channel = 90;
+const uint8_t channel = 97;
 unsigned long packets_sent;  /**< How many have we sent already */
 
 /**