Changes to button handling

- Remove IRQ driven button handling due to a bug where a device would stop receiving audio after a button press
- Add handleButtons() function to public interface due to changes
- Fix example missing serial.begin()

Author: TMRh20

RF24Audio.cpp

@@ -89,9 +89,6 @@ void RF24Audio::begin()
     timerStart();			// Get the timer running
     RX();					// Start listening for transmissions
 
-    #if !defined (MANUAL_BUTTON_HANDLING)
-    TIMSK0 |= _BV(OCIE0B);
-    #endif
 }
 
 
@@ -124,9 +121,8 @@ void RF24Audio::timerStart()
     TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10);      //CS10 = no prescaling
 }
 
-#if !defined (MANUAL_BUTTON_HANDLING)
 
-void handleButtons()
+void RF24Audio::handleButtons()
 {
     boolean state = digitalRead(TX_PIN); //Get the state of the transmitting pin
 
@@ -172,7 +168,7 @@ void handleButtons()
     }
 }
 
-#endif //Manual button handling override
+//#endif //Manual button handling override
 
 void rampDown()
 {
@@ -258,14 +254,6 @@ void RF24Audio::receive()
     RX();
 }
 
-// Allows users to totally customize button handling or disable it
-#if !defined MANUAL_BUTTON_HANDLING
-    ISR(TIMER0_COMPB_vect) { // Non-blocking interrupt vector for button management. Is triggered ~1000 times/second by default on Arduino
-        handleButtons();     // Check for external button presses at the default timer0 rate
-    }
-#endif
-
-
 uint64_t RF24Audio::getAddress(byte addressNo)
 {
     return pipes[addressNo];

RF24Audio.h

@@ -120,7 +120,11 @@ class RF24Audio
      */
     uint64_t getAddress(byte addressNo);
 
-
+    /**
+    * Handle button inputs. Must be called regularly for button functionality
+    */
+    void handleButtons();
+     
 private:
 	RF24& radio;
 	void timerStart();

examples/GettingStarted/GettingStarted.ino

@@ -24,33 +24,40 @@ Input/Microphone: Analog pin A0 on all boards
 #include <RF24.h>
 #include <SPI.h>
 #include <RF24Audio.h>
-#include "printf.h"		// General includes for radio and audio lib
+#include "printf.h"             // General includes for radio and audio lib
 
-RF24 radio(7,8);		// Set radio up using pins 7 (CE) 8 (CS)
-RF24Audio rfAudio(radio,1);	// Set up the audio using the radio, and set to radio number 0
+RF24 radio(7,8);                // Set radio up using pins 7 (CE) 8 (CS)
+RF24Audio rfAudio(radio,1);     // Set up the audio using the radio, and set to radio number 0
 
-void setup() {			
-  Serial.begin(115200);		// Enable Arduino serial library
+void setup() {          
+  Serial.begin(115200);         // Enable Arduino serial library
 
   printf_begin();               // Radio library uses printf to output debug info  
   radio.begin();                // Must start the radio here, only if we want to print debug info
   radio.printDetails();         // Print the info
 
-  rfAudio.begin();		// Start up the radio and audio libararies
+  rfAudio.begin();              // Start up the radio and audio libararies
 }
 
+uint32_t printTimer = 0;
+
 void loop() {
 
-    if(Serial.available()){                                           // Receive and analyze incoming serial data
+    rfAudio.handleButtons();                      //Handling of button inputs
+    
+    if(Serial.available()){                       // Receive and analyze incoming serial data
         switch(Serial.read()){
-            case 'r': rfAudio.transmit(); break;  		      // Send an r or an s over serial to control playback
+            case 'r': rfAudio.transmit(); break;  // Send an r or an s over serial to control playback
             case 's': rfAudio.receive();  break;
-            case '=': rfAudio.volume(1);  break;                      // Control volume by sending = or - over serial
+            case '=': rfAudio.volume(1);  break;  // Control volume by sending = or - over serial
             case '-': rfAudio.volume(0);  break;
         }
     }
-    Serial.println("test");
-    delay(1000);
+
+    if(millis() - printTimer > 1000){
+      printTimer = millis();
+      Serial.println("test");
+    }
 }
 
 

examples/Minimal/Minimal.ino

@@ -34,21 +34,23 @@ Note: Pin selections can be overridden by modifying the userConfig.h file includ
 #include <SPI.h>
 #include <RF24Audio.h>
 
-RF24 radio(7,8);		// Set radio up using pins 7 (CE) 8 (CS)
-RF24Audio rfAudio(radio,1);	// Set up the audio using the radio, and set to radio number 0.
+RF24 radio(7,8);                // Set radio up using pins 7 (CE) 8 (CS)
+RF24Audio rfAudio(radio,1);     // Set up the audio using the radio, and set to radio number 0.
                                 // Setting the radio number is only important if one-to-one communication is desired
-				// in a multi-node radio group. See the privateBroadcast() function.
+                                // in a multi-node radio group. See the privateBroadcast() function.
 
-void setup() {			
+void setup() {          
 
-  rfAudio.begin();		// The only thing to do is initialize the library.
+  rfAudio.begin();              // Initialize the library.
 
 }
 
 void loop() {
 
-  // Audio playback and button handling is all managed internally.
+  rfAudio.handleButtons();
+  // Audio playback is all managed internally.
   // In this example, the radio is controlled by external buttons, so there is nothing to do here
+  // except handle the buttons.
 
 }
 

examples/PrivateChannels/PrivateChannels.ino

@@ -31,21 +31,24 @@ to establish node-to-node communication between each other.
 #include <SPI.h>
 #include <RF24Audio.h>
 
-RF24 radio(7,8);		// Set radio up using pins 7 (CE) 8 (CS)
+RF24 radio(7,8);        // Set radio up using pins 7 (CE) 8 (CS)
 
 /********* Set the Radio Identifier Here ************/
-RF24Audio rfAudio(radio,0);	// Set up the audio using the radio, and set to radio number 0.
-                                // Setting the radio number is only important if one-to-one communication is desired
-                                // in a multi-node radio group. See the private
+RF24Audio rfAudio(radio,0); // Set up the audio using the radio, and set to radio number 0.
+                            // Setting the radio number is only important if one-to-one communication is desired
+                            // in a multi-node radio group. See the private
+
+void setup() {          
 
-void setup() {			
   Serial.begin(115200);
-  rfAudio.begin();		// The only thing to do is initialize the library.
+  rfAudio.begin();          // The only thing to do is initialize the library.
 
 }
 
 void loop() {
 
+  rfAudio.handleButtons();
+  
   if(Serial.available()){
       switch(Serial.read()){
           case 'r': rfAudio.transmit();  break;

examples/PrivateGroups/PrivateGroups.ino

@@ -30,10 +30,10 @@ Note: Pin selections can be overridden by modifying the userConfig.h file includ
 #include <RF24Audio.h>
 //#include "printf.h"
 
-RF24 radio(7,8);		// Set radio up using pins 7 (CE) 8 (CS)
-RF24Audio rfAudio(radio,0);	// Set up the audio using the radio, and set to radio number 0.
-                                // Setting the radio number is only important if one-to-one communication is desired
-				// in a multi-node radio group. See the privateBroadcast() function.
+RF24 radio(7,8);            // Set radio up using pins 7 (CE) 8 (CS)
+RF24Audio rfAudio(radio,0); // Set up the audio using the radio, and set to radio number 0.
+                            // Setting the radio number is only important if one-to-one communication is desired
+                            // in a multi-node radio group. See the privateBroadcast() function.
 
 
 // This is a sketch used for demonstrating the multicast capabilities of the radios
@@ -50,10 +50,10 @@ Read Addy:  11 11 10 10 11   4    // Any radio listening on an address that is s
 Read Addy:  13 12 12 12 13   5
 */
 
-void setup() {	
-	
+void setup() {  
+    
   //Serial.begin(115200);
-  rfAudio.begin();		// The only thing to do is initialize the library.
+  rfAudio.begin();      // The only thing to do is initialize the library.
   //printf_begin();
   //radio.printDetails();
 
@@ -71,7 +71,8 @@ broadcast to that address **/
 
 void loop() {
 
-  // Audio playback and button handling is all managed internally.
+  rfAudio.handleButtons();
+  // Audio playback is all managed internally.
   // In this example, the radio is controlled by external buttons, so there is nothing to do here
 
 }

userConfig.h

@@ -46,7 +46,6 @@
 
 /************  Optional/Advanced User Variables  ************/
 
-//#define MANUAL_BUTTON_HANDLING  // Disables button handling via timer0. Allow users to customize button handling
 
 /** Button pin to trigger recording & transmission */
 #define TX_PIN A1