From 84e464def4a52a3a697ee95d26eb66997db0ea76 Mon Sep 17 00:00:00 2001 From: maniacbug Date: Sat, 23 Jun 2012 19:46:42 -0700 Subject: [PATCH] latest jamfiles --- examples/GettingStarted/GettingStarted.pde | 12 ++++++------ examples/GettingStarted/Jamfile | 6 +++--- examples/pingpair_irq/Jamfile | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/GettingStarted/GettingStarted.pde b/examples/GettingStarted/GettingStarted.pde index 3cb32d5..bf1851a 100644 --- a/examples/GettingStarted/GettingStarted.pde +++ b/examples/GettingStarted/GettingStarted.pde @@ -75,7 +75,7 @@ void setup(void) // optionally, reduce the payload size. seems to // improve reliability - radio.setPayloadSize(8); + //radio.setPayloadSize(8); // // Open pipes to other nodes for communication @@ -86,15 +86,15 @@ void setup(void) // Open 'our' pipe for writing // 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]); } - else + //else { - radio.openWritingPipe(pipes[1]); - radio.openReadingPipe(1,pipes[0]); + //radio.openWritingPipe(pipes[1]); + //radio.openReadingPipe(1,pipes[0]); } // diff --git a/examples/GettingStarted/Jamfile b/examples/GettingStarted/Jamfile index 6a2499a..9a5f2c4 100644 --- a/examples/GettingStarted/Jamfile +++ b/examples/GettingStarted/Jamfile @@ -4,7 +4,7 @@ PROJECT_LIBS = SPI RF24 ; # (2) Board Information -UPLOAD_PROTOCOL ?= stk500v1 ; +UPLOAD_PROTOCOL ?= arduino ; UPLOAD_SPEED ?= 57600 ; MCU ?= atmega328p ; F_CPU ?= 16000000 ; @@ -35,8 +35,8 @@ if $(OS) = MACOSX } else { - AVR_BIN = /usr/bin ; - AVR_INCLUDE = /usr/lib/avr/include ; + AVR_BIN ?= /usr/bin ; + AVR_INCLUDE ?= /usr/lib/avr/include ; AVR_ETC = /etc ; } diff --git a/examples/pingpair_irq/Jamfile b/examples/pingpair_irq/Jamfile index 18244ec..97237bc 100644 --- a/examples/pingpair_irq/Jamfile +++ b/examples/pingpair_irq/Jamfile @@ -37,7 +37,7 @@ if $(OS) = MACOSX else { AVR_BIN ?= /usr/bin ; - AVR_INCLUDE = /usr/lib/avr/include ; + AVR_INCLUDE ?= /usr/lib/avr/include ; AVR_ETC = /etc ; }