testing examples on qtpy (atsamd21)

nRF24 · Jun 14, 2021 · 795ae09 · 795ae09
1 parent 7986d7a
commit 795ae09
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 25 deletions.
diff --git a/examples/Network_Ping/Network_Ping.ino b/examples/Network_Ping/Network_Ping.ino
@@ -92,15 +92,14 @@ void add_node(uint16_t node);
 void setup() {
 
   Serial.begin(115200);
-  printf_begin();
-  if (!Serial) {
+  printf_begin(); // needed for RF24* libs' internal printf() calls
+  while (!Serial) {
     // some boards need this because of native USB capability
   }
   Serial.println(F("RF24Network/examples/meshping/"));
 
   this_node = node_address_set[NODE_ADDRESS];            // Which node are we?
 
-  SPI.begin();                                           // Bring up the RF network
   if (!radio.begin()) {
     Serial.println(F("Radio hardware not responding!"));
     while (1) {
@@ -109,7 +108,6 @@ void setup() {
   }
   radio.setPALevel(RF24_PA_HIGH);
   network.begin(/*channel*/ 100, /*node address*/ this_node );
-
 }
 
 void loop() {

diff --git a/examples/Network_Ping_Sleep/Network_Ping_Sleep.ino b/examples/Network_Ping_Sleep/Network_Ping_Sleep.ino
@@ -91,15 +91,14 @@ unsigned long sleepTimer = 0;                           // Used to keep track of
 void setup() {
 
   Serial.begin(115200);
-  printf_begin();
-  if (!Serial) {
+  printf_begin(); // needed for RF24* libs' internal printf() calls
+  while (!Serial) {
     // some boards need this because of native USB capability
   }
   Serial.println(F("RF24Network/examples/meshping/"));
 
   this_node = node_address_set[NODE_ADDRESS];            // Which node are we?
 
-  SPI.begin();                                           // Bring up the RF network
   if (!radio.begin()) {
     Serial.println(F("Radio hardware not responding!"));
     while (1) {

diff --git a/examples/Network_Priority_RX/Network_Priority_RX.ino b/examples/Network_Priority_RX/Network_Priority_RX.ino
@@ -43,11 +43,8 @@ uint32_t myVariable = 0;
 void setup() {
 
   Serial.begin(115200);
-  if (!Serial) {
-    // some boards need this because of native USB capability
-  }
-  printf_begin(); //Used to enable printf on AVR devices
-  if (!Serial) {
+  printf_begin(); // needed for RF24* libs' internal printf() calls
+  while (!Serial) {
     // some boards need this because of native USB capability
   }
   Serial.println(F("RF24Network/examples/Network_Separation_RX/"));

diff --git a/examples/Network_Priority_TX/Network_Priority_TX.ino b/examples/Network_Priority_TX/Network_Priority_TX.ino
@@ -43,11 +43,11 @@ uint8_t dataBuffer[33];
 void setup() {
 
   Serial.begin(115200);
-  if (!Serial) {
+  printf_begin(); // needed for RF24* libs' internal printf() calls
+  while (!Serial) {
     // some boards need this because of native USB capability
   }
   Serial.println(F("RF24Network/examples/Network_Separation_TX/"));
-  printf_begin(); //Used to enable printf on AVR devices
 
   if (!radio.begin()) {
     Serial.println(F("Radio hardware not responding!"));

diff --git a/examples/helloworld_rx/helloworld_rx.ino b/examples/helloworld_rx/helloworld_rx.ino
@@ -34,12 +34,11 @@ struct payload_t {              // Structure of our payload
 
 void setup(void) {
   Serial.begin(115200);
-  if (!Serial) {
+  while (!Serial) {
     // some boards need this because of native USB capability
   }
   Serial.println(F("RF24Network/examples/helloworld_rx/"));
 
-  SPI.begin();
   if (!radio.begin()) {
     Serial.println(F("Radio hardware not responding!"));
     while (1) {
@@ -64,4 +63,3 @@ void loop(void) {
     Serial.println(payload.ms);
   }
 }
-
diff --git a/examples/helloworld_rx_advanced/helloworld_rx_advanced.ino b/examples/helloworld_rx_advanced/helloworld_rx_advanced.ino
@@ -37,7 +37,7 @@ uint8_t dataBuffer[MAX_PAYLOAD_SIZE]; //MAX_PAYLOAD_SIZE is defined in RF24Netwo
 void setup(void) {
 
   Serial.begin(115200);
-  if (!Serial) {
+  while (!Serial) {
     // some boards need this because of native USB capability
   }
   Serial.println(F("RF24Network/examples/helloworld_rx_advanced/"));
@@ -50,7 +50,7 @@ void setup(void) {
   }
   network.begin(/*channel*/ 90, /*node address*/ this_node);
 
-  printf_begin();       // Used to enable printf on AVR devices
+  printf_begin();       // needed for RF24* libs' internal printf() calls
   radio.printDetails(); // requires printf support
 }
 

diff --git a/examples/helloworld_tx/helloworld_tx.ino b/examples/helloworld_tx/helloworld_tx.ino
@@ -39,12 +39,11 @@ struct payload_t {                   // Structure of our payload
 
 void setup(void) {
   Serial.begin(115200);
-  if (!Serial) {
+  while (!Serial) {
     // some boards need this because of native USB capability
   }
   Serial.println(F("RF24Network/examples/helloworld_tx/"));
 
-  SPI.begin();
   if (!radio.begin()) {
     Serial.println(F("Radio hardware not responding!"));
     while (1) {
@@ -74,5 +73,3 @@ void loop() {
       Serial.println("failed.");
   }
 }
-
-
diff --git a/examples/helloworld_tx_advanced/helloworld_tx_advanced.ino b/examples/helloworld_tx_advanced/helloworld_tx_advanced.ino
@@ -40,11 +40,11 @@ uint8_t dataBuffer[MAX_PAYLOAD_SIZE];
 
 void setup(void) {
   Serial.begin(115200);
-  if (!Serial) {
+  while (!Serial) {
     // some boards need this because of native USB capability
   }
   Serial.println(F("RF24Network/examples/helloworld_tx_advanced/"));
-  printf_begin(); //Used to enable printf on AVR devices
+  printf_begin(); // needed for RF24* libs' internal printf() calls
 
   if (!radio.begin()) {
     Serial.println(F("Radio hardware not responding!"));