latest jamfiles

This commit is contained in:
maniacbug 2012-06-23 19:46:42 -07:00
parent 2c97186329
commit 84e464def4
3 changed files with 10 additions and 10 deletions

View File

@ -75,7 +75,7 @@ void setup(void)
// optionally, reduce the payload size. seems to // optionally, reduce the payload size. seems to
// improve reliability // improve reliability
radio.setPayloadSize(8); //radio.setPayloadSize(8);
// //
// Open pipes to other nodes for communication // Open pipes to other nodes for communication
@ -86,15 +86,15 @@ void setup(void)
// Open 'our' pipe for writing // Open 'our' pipe for writing
// Open the 'other' pipe for reading, in position #1 (we can have up to 5 pipes open for reading) // Open the 'other' pipe for reading, in position #1 (we can have up to 5 pipes open for reading)
if ( role == role_ping_out ) //if ( role == role_ping_out )
{ {
radio.openWritingPipe(pipes[0]); //radio.openWritingPipe(pipes[0]);
radio.openReadingPipe(1,pipes[1]); radio.openReadingPipe(1,pipes[1]);
} }
else //else
{ {
radio.openWritingPipe(pipes[1]); //radio.openWritingPipe(pipes[1]);
radio.openReadingPipe(1,pipes[0]); //radio.openReadingPipe(1,pipes[0]);
} }
// //

View File

@ -4,7 +4,7 @@ PROJECT_LIBS = SPI RF24 ;
# (2) Board Information # (2) Board Information
UPLOAD_PROTOCOL ?= stk500v1 ; UPLOAD_PROTOCOL ?= arduino ;
UPLOAD_SPEED ?= 57600 ; UPLOAD_SPEED ?= 57600 ;
MCU ?= atmega328p ; MCU ?= atmega328p ;
F_CPU ?= 16000000 ; F_CPU ?= 16000000 ;
@ -35,8 +35,8 @@ if $(OS) = MACOSX
} }
else else
{ {
AVR_BIN = /usr/bin ; AVR_BIN ?= /usr/bin ;
AVR_INCLUDE = /usr/lib/avr/include ; AVR_INCLUDE ?= /usr/lib/avr/include ;
AVR_ETC = /etc ; AVR_ETC = /etc ;
} }

View File

@ -37,7 +37,7 @@ if $(OS) = MACOSX
else else
{ {
AVR_BIN ?= /usr/bin ; AVR_BIN ?= /usr/bin ;
AVR_INCLUDE = /usr/lib/avr/include ; AVR_INCLUDE ?= /usr/lib/avr/include ;
AVR_ETC = /etc ; AVR_ETC = /etc ;
} }