MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated some examples to show the new lib usage

Browse Source 
Updated GettingStarted, pingpair, added medium speed version of transfer
rate test
This commit is contained in:
TMRh20
2014-03-19 20:23:33 -06:00
parent 63ee0ce2c0
commit 99571d6530
5 changed files with 419 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/pingpair/pingpair.pde → examples/pingpair/pingpair.ino
+37 -71
View File
@@ -15,6 +15,8 @@
* took.
*/
//March 2014 TMRh20 - Updated to utilize High Speed RF24 Library fork
#include <SPI.h>
#include "nRF24L01.h"
#include "RF24.h"
@@ -22,20 +24,14 @@
//
// Hardware configuration
//
// Set up nRF24L01 radio on SPI bus plus pins 9 & 10
RF24 radio(9,10);
// sets the role of this unit in hardware. Connect to GND to be the 'pong' receiver
// Leave open to be the 'ping' transmitter
const int role_pin = 7;
const int role_pin = 5;
//
// Topology
//
// Radio pipe addresses for the 2 nodes to communicate.
const uint64_t pipes[2] = { 0xF0F0F0F0E1LL, 0xF0F0F0F0D2LL };
@@ -63,14 +59,11 @@ void setup(void)
//
// Role
//
pinMode(role_pin, INPUT); // set up the role pin
digitalWrite(role_pin,HIGH); //Change this to HIGH/LOW to pre-choose a role
delay(20); // Just to get a solid reading on the role pin
// set up the role pin
pinMode(role_pin, INPUT);
digitalWrite(role_pin,HIGH);
delay(20); // Just to get a solid reading on the role pin
// read the address pin, establish our role
if ( ! digitalRead(role_pin) )
if ( ! digitalRead(role_pin) ) // read the address pin, establish our role
role = role_ping_out;
else
role = role_pong_back;
@@ -89,13 +82,10 @@ void setup(void)
//
radio.begin();
// optionally, increase the delay between retries & # of retries
radio.setRetries(15,15);
// optionally, reduce the payload size. seems to
// improve reliability
radio.setPayloadSize(8);
radio.setRetries(15,15); // optionally, increase the delay between retries & # of retries
radio.setPayloadSize(8); // optionally, reduce the payload size. seems to improve reliability
//
// Open pipes to other nodes for communication
@@ -117,17 +107,9 @@ void setup(void)
radio.openReadingPipe(1,pipes[0]);
}
//
// Start listening
//
radio.startListening(); // Start listening
radio.startListening();
//
// Dump the configuration of the rf unit for debugging
//
radio.printDetails();
radio.printDetails(); // Dump the configuration of the rf unit for debugging
}
void loop(void)
@@ -137,47 +119,39 @@ void loop(void)
//
if (role == role_ping_out)
{
// First, stop listening so we can talk.
radio.stopListening();
{
radio.stopListening(); // First, stop listening so we can talk.
// Take the time, and send it. This will block until complete
unsigned long time = millis();
unsigned long time = millis(); // Take the time, and send it. This will block until complete
printf("Now sending %lu...",time);
bool ok = radio.write( &time, sizeof(unsigned long) );
bool ok = radio.writeFast( &time, sizeof(unsigned long) ); // NEW command to buffer data more efficiently
if (ok)
printf("ok...");
else
if (!ok)
printf("failed.\n\r");
// Now, continue listening
radio.startListening();
while(!radio.txStandBy()){} //NEW command needs to be called after done sending. Allows FIFO buffers to be filled
radio.startListening(); // Now, continue listening
// Wait here until we get a response, or timeout (250ms)
unsigned long started_waiting_at = millis();
unsigned long started_waiting_at = millis(); // Wait here until we get a response, or timeout (250ms)
bool timeout = false;
while ( ! radio.available() && ! timeout )
if (millis() - started_waiting_at > 200 )
timeout = true;
// Describe the results
if ( timeout )
if ( timeout ) // Describe the results
{
printf("Failed, response timed out.\n\r");
}
else
{
// Grab the response, compare, and send to debugging spew
unsigned long got_time;
unsigned long got_time; // Grab the response, compare, and send to debugging spew
radio.read( &got_time, sizeof(unsigned long) );
// Spew it
printf("Got response %lu, round-trip delay: %lu\n\r",got_time,millis()-got_time);
printf("Got response %lu, round-trip delay: %lu\n\r",got_time,millis()-got_time); // Spew it
}
// Try again 1s later
delay(1000);
delay(1000); // Try again 1s later
}
//
@@ -186,35 +160,27 @@ void loop(void)
if ( role == role_pong_back )
{
// if there is data ready
if ( radio.available() )
if ( radio.available() ) // if there is data ready
{
// Dump the payloads until we've gotten everything
unsigned long got_time;
unsigned long got_time; // Dump the payloads until we've gotten everything
bool done = false;
while (!done)
while (radio.available())
{
// Fetch the payload, and see if this was the last one.
done = radio.read( &got_time, sizeof(unsigned long) );
// Spew it
printf("Got payload %lu...",got_time);
radio.read( &got_time, sizeof(unsigned long) ); // Fetch the payload, and see if this was the last one.
}
printf("Got payload %lu...",got_time); // Spew it
// Delay just a little bit to let the other unit
// make the transition to receiver
delay(20);
}
//delay(20);
// First, stop listening so we can talk
radio.stopListening();
radio.stopListening(); // First, stop listening so we can talk
// Send the final one back.
radio.write( &got_time, sizeof(unsigned long) );
radio.write( &got_time, sizeof(unsigned long) );// Send the final one back.
printf("Sent response.\n\r");
// Now, resume listening so we catch the next packets.
radio.startListening();
radio.startListening(); // Now, resume listening so we catch the next packets.
}
}
}
// vim:cin:ai:sts=2 sw=2 ft=cpp
// vim:cin:ai:sts=2 sw=2 ft=cpp