libs/RF24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master with static payload fixes

Browse Source
This commit is contained in:
maniacbug
2011-08-02 16:38:14 -07:00
parent 2f33bdbebd 39ca6b95dd
commit 3aab74ae8f
10 changed files with 579 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/pingpair_test/pingpair_test.pde
View File

@@ -193,9 +193,9 @@ void setup(void)
// Config 3 is static payloads only
if (configuration == '3')
{
next_payload_size = max_payload_size;
next_payload_size = 16;
payload_size_increments_by = 0;
radio.setPayloadSize(16);
radio.setPayloadSize(next_payload_size);
}
else
{
@@ -351,6 +351,7 @@ void check_radio(void)
printf("FAILED ");
one_failed();
}
last_message_count = message_count;
}
// If we're the receiver, we've received a time message
@@ -360,7 +361,9 @@ void check_radio(void)
size_t len = max_payload_size;
memset(receive_payload,0,max_payload_size);
if ( configuration != '3' )
if ( configuration == '3' )
len = next_payload_size;
else
len = radio.getDynamicPayloadSize();
radio.read( receive_payload, len );
@@ -369,8 +372,7 @@ void check_radio(void)
receive_payload[len] = 0;
// 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 strlen=%u\n\r",len,receive_payload,strlen(receive_payload));
// Add an ack packet for the next time around.
// Here we will report back how many bytes we got this time.

10
tests/pingpair_test/runtests.sh
View File

@@ -4,13 +4,13 @@
# WARNING: Test config 2 only works with PLUS units.
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-A40081RP 1 || exit 1
./runtest.py /dev/tty.usbserial-A40081RP 1 || ( kill `jobs -p` && exit 1 )
kill `jobs -p`
./runtest.py /dev/tty.usbserial-A600eHIs 2 &
./runtest.py /dev/tty.usbserial-A40081RP 2 || exit 1
./runtest.py /dev/tty.usbserial-A40081RP 2 || ( kill `jobs -p` && exit 1 )
kill `jobs -p`
./runtest.py /dev/tty.usbserial-A600eHIs 3 &
./runtest.py /dev/tty.usbserial-A40081RP 3 || ( kill `jobs -p` && exit 1 )
kill `jobs -p`
exit 0