update examples again

Author: 2bndy5

examples/InterruptConfigure/InterruptConfigure.ino

@@ -49,9 +49,6 @@ uint8_t pl_iterator = 0;
 char tx_payloads[][tx_pl_size + 1] = { "Ping ", "Pong ", "Radio", "1FAIL" };
 char ack_payloads[][ack_pl_size + 1] = { "Yak ", "Back", " ACK" };
 
-// A variable to interpret and manipulate the radio's IRQ pin.
-StatusFlags flags;
-
 void interruptHandler();  // prototype to handle IRQ events
 void printRxFifo();       // prototype to print RX FIFO with 1 buffer
 
@@ -122,8 +119,7 @@ void setup() {
     // setup for RX mode
 
     // let IRQ pin only trigger on "data_ready" event in RX mode
-    flags = StatusFlags(RF24_RX_DR);
-    radio.setStatusFlags(flags);
+    radio.setStatusFlags(RF24_RX_DR);
 
     // Fill the TX FIFO with 3 ACK payloads for the first 3 received
     // transmissions on pipe 1
@@ -154,25 +150,22 @@ void loop() {
       // Test the "data ready" event with the IRQ pin
 
       Serial.println(F("\nConfiguring IRQ pin to ignore the 'data sent' event"));
-      flags = StatusFlags(RF24_RX_DR | RF24_TX_DF);
-      radio.setStatusFlags(flags);
+      radio.setStatusFlags(RF24_RX_DR | RF24_TX_DF);
       Serial.println(F("   Pinging RX node for 'data ready' event..."));
 
     } else if (pl_iterator == 1) {
       // Test the "data sent" event with the IRQ pin
 
       Serial.println(F("\nConfiguring IRQ pin to ignore the 'data ready' event"));
-      flags = StatusFlags(RF24_TX_DS | RF24_TX_DF);
-      radio.setStatusFlags(flags);
+      radio.setStatusFlags(RF24_TX_DS | RF24_TX_DF);
       Serial.println(F("   Pinging RX node for 'data sent' event..."));
 
     } else if (pl_iterator == 2) {
       // Use this iteration to fill the RX node's FIFO which sets us up for the next test.
 
       // write() uses virtual interrupt flags that work despite the masking of the IRQ pin
       // disable IRQ pin for this step
-      flags = StatusFlags();
-      radio.setStatusFlags(flags);
+      radio.setStatusFlags();
 
       Serial.println(F("\nSending 1 payload to fill RX node's FIFO. IRQ pin is neglected."));
       // write() will call flush_tx() on 'data fail' events
@@ -191,8 +184,7 @@ void loop() {
       // test the "data fail" event with the IRQ pin
 
       Serial.println(F("\nConfiguring IRQ pin to reflect all events"));
-      flags = StatusFlags(RF24_IRQ_ALL);
-      radio.setStatusFlags(flags);
+      radio.setStatusFlags(RF24_IRQ_ALL);
       Serial.println(F("   Pinging inactive RX node for 'data fail' event..."));
     }
 
@@ -276,8 +268,7 @@ void loop() {
       role = false;
 
       // let IRQ pin only trigger on "data_ready" event in RX mode
-      flags = StatusFlags(RF24_RX_DR);
-      radio.setStatusFlags(flags);
+      radio.setStatusFlags(RF24_RX_DR);
 
       // Fill the TX FIFO with 3 ACK payloads for the first 3 received
       // transmissions on pipe 1
@@ -309,7 +300,7 @@ void assessInterruptEvent() {
 
   Serial.println(F("\tIRQ pin is actively LOW"));  // show that this function was called
   delayMicroseconds(250);
-  flags = radio.clearStatusFlags();
+  StatusFlags flags(radio.clearStatusFlags());
   // Resetting the tx_df flag is required for
   // continued TX operations when a transmission fails.
   // clearing the status flags resets the IRQ pin to its inactive state (HIGH)

examples/StreamingData/StreamingData.ino

@@ -106,20 +106,19 @@ void loop() {
   if (role) {
     // This device is a TX node
 
-    StatusFlags flags;
     radio.flush_tx();
     uint8_t i = 0;
     uint8_t failures = 0;
     unsigned long start_timer = micros();  // start the timer
     while (i < SIZE) {
       makePayload(i);  // make the payload
       if (!radio.writeFast(&buffer, SIZE)) {
-        radio.getStatusFlags(flags);
+        StatusFlags flags(radio.getStatusFlags());
         if (flags.tx_df()) {
           failures++;
           // now we need to reset the tx_df flag and the radio's CE pin
           radio.ce(LOW);
-          radio.clearStatusFlags(flags);
+          radio.clearStatusFlags(RF24_TX_DF);
           radio.ce(HIGH);
         }
         // else the TX FIFO is full; just continue loop.

examples_linux/interruptConfigure.cpp

@@ -63,9 +63,6 @@ uint8_t pl_iterator = 0;
 char tx_payloads[4][tx_pl_size + 1] = {"Ping ", "Pong ", "Radio", "1FAIL"};
 char ack_payloads[3][ack_pl_size + 1] = {"Yak ", "Back", " ACK"};
 
-// A variable used to interpret and manipulate the IRQ pin.
-StatusFlags flags;
-
 void interruptHandler();         // prototype to handle the interrupt request (IRQ) pin
 void setRole();                  // prototype to set the node's role
 void master();                   // prototype of the TX node's behavior
@@ -177,16 +174,14 @@ void master()
 
     // Test the "data ready" event with the IRQ pin
     cout << "\nConfiguring IRQ pin to ignore the 'data sent' event\n";
-    flags = StatusFlags(RF24_RX_DR | RF24_TX_DF);
-    radio.setStatusFlags(flags);
+    radio.setStatusFlags(RF24_RX_DR | RF24_TX_DF);
     cout << "   Pinging RX node for 'data ready' event..." << endl;
     ping_n_wait(); // transmit a payload and detect the IRQ pin
     pl_iterator++; // increment iterator for next test
 
     // Test the "data sent" event with the IRQ pin
     cout << "\nConfiguring IRQ pin to ignore the 'data ready' event\n";
-    flags = StatusFlags(RF24_TX_DS | RF24_TX_DF);
-    radio.setStatusFlags(flags);
+    radio.setStatusFlags(RF24_TX_DS | RF24_TX_DF);
     cout << "   Pinging RX node for 'data sent' event..." << endl;
     radio.flush_tx(); // flush payloads from any failed prior test
     ping_n_wait();    // transmit a payload and detect the IRQ pin
@@ -195,8 +190,7 @@ void master()
     // Use this iteration to fill the RX node's FIFO which sets us up for the next test.
     // write() uses virtual interrupt flags that work despite the masking of the IRQ pin.
     // disable IRQ pin for this step
-    flags = StatusFlags();
-    radio.setStatusFlags(flags);
+    radio.setStatusFlags();
 
     cout << "\nSending 1 payload to fill RX node's FIFO. IRQ pin is neglected.\n";
     // write() will call flush_tx() on 'data fail' events
@@ -210,8 +204,7 @@ void master()
 
     // test the "data fail" event with the IRQ pin
     cout << "\nConfiguring IRQ pin to reflect all events\n";
-    flags = StatusFlags(RF24_IRQ_ALL);
-    radio.setStatusFlags(flags);
+    radio.setStatusFlags(RF24_IRQ_ALL);
     cout << "   Pinging inactive RX node for 'data fail' event..." << endl;
     ping_n_wait(); // transmit a payload and detect the IRQ pin
 
@@ -231,8 +224,7 @@ void slave()
 {
 
     // let IRQ pin only trigger on "data_ready" event in RX mode
-    flags = StatusFlags(RF24_RX_DR);
-    radio.setStatusFlags(flags);
+    radio.setStatusFlags(RF24_RX_DR);
 
     // Fill the TX FIFO with 3 ACK payloads for the first 3 received
     // transmissions on pipe 0.
@@ -286,7 +278,7 @@ void ping_n_wait()
 
     cout << "\tIRQ pin is actively LOW" << endl; // show that this function was called
 
-    flags = radio.clearStatusFlags();
+    StatusFlags flags(radio.clearStatusFlags());
     // Resetting the tx_df flag is required for
     // continued TX operations when a transmission fails.
     // clearing the status flags resets the IRQ pin to its inactive state (HIGH)

examples_linux/interrupt_configure.py

@@ -102,14 +102,11 @@
 tx_payloads = (b"Ping ", b"Pong ", b"Radio", b"1FAIL")
 ack_payloads = (b"Yak ", b"Back", b" ACK")
 
-# a variable used interpret and manipulate the IRQ pin
-flags = StatusFlags()
-
 
 def interrupt_handler():
     """This function is called when IRQ pin is detected active LOW"""
     print("\tIRQ pin went active LOW.")
-    flags = radio.clearStatusFlags()
+    flags = StatusFlags(radio.clearStatusFlags())
     # Resetting the tx_df flag is required for
     # continued TX operations when a transmission fails.
     # clearing the status flags resets the IRQ pin to its inactive state (HIGH)
@@ -158,8 +155,7 @@ def master():
 
     # on data ready test
     print("\nConfiguring IRQ pin to only ignore 'on data sent' event")
-    flags = StatusFlags(RF24_RX_DR | RF24_TX_DF)
-    radio.setStatusFlags(flags)
+    radio.setStatusFlags(RF24_RX_DR | RF24_TX_DF)
     print("    Pinging slave node for an ACK payload...")
     pl_iterator[0] = 0
     radio.startFastWrite(tx_payloads[0], False)  # False means expecting an ACK
@@ -168,8 +164,7 @@ def master():
 
     # on "data sent" test
     print("\nConfiguring IRQ pin to only ignore 'on data ready' event")
-    flags = StatusFlags(RF24_TX_DS | RF24_TX_DF)
-    radio.setStatusFlags(flags)
+    radio.setStatusFlags(RF24_TX_DS | RF24_TX_DF)
     print("    Pinging slave node again...")
     pl_iterator[0] = 1
     radio.startFastWrite(tx_payloads[1], False)  # False means expecting an ACK
@@ -179,17 +174,15 @@ def master():
     # trigger slave node to exit by filling the slave node's RX FIFO
     print("\nSending one extra payload to fill RX FIFO on slave node.")
     print("Disabling IRQ pin for all events.")
-    flags = StatusFlags()
-    radio.setStatusFlags(flags)
+    radio.setStatusFlags()
     if radio.write(tx_payloads[2]):
         print("Slave node should not be listening anymore.")
     else:
         print("Slave node was unresponsive.")
 
     # on "data fail" test
     print("\nConfiguring IRQ pin to go active for all events.")
-    flags = StatusFlags(RF24_IRQ_ALL)
-    radio.setStatusFlags(flags)
+    radio.setStatusFlags(RF24_IRQ_ALL)
     print("    Sending a ping to inactive slave node...")
     radio.flush_tx()  # just in case any previous tests failed
     pl_iterator[0] = 2
@@ -208,8 +201,7 @@ def slave(timeout=6):  # will listen for 6 seconds before timing out
     # the "data sent" or "data fail" events will trigger when we
     # receive with ACK payloads enabled (& loaded in TX FIFO)
     print("\nDisabling IRQ pin for all events.")
-    flags = StatusFlags()
-    radio.setStatusFlags(flags)
+    radio.setStatusFlags()
     # setup radio to receive pings, fill TX FIFO with ACK payloads
     radio.writeAckPayload(1, ack_payloads[0])
     radio.writeAckPayload(1, ack_payloads[1])

examples_linux/streamingData.cpp

@@ -202,20 +202,19 @@ void master()
 {
     radio.stopListening(); // put radio in TX mode
 
-    StatusFlags flags;
     unsigned int failures = 0; // keep track of failures
     uint8_t i = 0;
     clock_gettime(CLOCK_MONOTONIC_RAW, &startTimer); // start the timer
     while (i < SIZE) {
         makePayload(i);
         if (!radio.writeFast(&buffer, SIZE)) {
-            radio.getStatusFlags(flags);
+            StatusFlags flags(radio.getStatusFlags());
             if (flags.tx_df()) {
                 failures++;
                 // failed to transmit a previous payload.
                 // Now we need to reset the tx_df flag and the CE pin
                 radio.ce(LOW);
-                radio.clearStatusFlags(flags);
+                radio.clearStatusFlags(RF24_TX_DF);
                 radio.ce(HIGH);
             }
             // else the TX FIFO is full; just continue loop

examples_linux/streaming_data.py

@@ -7,7 +7,7 @@
 """
 
 import time
-from RF24 import RF24, RF24_PA_LOW, RF24_DRIVER, StatusFlags
+from RF24 import RF24, RF24_PA_LOW, RF24_DRIVER, StatusFlags, RF24_TX_DF
 
 print(__file__)  # print example name
 
@@ -93,7 +93,6 @@ def master(count: int = 1):
     """
     radio.stopListening()  # put radio in TX mode
     radio.flush_tx()  # clear the TX FIFO so we can use all 3 levels
-    flags = StatusFlags()
     failures = 0  # keep track of manual retries
     start_timer = time.monotonic_ns()  # start timer
     for multiplier in range(count):  # repeat transmit the same data stream
@@ -102,11 +101,12 @@ def master(count: int = 1):
             buffer = make_buffer(buf_iter)  # make a payload
 
             if not radio.writeFast(buffer):  # transmission failed
+                flags = StatusFlags(radio.getStatusFlags())
                 if flags.tx_df:
                     failures += 1  # increment manual retry count
                     # now we need to reset the tx_df flag and the radio's CE pin
                     radio.ce(False)
-                    radio.clearStatusFlags(flags)
+                    flags = radio.clearStatusFlags(RF24_TX_DF)
                     radio.ce(True)
                 if failures > 99 and buf_iter < 7 and multiplier < 2:
                     # we need to prevent an infinite loop

examples_pico/interruptConfigure.cpp

@@ -110,9 +110,8 @@ bool setup()
     else {
         // setup for RX mode
 
-        // let IRQ pin not trigger in RX mode
-        StatusFlags flags;
-        radio.setStatusFlags(flags);
+        // disable IRQ pin in RX mode
+        radio.setStatusFlags();
 
         // Fill the TX FIFO with 3 ACK payloads for the first 3 received
         // transmissions on pipe 1
@@ -143,25 +142,22 @@ void loop()
             // Test the "data ready" event with the IRQ pin
 
             printf("\nConfiguring IRQ pin to ignore the 'data sent' event\n");
-            StatusFlags flags(RF24_RX_DR | RF24_TX_DF);
-            radio.setStatusFlags(flags);
+            radio.setStatusFlags(RF24_RX_DR | RF24_TX_DF);
             printf("   Pinging RX node for 'data ready' event...\n");
         }
         else if (pl_iterator == 1) {
             // Test the "data sent" event with the IRQ pin
 
             printf("\nConfiguring IRQ pin to ignore the 'data ready' event\n");
-            StatusFlags flags(RF24_TX_DS | RF24_TX_DF);
-            radio.setStatusFlags(flags);
+            radio.setStatusFlags(RF24_TX_DS | RF24_TX_DF);
             printf("   Pinging RX node for 'data sent' event...\n");
         }
         else if (pl_iterator == 2) {
             // Use this iteration to fill the RX node's FIFO which sets us up for the next test.
 
             // write() uses virtual interrupt flags that work despite the masking of the IRQ pin
             // disable IRQ pin for this step
-            StatusFlags flags;
-            radio.setStatusFlags(flags);
+            radio.setStatusFlags();
 
             printf("\nSending 1 payload to fill RX node's FIFO. IRQ pin is neglected.\n");
             // write() will call flush_tx() on 'data fail' events
@@ -182,8 +178,7 @@ void loop()
             // test the "data fail" event with the IRQ pin
 
             printf("\nConfiguring IRQ pin to reflect all events\n");
-            StatusFlags flags(RF24_IRQ_ALL);
-            radio.setStatusFlags(flags);
+            radio.setStatusFlags(RF24_IRQ_ALL);
             printf("   Pinging inactive RX node for 'data fail' event...\n");
         }
 
@@ -270,8 +265,7 @@ void loop()
 
             role = false;
             // do not trigger IRQ pin in RX mode
-            StatusFlags flags;
-            radio.setStatusFlags(flags);
+            radio.setStatusFlags();
 
             // Fill the TX FIFO with 3 ACK payloads for the first 3 received
             // transmissions on pipe 1
@@ -310,7 +304,7 @@ void assessInterruptEvent()
 {
     // print IRQ status and all masking flags' states
     printf("\tIRQ pin is actively LOW\n"); // show that this function was called
-    StatusFlags flags = radio.clearStatusFlags();
+    StatusFlags flags(radio.clearStatusFlags());
     // Resetting the tx_df flag is required for
     // continued TX operations when a transmission fails.
     // clearing the status flags resets the IRQ pin to its inactive state (HIGH)

examples_pico/streamingData.cpp

@@ -103,20 +103,19 @@ void loop()
     if (role) {
         // This device is a TX node
 
-        StatusFlags flags;
         radio.flush_tx();
         uint8_t i = 0;
         uint8_t failures = 0;
         uint64_t start_timer = to_us_since_boot(get_absolute_time()); // start the timer
         while (i < SIZE) {
             makePayload(i); // make the payload
             if (!radio.writeFast(&buffer, SIZE)) {
-                radio.getStatusFlags(flags);
+                StatusFlags flags(radio.getStatusFlags());
                 if (flags.tx_df()) {
                     failures++;
                     // now we need to reset the tx_df flag and the radio's CE pin.
                     radio.ce(LOW);
-                    radio.clearStatusFlags(flags);
+                    radio.clearStatusFlags(RF24_TX_DF);
                     radio.ce(HIGH);
                 }
                 // else the TX FIFO is full; just continue loop.