Remove prog_char, for compliance with gcc 4.6.1

RF24.cpp

@@ -206,7 +206,7 @@ void RF24::print_observe_tx(uint8_t value)
 
 /****************************************************************************/
 
-void RF24::print_byte_register(prog_char* name, uint8_t reg, uint8_t qty)
+void RF24::print_byte_register(const char* name, uint8_t reg, uint8_t qty)
 {
   char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
   printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);
@@ -217,7 +217,7 @@ void RF24::print_byte_register(prog_char* name, uint8_t reg, uint8_t qty)
 
 /****************************************************************************/
 
-void RF24::print_address_register(prog_char* name, uint8_t reg, uint8_t qty)
+void RF24::print_address_register(const char* name, uint8_t reg, uint8_t qty)
 {
   char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
   printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);

RF24.h

@@ -194,7 +194,7 @@ protected:
    * @param reg Which register. Use constants from nRF24L01.h
    * @param qty How many successive registers to print
    */
-  void print_byte_register(prog_char* name, uint8_t reg, uint8_t qty = 1);
+  void print_byte_register(const char* name, uint8_t reg, uint8_t qty = 1);
 
   /**
    * Print the name and value of a 40-bit address register to stdout
@@ -207,7 +207,7 @@ protected:
    * @param reg Which register. Use constants from nRF24L01.h
    * @param qty How many successive registers to print
    */
