More ram saving changes, as well as minor typos/ comments & serial speed normalization

.gitignore

@@ -12,7 +12,6 @@ out/
 out_native/
 version.h
 Session.vim
-<<<<<<< HEAD
-librf*.so.*
-.DS*
-
+*.so
+*.dylib
+.DS_Store

Makefile

@@ -0,0 +1,113 @@
+#############################################################################
+#
+# Makefile for librf24-bcm on Raspberry Pi
+#
+# License: GPL (General Public License)
+# Author:  Charles-Henri Hallard 
+# Date:    2013/03/13 
+#
+# Description:
+# ------------
+# use make all and mak install to install the library 
+# You can change the install directory by editing the LIBDIR line
+#
+PREFIX=/usr/local
+
+# Library parameters
+# where to put the lib
+LIBDIR=$(PREFIX)/lib
+# lib name 
+LIB=librf24-bcm
+# shared library name
+LIBNAME=$(LIB).so.1.0
+
+# Where to put the header files
+HEADER_DIR=${PREFIX}/include/RF24
+
+# The base location of support files for different devices
+ARCH_DIR=arch
+
+# The default objects to compile
+OBJECTS=RF24.o spi.o
+
+SHARED_LINKER_FLAGS=-shared -Wl,-soname,[email protected]
+
+
+
+# Detect the Raspberry Pi from cpuinfo
+# Allow users to override the use of BCM2835 driver and force use of SPIDEV by specifying " sudo make install -B RF24_SPIDEV=1 "
+ifeq "$(RF24_SPIDEV)" "1"
+RPI=0
+else
+#Count the matches for BCM2708 or BCM2709 in cpuinfo
+RPI=$(shell cat /proc/cpuinfo | grep Hardware | grep -c BCM2708)
+  ifneq "${RPI}" "1"
+  RPI=$(shell cat /proc/cpuinfo | grep Hardware | grep -c BCM2709)
+  endif
+endif
+
+ifeq "$(RF24_MRAA)" "1"
+SHARED_LINKER_FLAGS+=-lmraa 
+DRIVER_DIR=$(ARCH_DIR)/MRAA
+OBJECTS+=gpio.o compatibility.o
+
+else ifeq "$(RPI)" "1"
+DRIVER_DIR=$(ARCH_DIR)/RPi
+OBJECTS+=bcm2835.o	
+# The recommended compiler flags for the Raspberry Pi
+CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s
+
+else
+DRIVER_DIR=$(ARCH_DIR)/BBB
+OBJECTS+=gpio.o compatibility.o
+endif
+
+
+# make all
+# reinstall the library after each recompilation
+all: test librf24-bcm
+
+test:
+	cp ${DRIVER_DIR}/includes.h $(ARCH_DIR)/includes.h
+# Make the library
+librf24-bcm: $(OBJECTS)
+	g++ ${SHARED_LINKER_FLAGS} ${CCFLAGS} -o ${LIBNAME} $^
+
+# Library parts
+RF24.o: RF24.cpp	
+	g++ -Wall -fPIC ${CCFLAGS} -c $^
+
+bcm2835.o: $(DRIVER_DIR)/bcm2835.c
+	gcc -Wall -fPIC ${CCFLAGS} -c $^
+
+spi.o: $(DRIVER_DIR)/spi.cpp
+	g++ -Wall -fPIC ${CCFLAGS} -c $^
+
+compatibility.o: $(DRIVER_DIR)/compatibility.c
+	gcc -Wall -fPIC  ${CCFLAGS} -c $(DRIVER_DIR)/compatibility.c
+
+gpio.o: $(DRIVER_DIR)/gpio.cpp
+	g++ -Wall -fPIC ${CCFLAGS} -c $(DRIVER_DIR)/gpio.cpp
+
+# clear build files
+clean:
+	rm -rf *.o ${LIB}.*
+
+install: all install-libs install-headers
+
+# Install the library to LIBPATH
+install-libs: 
+	@echo "[Installing Libs]"
+	@if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+	@install -m 0755 ${LIBNAME} ${LIBDIR}
+	@ln -sf ${LIBDIR}/${LIBNAME} ${LIBDIR}/${LIB}.so.1
+	@ln -sf ${LIBDIR}/${LIBNAME} ${LIBDIR}/${LIB}.so
+	@ldconfig
+
+install-headers:
+	@echo "[Installing Headers]"
+	@if ( test ! -d ${HEADER_DIR} ) ; then mkdir -p ${HEADER_DIR} ; fi
+	@install -m 0644 *.h ${HEADER_DIR}
+	@if ( test ! -d ${HEADER_DIR}/${DRIVER_DIR} ) ; then mkdir -p ${HEADER_DIR}/${DRIVER_DIR} ; fi
+	@install -m 0644 ${DRIVER_DIR}/*.h ${HEADER_DIR}/${DRIVER_DIR}
+	@install -m 0644 ${ARCH_DIR}/*.h ${HEADER_DIR}/${ARCH_DIR}

Makefile.littlewire

@@ -0,0 +1,68 @@
+#############################################################################
+#
+# Makefile for librf24 via LittleWire
+#
+# License: GPL (General Public License)
+# Author:  Andreas Steinel
+# Date:    2014/11/19
+#
+# Description:
+# ------------
+# use make all and make install to install the library 
+# You can change the install directory by editing the LIBDIR line
+#
+
+PREFIX=/opt/LittleWirePrefix
+
+LIB=librf24
+
+HEADER_DIR=${PREFIX}/include/RF24
+LIB_DIR=$(PREFIX)/lib
+DRIVER_DIR=arch/LittleWire
+
+ifeq ($(shell uname), Linux)
+	DYN_SUFFIX=so
+	LINK_FORMAT=-shared -Wl,-soname,$@.$(DYN_SUFFIX)
+else ifeq ($(shell uname), Darwin)
+	DYN_SUFFIX=dylib
+	LINK_FORMAT=-dynamiclib -install_name ${LIB_DIR}/${LIB}.${DYN_SUFFIX}
+else
+	$(shell echo "Unknown System, please fix Makefile!")
+	$(shell false )
+endif
+
+LIBNAME=$(LIB).$(DYN_SUFFIX)
+CCFLAGS=-O2 -Wall -g -DLITTLEWIRE -I$(PREFIX)/include
+LIBS=-L$(PREFIX)/lib -llittlewire-spi
+
+# make all
+# reinstall the library after each recompilation
+all: $(LIB)
+
+# Make the library
+$(LIB): RF24.o
+	g++ $(LINK_FORMAT) ${LIBS} -o ${LIBNAME} $^
+
+# Library parts
+RF24.o: RF24.cpp
+	g++ -Wall -fPIC ${CCFLAGS} -c $^
+
+# clear build files
+clean:
+	rm -rf *.o ${LIBNAME}
+
+install: all install-libs install-headers
+
+# Install the library to LIBPATH
+install-libs: 
+	@echo "[Installing Libs]"
+	@if ( test ! -d ${LIB_DIR} ) ; then mkdir -p ${LIB_DIR}; fi
+	@install -m 0755 ${LIBNAME} ${LIB_DIR}
+	@ln -sf ${LIB_DIR}/${LIBNAME} ${LIB_DIR}/${LIBNAME}.1
+
+install-headers:
+	@echo "[Installing Headers]"
+	@if ( test ! -d ${HEADER_DIR} ) ; then mkdir -p ${HEADER_DIR} ; fi
+	@install -m 0644 *.h ${HEADER_DIR}
+	@if ( test ! -d ${HEADER_DIR}/${DRIVER_DIR} ) ; then mkdir -p ${HEADER_DIR}/${DRIVER_DIR} ; fi
+	@install -m 0644 ${DRIVER_DIR}/*.h ${HEADER_DIR}/${DRIVER_DIR}

README.md

@@ -1,69 +1,2 @@
-# Arduino & Raspberry Pi driver for nRF24L01(+) 2.4GHz Wireless Transceiver
 
-Design Goals: 
-
-* Maximally compliant with the intended operation of the chip
-* Easy for beginners to use
-* Consumed with a public interface that's similiar to other Arduino standard libraries
-* Built against the standard SPI library. 
-* Support popular platform
-
-* Modifications to the RF24 library in this fork is backward compatible. A single
-  enhancement which may cause issue, is code which relies on the driver to power down the
-  radio, as a side effect. The radio is no longer powered down after each transmit. Rather,
-  the application must take responsibility for power management. Normally this is
-  achieved by use of powerDown and powerUp. If you wish to maximize power efficiency,
-  you must call powerDown after transmit (write, startWrite).
-
-Please refer to links :
-
-* [Blog on setting up both Arduino UNO & Raspberry Pi] (http://arduino-for-beginners.blogspot.com/2013/02/setup-nordic-nrf24l01-rf-modules-to.html)
-* [Documentation Main Page](http://maniacbug.github.com/RF24)
-* [RF24 Class Documentation](http://maniacbug.github.com/RF24/classRF24.html)
-* [Source Code](https://github.com/maniacbug/RF24)
-* [Downloads](https://github.com/maniacbug/RF24/archives/master)
-* [nRF24L01+ datasheet](http://www.nordicsemi.com/eng/nordic/download_resource/8765/2/27999719 )
-
-
-# Optimized High Speed Arduino driver for nRF24L01 2.4GHz Wireless Transceiver
-
-Design Goals: This library is designed to be...  
-
-* More compliant with the manufacturer specified operation of the chip, while allowing advanced users
-* to work outside the reccommended operation. 
-* Utilize the capabilities of the radio to their full potential via Arduino
-* More reliable and feature rich  
-* Easy for beginners to use, with well documented examples and features 
-* Consumed with a public interface that's similiar to other Arduino standard libraries  
-* Built against the standard SPI library.   
-
-April 2014: Official Release: Still some work to do, but most benefits have been realized
->>>>>>> 327f0609cf7b52b70accccc175b5809dd5074704
-
-* The library has been tweaked to allow full use of the FIFO buffers for maximum transfer speeds
-* Changes to read() and available () functionality have increased reliability and response
-* Extended timeout periods have been added to aid in noisy or otherwise unreliable environments
-* Delays have been removed where possible to ensure maximum efficiency
-* Full Due support with extended SPI functions
-* ATTiny 24/44/84 25/45/85 now supported.
-* More! See the links below and class documentation for more info.
-
-Please refer to:  
-
-* [Documentation Main Page](http://tmrh20.github.io/)  
-* [Class Reference]( http://tmrh20.github.io/RF24/classRF24.html)  
-* [Source Code](https://github.com/tmrh20/RF24)  
-* [Downloads](https://github.com/TMRh20/RF24/archive/master.zip)  
-* [Chip Datasheet](http://www.nordicsemi.com/files/Product/data_sheet/nRF24L01_Product_Specification_v2_0.pdf)  
-
-This chip uses the SPI bus, plus two chip control pins.  Remember that pin 10 must still remain an output, or  
-the SPI hardware will go into 'slave' mode.  
-
-Supported Boards:  
-
-* Uno, Nano, etc (328 based boards)  
-* Mega Types (2560, 1280, etc)  
-* ARM (Arduino Due) via extended SPI methods 
-* ATTiny 24/44/84 25/45/85  
-* Raspberry Pi
-* See the [documentation](http://tmrh20.github.io/) for more info
+**See http://tmrh20.github.io/RF24 for all documentation**