Merge branch 'Updates'

RF24.cpp

@@ -32,7 +32,7 @@ void RF24::csn(bool mode)
 	// Return, CSN toggle complete
 	return;
 	
-#elif defined(ARDUINO)
+#elif defined(ARDUINO) && !defined (RF24_SPI_TRANSACTIONS)
 	// Minimum ideal SPI bus speed is 2x data rate
 	// If we assume 2Mbs data rate and 16Mhz clock, a
 	// divider of 4 is the minimum we want.

RF24_config.h

@@ -115,9 +115,17 @@
 // Progmem is Arduino-specific
 // Arduino DUE is arm and does not include avr/pgmspace
 #if defined (ARDUINO_ARCH_ESP8266)
-  #include <pgmspace.h>
-  #define PRIPSTR "%s"
+  #include <pgmspace.h>  
+  
+  typedef uint16_t prog_uint16_t;
+  #define PSTR(x) (x)
   #define printf_P printf
+  #define strlen_P strlen  
+  #define PROGMEM
+  #define pgm_read_byte(addr) (*(const unsigned char *)(addr))
+  #define pgm_read_word(p) (*(p))
+  #define PRIPSTR "%s"
+  
 #elif defined(ARDUINO) && ! defined(__arm__) && !defined (__ARDUINO_X86__)
 	#include <avr/pgmspace.h>
 	#define PRIPSTR "%S"

arch/BBB/spi.cpp

@@ -25,7 +25,7 @@ void SPI::begin(int busNo){
     }
 
 	//RPi:
-	/*  if(!busNo){
+	  /*if(!busNo){
 	    this->device = "/dev/spidev0.0";;
 	  }else{
 	    this->device = "/dev/spidev0.1";;
@@ -110,7 +110,8 @@ uint8_t SPI::transfer(uint8_t tx_)
 	int ret;
   	uint8_t tx[1] = {tx_};
 	uint8_t rx[1];
-
+     
+    this->init();
 	struct spi_ioc_transfer tr = {
 	tr.tx_buf = (unsigned long)&tx[0],
 	tr.rx_buf = (unsigned long)&rx[0],
@@ -151,7 +152,7 @@ void SPI::transfernb(char* tbuf, char* rbuf, uint32_t len)
 {
 	
 	int ret;
-	
+	this->init();
 	struct spi_ioc_transfer tr = {
 		tr.tx_buf = (unsigned long)tbuf,
 		tr.rx_buf = (unsigned long)rbuf,