-  void print_address_register(prog_char* name, uint8_t reg, uint8_t qty = 1);
+  void print_address_register(const char* name, uint8_t reg, uint8_t qty = 1);
 
   /**
    * Turn on or off the special features of the chip

RF24_config.h

@@ -37,11 +37,13 @@ extern HardwareSPI SPI;
 #endif
 
 // Avoid spurious warnings
+#if 1
 #if ! defined( NATIVE ) && defined( ARDUINO )
 #undef PROGMEM
 #define PROGMEM __attribute__(( section(".progmem.data") ))
 #undef PSTR
-#define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); &__c[0];}))
+#define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];}))
+#endif
 #endif
 
 // Progmem is Arduino-specific
@@ -49,7 +51,7 @@ extern HardwareSPI SPI;
 #include <avr/pgmspace.h>
 #define PRIPSTR "%S"
 #else
-typedef char const prog_char;
+typedef char const char;
 typedef uint16_t prog_uint16_t;
 #define PSTR(x) (x)
 #define printf_P printf

examples/pingpair_irq/Jamfile

@@ -1,68 +1,89 @@
-PROJECT_NAME 	= $(PWD:B) ;
+# (1) Project Information
-PROJECT_DIR 	= . ;
+
 PROJECT_LIBS 	= SPI RF24 ; 
+PROJECT_DIRS	= $(PWD) ;
 
-OUT_DIR = ojam ;
+# (2) Board Information
-F_CPU 		= 16000000 ;
-MCU             = atmega328p ;
-PORTS           = /dev/tty.usbserial-A600eHIs /dev/tty.usbserial-A40081RP /dev/tty.usbserial-A9007LmI ;
 
-UPLOAD_RATE 	= 57600 ;
+UPLOAD_PROTOCOL ?= arduino ;
-AVRDUDE_PROTOCOL = stk500v1 ;
+UPLOAD_SPEED 	?= 115200 ;
-COM 		= 33 ;
+MCU		?= atmega328p ;
+F_CPU 		?= 16000000 ;
+CORE		?= arduino ;
+VARIANT 	?= standard ;
+ARDUINO_VERSION	?= 100 ;
+
+# (3) USB Ports
+
+PORTS		= p4 p6 p9 u0 u1 u2 ;
+PORT_p6 	= /dev/tty.usbserial-A600eHIs ;
+PORT_p4 	= /dev/tty.usbserial-A40081RP ;
+PORT_p9		= /dev/tty.usbserial-A9007LmI ;
+PORT_u0 	= /dev/ttyUSB0 ;
+PORT_u1 	= /dev/ttyUSB1 ;
+PORT_u2 	= /dev/ttyUSB2 ;
+
+# (4) Location of AVR tools
+#
+# This configuration assumes using avr-tools that were obtained separate from the Arduino
+# distribution. 
 
-# Host-specific overrides for locations 
 if $(OS) = MACOSX 
 {
-ARDUINO_VERSION	= 22 ;
+	AVR_BIN 	?= /usr/local/avrtools/bin ;
-OLD_DIR 	= /opt/arduino-0021 ;
+	AVR_ETC 	= /usr/local/avrtools/etc ;
-AVR_TOOLS_PATH 	= $(OLD_DIR)/hardware/tools/avr/bin ;
+	AVR_INCLUDE	= /usr/local/avrtools/include ; 
-AVRDUDECONFIG_PATH = $(OLD_DIR)/hardware/tools/avr/etc ;
+}
-ARDUINO_DIR 	= /opt/Arduino ;
+else
-ARDUINO_AVR 	= /usr/lib/avr/include ;
+{
+	AVR_BIN 	?= /usr/bin ;
+	AVR_INCLUDE 	= /usr/lib/avr/include ;
+	AVR_ETC 	= /etc ; 
 }
 
-# Where is everything?
+# (5) Directories where Arduino core and libraries are located
-ARDUINO_VERSION	?= 22 ;
+
-AVR_TOOLS_PATH 	?= /usr/bin ;
+ARDUINO_DIR 	?= /opt/Arduino ;
-ARDUINO_DIR 	?= /opt/arduino-00$(ARDUINO_VERSION) ;
+ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/$(CORE) $(ARDUINO_DIR)/hardware/arduino/variants/$(VARIANT) ;
-ARDUINO_AVR 	?= $(ARDUINO_DIR)/hardware/tools/avr/avr/include/avr ;
-AVRDUDECONFIG_PATH ?= $(ARDUINO_DIR)/hardware/tools ;
-ARDUINO_CORE 	= $(ARDUINO_DIR)/hardware/arduino/cores/arduino ;
 ARDUINO_LIB 	= $(ARDUINO_DIR)/libraries ;
 SKETCH_LIB      = $(HOME)/Source/Arduino/libraries ;
-AVR_CC  	= $(AVR_TOOLS_PATH)/avr-gcc ;
-AVR_CXX  	= $(AVR_TOOLS_PATH)/avr-g++ ;
-AVR_LD  	= $(AVR_TOOLS_PATH)/avr-gcc ;
-AVR_OBJCOPY 	= $(AVR_TOOLS_PATH)/avr-objcopy ;
-AVRDUDE 	= $(AVR_TOOLS_PATH)/avrdude ;
 
-DEFINES  	= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H ;
+#
-CTUNING  	= -ffunction-sections -fdata-sections ;
+# --------------------------------------------------
-CXXTUNING  	= -fno-exceptions -fno-strict-aliasing ; 
+# Below this line usually never needs to be modified 
-CFLAGS  	= -Os -Wall -Wextra -mmcu=$(MCU) $(CTUNING) ;
+#
-CXXFLAGS  	= $(CFLAGS) $(CXXTUNING) ;
+
-LDFLAGS  	= -Os -lm -Wl,--gc-sections -mmcu=atmega328p ;
+# Tool locations
+
+CC	  	= $(AVR_BIN)/avr-gcc ;
+C++	 	= $(AVR_BIN)/avr-g++ ;
+LINK	  	= $(AVR_BIN)/avr-gcc ;
+AR		= $(AVR_BIN)/avr-ar rcs ;
+RANLIB		= ;
+OBJCOPY 	= $(AVR_BIN)/avr-objcopy ;
+AVRDUDE 	?= $(AVR_BIN)/avrdude ;
+
+# Flags
+
+DEFINES  	+= F_CPU=$(F_CPU)L ARDUINO=$(ARDUINO_VERSION) VERSION_H ;
+OPTIM		= -Os ;
+CCFLAGS  	= -Wall -Wextra -Wno-strict-aliasing -mmcu=$(MCU) -ffunction-sections -fdata-sections ;
+C++FLAGS  	= $(CCFLAGS) -fno-exceptions -fno-strict-aliasing ;
+LINKFLAGS  	= $(OPTIM) -lm -Wl,--gc-sections -mmcu=$(MCU) ;
+AVRDUDEFLAGS	= -V -F -D -C $(AVR_ETC)/avrdude.conf -p $(MCU) -c $(UPLOAD_PROTOCOL) -b $(UPLOAD_SPEED) ;
 
 # Search everywhere for headers
-HDRS  	 	= $(PROJECT_DIR) $(ARDUINO_AVR) $(ARDUINO_CORE) [ GLOB $(ARDUINO_LIB) $(SKETCH_LIB) : [^.]* ] ;
 
-# Grab everything from the core directory
+HDRS  	 	= $(PROJECT_DIRS) $(AVR_INCLUDE) $(ARDUINO_CORE) $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) ;
-CORE_MODULES  	= [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
 
-# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# Output locations
-# can specify specific modules to pick up in PROJECT_MODULES
-LIB_MODULES  	= [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp ] ;
 
-# In addition to explicitly-specified program modules, pick up anything from the current
+LOCATE_TARGET	= $(F_CPU) ;
-# dir.
+LOCATE_SOURCE	= $(F_CPU) ;
-PROJECT_MODULES += [ GLOB $(PROJECT_DIR) : *.c *.cpp *.pde ] ;
 
-# Shortcut for the out files
+#
-OUT             = $(OUT_DIR)/$(PROJECT_NAME) ;
+# Custom rules
-
+#
-# AvrDude setup
-AVRDUDE_FLAGS = -V -F -D -C $(AVRDUDECONFIG_PATH)/avrdude.conf -p $(MCU) -c $(AVRDUDE_PROTOCOL) -b $(UPLOAD_RATE) ;
 
 rule GitVersion
 {
@@ -79,128 +100,120 @@ actions GitVersion
 
 GitVersion version.h ;
 
-rule AvrCc
-{
-  Depends $(<) : $(>) ;
-  Depends $(<) : $(<:D) ;
-  Clean clean : $(<) ;
-
-  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
-  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
-}
-
-actions AvrCc
-{
-  $(AVR_CC) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CFLAGS) $(>) 
-}
-
-rule AvrC++
-{
-  Depends $(<) : $(>) ;
-  Depends $(<) : $(<:D) ;
-  Clean clean : $(<) ;
-
-  CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
-  CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
-}
-
-actions AvrC++
-{
-  $(AVR_CXX) -c -o $(<) $(CCHDRS) $(CCDEFS) $(CXXFLAGS) $(>) 
-}
-
 rule Pde
 {
 	Depends $(<) : $(>) ;
-  Depends $(<) : $(<:D) ;
+	MakeLocate $(<) : $(LOCATE_SOURCE) ;
 	Clean clean : $(<) ;
+}
 
+if ( $(ARDUINO_VERSION) < 100 )
+{
+	ARDUINO_H = WProgram.h ;
+}
+else
+{
+	ARDUINO_H = Arduino.h ;
 }
 
 actions Pde
 {
-  echo "#include <WProgram.h>" > $(<) 
+	echo "#include <$(ARDUINO_H)>" > $(<) 
 	echo "#line 1 \"$(>)\"" >> $(<)
 	cat $(>) >> $(<) 
 }
 
-rule AvrPde
+rule C++Pde
 {
-  local _CPP = $(OUT_DIR)/$(_I:B).cpp ;
+	local _CPP = $(>:B).cpp ;
 	Pde $(_CPP) : $(>) ;
-  AvrC++ $(<) : $(_CPP) ;
+	C++ $(<) : $(_CPP) ;
 }
 
-rule AvrObject
+rule UserObject
 {
 	switch $(>:S)
 	{
-    case .c :   AvrCc $(<) : $(>) ;
+		case .ino : C++Pde $(<) : $(>) ;
-    case .cpp : AvrC++ $(<) : $(>) ;
+		case .pde : C++Pde $(<) : $(>) ;
-    case .pde : AvrPde $(<) : $(>) ;
 	}
 }
 
-rule AvrObjects
+rule Objects
 {
-  for _I in $(<) 
+        local _i ;
+
+        for _i in [ FGristFiles $(<) ]
         {
-    AvrObject $(OUT_DIR)/$(_I:B).o : $(_I) ;
+		local _b = $(_i:B)$(SUFOBJ) ;
+		local _o = $(_b:G=$(SOURCE_GRIST:E)) ;
+                Object $(_o) : $(_i) ;
+                Depends obj : $(_o) ;
         }
 }
 
-rule AvrMainFromObjects
+rule Library
+{
+	LibraryFromObjects $(<) : $(>:B)$(SUFOBJ) ;
+	Objects $(>) ;
+}
+
+rule Main
+{
+        MainFromObjects $(<) : $(>:B)$(SUFOBJ) ;
+        Objects $(>) ;
+}
+
+rule Hex
 {
 	Depends $(<) : $(>) ;
-  Depends $(<) : $(<:D) ;
+	MakeLocate $(<) : $(LOCATE_TARGET) ;
-  MkDir $(<:D) ;
-  Depends all : $(<) ;
-  Clean clean : $(<) ;
-}
-
-actions AvrMainFromObjects
-{
-  $(AVR_LD) $(LDFLAGS) -o $(<) $(>) 
-}
-
-rule AvrMain
-{
-  AvrMainFromObjects $(<) : $(OUT_DIR)/$(>:B).o ;
-  AvrObjects $(>) ;
-}
-
-rule AvrHex
-{
-  Depends $(<) : $(>) ;
-  Depends $(<) : $(<:D) ;
 	Depends hex : $(<) ;
 	Clean clean : $(<) ;
 }
 
-actions AvrHex
+actions Hex
 {
-  $(AVR_OBJCOPY) -O ihex -R .eeprom $(>) $(<)
+	$(OBJCOPY) -O ihex -R .eeprom $(>) $(<)
 }
 
-rule AvrUpload
+rule Upload
 {
 	Depends $(1) : $(2) ;
 	Depends $(2) : $(3) ;
 	NotFile $(1) ;
 	Always $(1) ;
 	Always $(2) ;
-  AvrUploadAction $(2) : $(3) ;
+	UploadAction $(2) : $(3) ;
 }
 
-actions AvrUploadAction
+actions UploadAction
 {
-  $(AVRDUDE) $(AVRDUDE_FLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
+	$(AVRDUDE) $(AVRDUDEFLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
 }
 
-AvrMain $(OUT).elf : $(CORE_MODULES) $(LIB_MODULES) $(PROJECT_MODULES) ;
+rule Arduino
-AvrHex $(OUT).hex : $(OUT).elf ;
+{
+	LINKFLAGS on $(<) = $(LINKFLAGS) -Wl,-Map=$(LOCATE_TARGET)/$(<:B).map ;
+	Main $(<) : $(>) ;
+	LinkLibraries $(<) : core libs ;
+	Hex $(<:B).hex : $(<) ;
+	for _p in $(PORTS)
+	{
+		Upload $(_p) : $(PORT_$(_p)) : $(<:B).hex ;
+	}
+}
 
-AvrUpload p6 : /dev/tty.usbserial-A600eHIs : $(OUT).hex ;
+#
-AvrUpload p4 : /dev/tty.usbserial-A40081RP : $(OUT).hex ;
+# Targets
-AvrUpload p9 : /dev/tty.usbserial-A9007LmI : $(OUT).hex ;
+#
 
+# Grab everything from the core directory
+Library core : [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
+
+# Grab everything from libraries.  To avoid this "grab everything" behaviour, you
+# can specify specific modules to pick up in PROJECT_MODULES
+Library libs : [ GLOB $(ARDUINO_LIB)/$(PROJECT_LIBS) $(ARDUINO_LIB)/$(PROJECT_LIBS)/utility $(SKETCH_LIB)/$(PROJECT_LIBS) : *.cpp *.c ] ;
+
+# Main output executable
+Arduino $(PWD:B).elf : $(PROJECT_MODULES) [ GLOB $(PROJECT_DIRS) : *.c *.cpp *.pde *.ino ] ;

examples/pingpair_irq/pingpair_irq.pde

@@ -24,7 +24,7 @@
 
 // Set up nRF24L01 radio on SPI bus plus pins 9 & 10
 
-RF24 radio(9,10);
+RF24 radio(8,9);
 
 // sets the role of this unit in hardware.  Connect to GND to be the 'pong' receiver
 // Leave open to be the 'ping' transmitter