interfisch
/
rf24-pio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added 3rd test case, static payload

This commit is contained in:
maniacbug 2011-07-13 21:42:16 -07:00
parent c408c5ef90
commit d436895f7c
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/pingpair_test/pingpair_test.pde
View File

@ -70,7 +70,7 @@ void check_radio(void);
const int min_payload_size = 4; const int min_payload_size = 4;
const int max_payload_size = 32; const int max_payload_size = 32;
const int payload_size_increments_by = 2; int payload_size_increments_by = 2;
int next_payload_size = min_payload_size; int next_payload_size = min_payload_size;
char receive_payload[max_payload_size+1]; // +1 to allow room for a terminating NULL char char receive_payload[max_payload_size+1]; // +1 to allow room for a terminating NULL char
@ -169,9 +169,9 @@ void setup(void)
// We will be using the Ack Payload feature, so please enable it // We will be using the Ack Payload feature, so please enable it
radio.enableAckPayload(); radio.enableAckPayload();
// Config 2 is special radio config
if (configuration=='2') if (configuration=='2')
{ {
// Config 2 is special radio config
radio.setCRCLength(RF24_CRC_8); radio.setCRCLength(RF24_CRC_8);
radio.setDataRate(RF24_2MBPS); radio.setDataRate(RF24_2MBPS);
radio.setChannel(10); radio.setChannel(10);
@ -189,9 +189,19 @@ void setup(void)
// Optional: Pick a high channel // Optional: Pick a high channel
radio.setChannel(90); radio.setChannel(90);
} }
// enable dynamic payloads // Config 3 is static payloads only
radio.enableDynamicPayloads(); if (configuration == '3')
{
next_payload_size = max_payload_size;
payload_size_increments_by = 0;
radio.setPayloadSize(16);
}
else
{
// enable dynamic payloads
radio.enableDynamicPayloads();
}
// //
// Open pipes to other nodes for communication // Open pipes to other nodes for communication
@ -331,7 +341,7 @@ void check_radio(void)
// is this ack what we were expecting? to account // is this ack what we were expecting? to account
// for failures, we simply want to make sure we get a // for failures, we simply want to make sure we get a
// DIFFERENT ack every time. // DIFFERENT ack every time.
if ( message_count != last_message_count ) if ( ( message_count != last_message_count ) || ( configuration=='3' && message_count == 16 ) )
{ {
printf("OK "); printf("OK ");
one_ok(); one_ok();
@ -347,13 +357,19 @@ void check_radio(void)
if ( role == role_receiver ) if ( role == role_receiver )
{ {
// Get this payload and dump it // Get this payload and dump it
size_t len = radio.getDynamicPayloadSize(); size_t len = max_payload_size;
memset(receive_payload,0,max_payload_size);
if ( configuration != '3' )
len = radio.getDynamicPayloadSize();
radio.read( receive_payload, len ); radio.read( receive_payload, len );
// Put a zero at the end for easy printing // Put a zero at the end for easy printing
receive_payload[len] = 0; receive_payload[len] = 0;
// Spew it // Spew it
len = strlen(receive_payload); // How much did we REALLY get?
printf("Got payload size=%i value=%s\n\r",len,receive_payload); printf("Got payload size=%i value=%s\n\r",len,receive_payload);
// Add an ack packet for the next time around. // Add an ack packet for the next time around.

3
tests/pingpair_test/runtests.sh
View File

@ -3,6 +3,9 @@
# Connect p6 to receiver, p4 to sender # Connect p6 to receiver, p4 to sender
jam p4 p6 || exit 1 jam p4 p6 || exit 1
./runtest.py /dev/tty.usbserial-A600eHIs 3 &
./runtest.py /dev/tty.usbserial-A40081RP 3 || exit 1
kill `jobs -p`
./runtest.py /dev/tty.usbserial-A600eHIs 1 & ./runtest.py /dev/tty.usbserial-A600eHIs 1 &
./runtest.py /dev/tty.usbserial-A40081RP 1 || exit 1 ./runtest.py /dev/tty.usbserial-A40081RP 1 || exit 1
kill `jobs -p` kill `jobs -p`