Add failure recovery to examples

Utilize radio.failureDetected() method and verifying default radio config to detect problems communicating with the radio and restart/reconfigure the device. Makes radios hot-swappable with RF24Gateway.
nRF24 · Jul 24, 2020 · d4455dd · d4455dd
1 parent 207c960
commit d4455dd
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 10 deletions.
diff --git a/examples/RF24GatewayNode.cpp b/examples/RF24GatewayNode.cpp
@@ -33,6 +33,7 @@ int main(int argc, char** argv) {
   char subnet[] = "255.255.255.0";
 
   gw.setIP(ip,subnet);
+  uint32_t failCounter = 0;
 
  while(1){
 
@@ -59,6 +60,23 @@ int main(int argc, char** argv) {
         mesh.renewAddress();
       }
     }
+    //This section checks for failures detected by RF24 & RF24Network as well as
+    //checking for deviations from the default configuration (1MBPS data rate)
+    //The mesh is restarted on failure and failure count logged to failLog.txt
+    //This makes the radios hot-swappable, disconnect & reconnect as desired, it should come up automatically
+    if(radio.failureDetected > 0 || radio.getDataRate() != RF24_1MBPS){
+      radio.failureDetected = 0;
+      radio.maskIRQ(1,1,1);
+      std::ofstream myFile;
+      myFile.open ("failLog.txt");
+      if (myFile.is_open()){
+        myFile << ++failCounter << "\n";
+        myFile.close();
+      }
+      delay(500);
+      mesh.begin(1);
+      radio.maskIRQ(1,1,0);
+    }
 
   }
   return 0;

diff --git a/examples/gwNodeInt/RF24GatewayNodeInt.cpp b/examples/gwNodeInt/RF24GatewayNodeInt.cpp
@@ -43,6 +43,7 @@ int main(int argc, char** argv) {
   radio.maskIRQ(1,1,0);
   attachInterrupt(23, INT_EDGE_FALLING, intHandler);
 
+  uint32_t failCounter = 0;
 
  while(1){
 
@@ -60,15 +61,33 @@ int main(int argc, char** argv) {
    //The function will perform a delayed wait of max 3ms unless otherwise specified.
    gw.poll(3);
 
-  if(millis()-mesh_timer > 30000 && mesh.getNodeID()){ //Every 30 seconds, test mesh connectivity
-    mesh_timer = millis();
-    if( ! mesh.checkConnection() ){
-        //refresh the network address
-        radio.maskIRQ(1,1,1); //Use polling only for address renewal       
-        mesh.renewAddress();
-        radio.maskIRQ(1,1,0);
+   if(millis()-mesh_timer > 30000 && mesh.getNodeID()){ //Every 30 seconds, test mesh connectivity
+     mesh_timer = millis();
+     if( ! mesh.checkConnection() ){
+       //refresh the network address
+       radio.maskIRQ(1,1,1); //Use polling only for address renewal       
+       mesh.renewAddress();
+       radio.maskIRQ(1,1,0);
      }
-  }    
+   }    
+
+   //This section checks for failures detected by RF24 & RF24Network as well as
+   //checking for deviations from the default configuration (1MBPS data rate)
+   //The mesh is restarted on failure and failure count logged to failLog.txt
+   //This makes the radios hot-swappable, disconnect & reconnect as desired, it should come up automatically
+   if(radio.failureDetected > 0 || radio.getDataRate() != RF24_1MBPS){
+     radio.failureDetected = 0;
+     radio.maskIRQ(1,1,1);
+     std::ofstream myFile;
+     myFile.open ("failLog.txt");
+     if (myFile.is_open()){
+       myFile << ++failCounter << "\n";
+       myFile.close();
+     }
+     delay(500);
+     mesh.begin(1);
+     radio.maskIRQ(1,1,0);
+   }
 
   }
   return 0;

diff --git a/examples/ncurses/RF24Gateway_ncurses.cpp b/examples/ncurses/RF24Gateway_ncurses.cpp
@@ -134,6 +134,7 @@ int main() {
 /******************************************************************/ 
 /***********************LOOP***************************************/  
 bool ok = true;
+uint32_t failCounter = 0;
 
  while(1){
 
@@ -241,6 +242,25 @@ bool ok = true;
 
 
 	}
+
+    //This section checks for failures detected by RF24 & RF24Network as well as
+    //checking for deviations from the default configuration (1MBPS data rate)
+    //The mesh is restarted on failure and failure count logged to failLog.txt
+    //This makes the radios hot-swappable, disconnect & reconnect as desired, it should come up automatically
+    if(radio.failureDetected > 0 || radio.getDataRate() != RF24_1MBPS){
+      radio.failureDetected = 0;
+      radio.maskIRQ(1,1,1);
+      std::ofstream myFile;
+      myFile.open ("failLog.txt");
+      if (myFile.is_open()){
+        myFile << ++failCounter << "\n";
+        myFile.close();
+      }
+      delay(500);
+      mesh.begin(1);
+      radio.maskIRQ(1,1,0);
+    }
+
     delay(2);
  }//while 1
 

diff --git a/examples/ncursesInt/RF24Gateway_ncursesInt.cpp b/examples/ncursesInt/RF24Gateway_ncursesInt.cpp
@@ -151,11 +151,10 @@ int main() {
 /******************************************************************/ 
 /***********************LOOP***************************************/  
 bool ok = true;
+uint32_t failCounter = 0;
 
  while(1){
-
 
-
   if(millis()-mesh_timer > 30000 && mesh.getNodeID()){ //Every 30 seconds, test mesh connectivity
     if( ! mesh.checkConnection() ){
         wclear(renewPad);
@@ -265,6 +264,25 @@ bool ok = true;
 
 
 	}
+
+    //This section checks for failures detected by RF24 & RF24Network as well as
+    //checking for deviations from the default configuration (1MBPS data rate)
+    //The mesh is restarted on failure and failure count logged to failLog.txt
+    //This makes the radios hot-swappable, disconnect & reconnect as desired, it should come up automatically
+    if(radio.failureDetected > 0 || radio.getDataRate() != RF24_1MBPS){
+      radio.failureDetected = 0;
+      radio.maskIRQ(1,1,1);
+      std::ofstream myFile;
+      myFile.open ("failLog.txt");
+      if (myFile.is_open()){
+        myFile << ++failCounter << "\n";
+        myFile.close();
+      }
+      delay(500);
+      mesh.begin(1);
+      radio.maskIRQ(1,1,0);
+    }
+
  }//while 1