Merge branch 'master' of https://github.com/TMRh20/RF24

Makefile

@@ -27,6 +27,11 @@ HEADER_DIR=${PREFIX}/include/RF24
 # The base location of support files for different devices
 ARCH_DIR=utility
 
+ARCH=armv6zk
+ifeq "$(shell uname -m)" "armv7l"
+ARCH=armv7-a
+endif
+
 # The default objects to compile
 OBJECTS=RF24.o spi.o
 
@@ -57,7 +62,7 @@ OBJECTS+=bcm2835.o
 OBJECTS+=interrupt.o
 SHARED_LINKER_FLAGS+=-pthread
 # The recommended compiler flags for the Raspberry Pi
-CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s
+CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=$(ARCH) -mtune=arm1176jzf-s
 
 else
 DRIVER_DIR=$(ARCH_DIR)/BBB

examples/TransferTimeouts/TransferTimeouts.ino

@@ -43,7 +43,7 @@ bool TX=1,RX=0,role=0, transferInProgress = 0;
 
 void setup(void) {
 
-  Serial.begin(57600);
+  Serial.begin(115200);
   printf_begin();
 
   radio.begin();                           // Setup and configure rf radio

examples/Usage/led_remote/led_remote.pde

@@ -108,7 +108,7 @@ void setup(void)
   // Print preamble
   //
 
-  Serial.begin(57600);
+  Serial.begin(115200);
   printf_begin();
   printf("\n\rRF24/examples/led_remote/\n\r");
   printf("ROLE: %s\n\r",role_friendly_name[role]);

examples/Usage/nordic_fob/nordic_fob.pde

@@ -58,7 +58,7 @@ void setup(void)
   // Print preamble
   //
 
-  Serial.begin(57600);
+  Serial.begin(115200);
   printf_begin();
   printf("\r\nRF24/examples/nordic_fob/\r\n");
 

examples/scanner/output/scanner.cpp

@@ -50,7 +50,7 @@ void setup(void)
   // Print preamble
   //
   
-  Serial.begin(57600);
+  Serial.begin(115200);
   printf_begin();
   printf("\n\rRF24/examples/scanner/\n\r");
   

examples/starping/starping.pde

@@ -128,7 +128,7 @@ void setup(void)
   // Print preamble
   //
 
-  Serial.begin(57600);
+  Serial.begin(115200);
   printf_begin();
   printf("\n\rRF24/examples/starping/\n\r");
   printf("ROLE: %s\n\r",role_friendly_name[role]);

examples_RPi/Makefile

@@ -16,9 +16,14 @@ prefix := /usr/local
 # Detect the Raspberry Pi by the existence of the bcm_host.h file
 BCMLOC=/opt/vc/include/bcm_host.h
 
+ARCH=armv6zk
+ifeq "$(shell uname -m)" "armv7l"
+ARCH=armv7-a
+endif
+
 ifneq ("$(wildcard $(BCMLOC))","")
 # The recommended compiler flags for the Raspberry Pi
-CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s
+CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=$(ARCH) -mtune=arm1176jzf-s
 endif
 
 # define all programs

examples_RPi/extra/Makefile

@@ -13,8 +13,13 @@
 #
 prefix := /usr/local
 
+ARCH=armv6zk
+ifeq "$(shell uname -m)" "armv7l"
+ARCH=armv7-a
+endif
+
 # The recommended compiler flags for the Raspberry Pi
-CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s
+CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=$(ARCH) -mtune=arm1176jzf-s
 #CCFLAGS=
 
 # define all programs

examples_RPi/extra/scanner.cpp

@@ -62,7 +62,7 @@ int main(int argc, char** argv)
   // Print preamble
   //
 
-  //Serial.begin(57600);
+  //Serial.begin(115200);
   //printf_begin();
   printf("RF24/examples/scanner/\n");
 

examples_RPi/interrupts/Makefile

@@ -13,12 +13,17 @@
 #
 prefix := /usr/local
 
+ARCH=armv6zk
+ifeq "$(shell uname -m)" "armv7l"
+ARCH=armv7-a
+endif
+
 # Detect the Raspberry Pi by the existence of the bcm_host.h file
 BCMLOC=/opt/vc/include/bcm_host.h
 
 ifneq ("$(wildcard $(BCMLOC))","")
 # The recommended compiler flags for the Raspberry Pi
-CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s
+CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=$(ARCH) -mtune=arm1176jzf-s
 endif
 
 # define all programs

library.properties

 name=RF24
-version=1.1.4
+version=1.1.5
 author=TMRh20
 maintainer=TMRh20
 sentence=A library for NRF24L01(+) communication.

tests/native/pingpair_irq.pde

@@ -80,7 +80,7 @@ void setup(void)
   // Print preamble
   //
 
-  Serial.begin(57600);
+  Serial.begin(115200);
   printf_begin();
   printf("\n\rRF24/examples/pingpair_irq/\n\r");
   printf("ROLE: %s\n\r",role_friendly_name[role]);

tests/pingpair_blocking/pingpair_blocking.pde

@@ -114,7 +114,7 @@ void setup(void)
   // Print preamble
   //
 
-  Serial.begin(57600);
+  Serial.begin(115200);
   printf_begin();
   printf("\n\rRF24/tests/pingpair_blocking/\n\r");
   printf("ROLE: %s\n\r",role_friendly_name[role]);

tests/pingpair_test/pingpair_test.pde

@@ -136,7 +136,7 @@ void setup(void)
   // Print preamble
   //
 
-  Serial.begin(57600);
+  Serial.begin(115200);
   printf_begin();
   printf("\n\rRF24/tests/pingpair_test/\n\r");
   printf("ROLE: %s\n\r",role_friendly_name[role]);