interfisch
/
rf24-pio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove prog_char, for compliance with gcc 4.6.1

This commit is contained in:
maniacbug 2012-01-17 22:05:11 -08:00
parent 205d4b5cc1
commit f6e59b9de8
5 changed files with 160 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RF24.cpp
View File

@ -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; char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab); 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; char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab); printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);

4
RF24.h
View File

@ -194,7 +194,7 @@ protected:
* @param reg Which register. Use constants from nRF24L01.h * @param reg Which register. Use constants from nRF24L01.h
* @param qty How many successive registers to print * @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 * 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 reg Which register. Use constants from nRF24L01.h
* @param qty How many successive registers to print * @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 * Turn on or off the special features of the chip

6
RF24_config.h
View File

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

289
examples/pingpair_irq/Jamfile
View File

@ -1,206 +1,219 @@
PROJECT_NAME = $(PWD:B) ; # (1) Project Information
PROJECT_DIR = . ;
PROJECT_LIBS = SPI RF24 ;
OUT_DIR = ojam ; PROJECT_LIBS = SPI RF24 ;
F_CPU = 16000000 ; PROJECT_DIRS = $(PWD) ;
MCU = atmega328p ;
PORTS = /dev/tty.usbserial-A600eHIs /dev/tty.usbserial-A40081RP /dev/tty.usbserial-A9007LmI ;
UPLOAD_RATE = 57600 ; # (2) Board Information
AVRDUDE_PROTOCOL = stk500v1 ;
COM = 33 ; UPLOAD_PROTOCOL ?= arduino ;
UPLOAD_SPEED ?= 115200 ;
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 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 ; ARDUINO_LIB = $(ARDUINO_DIR)/libraries ;
SKETCH_LIB = $(HOME)/Source/Arduino/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 # 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 rule GitVersion
{ {
Always $(<) ; Always $(<) ;
Depends all : $(<) ; Depends all : $(<) ;
} }
actions GitVersion actions GitVersion
{ {
echo "const char program_version[] = \"\\" > $(<) echo "const char program_version[] = \"\\" > $(<)
git log -1 --pretty=format:%h >> $(<) git log -1 --pretty=format:%h >> $(<)
echo "\";" >> $(<) echo "\";" >> $(<)
} }
GitVersion version.h ; 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 rule Pde
{ {
Depends $(<) : $(>) ; Depends $(<) : $(>) ;
Depends $(<) : $(<:D) ; MakeLocate $(<) : $(LOCATE_SOURCE) ;
Clean clean : $(<) ; Clean clean : $(<) ;
}
if ( $(ARDUINO_VERSION) < 100 )
{
ARDUINO_H = WProgram.h ;
}
else
{
ARDUINO_H = Arduino.h ;
} }
actions Pde actions Pde
{ {
echo "#include <WProgram.h>" > $(<) echo "#include <$(ARDUINO_H)>" > $(<)
echo "#line 1 \"$(>)\"" >> $(<) echo "#line 1 \"$(>)\"" >> $(<)
cat $(>) >> $(<) cat $(>) >> $(<)
} }
rule AvrPde rule C++Pde
{ {
local _CPP = $(OUT_DIR)/$(_I:B).cpp ; local _CPP = $(>:B).cpp ;
Pde $(_CPP) : $(>) ; Pde $(_CPP) : $(>) ;
AvrC++ $(<) : $(_CPP) ; C++ $(<) : $(_CPP) ;
} }
rule AvrObject rule UserObject
{ {
switch $(>:S) 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 ;
{
AvrObject $(OUT_DIR)/$(_I:B).o : $(_I) ; for _i in [ FGristFiles $(<) ]
} {
local _b = $(_i:B)$(SUFOBJ) ;
local _o = $(_b:G=$(SOURCE_GRIST:E)) ;
Object $(_o) : $(_i) ;
Depends obj : $(_o) ;
}
} }
rule AvrMainFromObjects rule Library
{ {
Depends $(<) : $(>) ; LibraryFromObjects $(<) : $(>:B)$(SUFOBJ) ;
Depends $(<) : $(<:D) ; Objects $(>) ;
MkDir $(<:D) ;
Depends all : $(<) ;
Clean clean : $(<) ;
} }
actions AvrMainFromObjects rule Main
{ {
$(AVR_LD) $(LDFLAGS) -o $(<) $(>) MainFromObjects $(<) : $(>:B)$(SUFOBJ) ;
Objects $(>) ;
} }
rule AvrMain rule Hex
{ {
AvrMainFromObjects $(<) : $(OUT_DIR)/$(>:B).o ; Depends $(<) : $(>) ;
AvrObjects $(>) ; MakeLocate $(<) : $(LOCATE_TARGET) ;
Depends hex : $(<) ;
Clean clean : $(<) ;
} }
rule AvrHex actions Hex
{ {
Depends $(<) : $(>) ; $(OBJCOPY) -O ihex -R .eeprom $(>) $(<)
Depends $(<) : $(<:D) ;
Depends hex : $(<) ;
Clean clean : $(<) ;
} }
actions AvrHex rule Upload
{ {
$(AVR_OBJCOPY) -O ihex -R .eeprom $(>) $(<) Depends $(1) : $(2) ;
Depends $(2) : $(3) ;
NotFile $(1) ;
Always $(1) ;
Always $(2) ;
UploadAction $(2) : $(3) ;
} }
rule AvrUpload actions UploadAction
{ {
Depends $(1) : $(2) ; $(AVRDUDE) $(AVRDUDEFLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i
Depends $(2) : $(3) ;
NotFile $(1) ;
Always $(1) ;
Always $(2) ;
AvrUploadAction $(2) : $(3) ;
} }
actions AvrUploadAction rule Arduino
{ {
$(AVRDUDE) $(AVRDUDE_FLAGS) -P $(<) $(AVRDUDE_WRITE_FLASH) -U flash:w:$(>):i 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 ;
}
} }
AvrMain $(OUT).elf : $(CORE_MODULES) $(LIB_MODULES) $(PROJECT_MODULES) ; #
AvrHex $(OUT).hex : $(OUT).elf ; # Targets
#
AvrUpload p6 : /dev/tty.usbserial-A600eHIs : $(OUT).hex ; # Grab everything from the core directory
AvrUpload p4 : /dev/tty.usbserial-A40081RP : $(OUT).hex ; Library core : [ GLOB $(ARDUINO_CORE) : *.c *.cpp ] ;
AvrUpload p9 : /dev/tty.usbserial-A9007LmI : $(OUT).hex ;
# 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 ] ;

2
examples/pingpair_irq/pingpair_irq.pde
View File

@ -24,7 +24,7 @@
// Set up nRF24L01 radio on SPI bus plus pins 9 & 10 // 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 // sets the role of this unit in hardware. Connect to GND to be the 'pong' receiver
// Leave open to be the 'ping' transmitter // Leave open to be the 'ping' transmitter