diff options
-rw-r--r-- | firmwares/Standard_Firmata/Makefile | 20 | ||||
-rwxr-xr-x | targets/arduino/HardwareSerial.cpp (renamed from core/arduino/HardwareSerial.cpp) | 0 | ||||
-rwxr-xr-x | targets/arduino/HardwareSerial.h (renamed from core/arduino/HardwareSerial.h) | 0 | ||||
-rwxr-xr-x | targets/arduino/Makefile (renamed from core/arduino/Makefile) | 0 | ||||
-rw-r--r-- | targets/arduino/WConstants.h (renamed from core/arduino/WConstants.h) | 0 | ||||
-rwxr-xr-x | targets/arduino/WInterrupts.c (renamed from core/arduino/WInterrupts.c) | 0 | ||||
-rwxr-xr-x | targets/arduino/WProgram.h (renamed from core/arduino/WProgram.h) | 0 | ||||
-rw-r--r-- | targets/arduino/WRandom.cpp (renamed from core/arduino/WRandom.cpp) | 0 | ||||
-rw-r--r-- | targets/arduino/binary.h (renamed from core/arduino/binary.h) | 0 | ||||
-rwxr-xr-x | targets/arduino/main.cxx (renamed from core/arduino/main.cxx) | 0 | ||||
-rwxr-xr-x | targets/arduino/pins_arduino.c (renamed from core/arduino/pins_arduino.c) | 0 | ||||
-rw-r--r-- | targets/arduino/pins_arduino.h (renamed from core/arduino/pins_arduino.h) | 0 | ||||
-rwxr-xr-x | targets/arduino/wiring.c (renamed from core/arduino/wiring.c) | 0 | ||||
-rwxr-xr-x | targets/arduino/wiring.h (renamed from core/arduino/wiring.h) | 0 | ||||
-rwxr-xr-x | targets/arduino/wiring_analog.c (renamed from core/arduino/wiring_analog.c) | 0 | ||||
-rwxr-xr-x | targets/arduino/wiring_digital.c (renamed from core/arduino/wiring_digital.c) | 0 | ||||
-rwxr-xr-x | targets/arduino/wiring_private.h (renamed from core/arduino/wiring_private.h) | 0 | ||||
-rwxr-xr-x | targets/arduino/wiring_pulse.c (renamed from core/arduino/wiring_pulse.c) | 0 | ||||
-rwxr-xr-x | targets/arduino/wiring_serial.c (renamed from core/arduino/wiring_serial.c) | 0 | ||||
-rwxr-xr-x | targets/arduino/wiring_shift.c (renamed from core/arduino/wiring_shift.c) | 0 | ||||
-rwxr-xr-x | targets/atmega8/pins_atmega8.c (renamed from core/atmega8/pins_atmega8.c) | 0 | ||||
-rwxr-xr-x | targets/blank/WProgram.h (renamed from core/blank/WProgram.h) | 0 | ||||
-rw-r--r-- | targets/blank/main.cxx (renamed from core/blank/main.cxx) | 0 | ||||
-rw-r--r-- | targets/wiring/Binary.h (renamed from core/wiring/Binary.h) | 0 | ||||
-rw-r--r-- | targets/wiring/Encoder.h (renamed from core/wiring/Encoder.h) | 0 | ||||
-rw-r--r-- | targets/wiring/Encoder.o (renamed from core/wiring/Encoder.o) | bin | 9276 -> 9276 bytes | |||
-rwxr-xr-x | targets/wiring/HardwareSerial.h (renamed from core/wiring/HardwareSerial.h) | 0 | ||||
-rw-r--r-- | targets/wiring/HardwareSerial.o (renamed from core/wiring/HardwareSerial.o) | bin | 12184 -> 12184 bytes | |||
-rw-r--r-- | targets/wiring/LiquidCrystal.h (renamed from core/wiring/LiquidCrystal.h) | 0 | ||||
-rw-r--r-- | targets/wiring/LiquidCrystal.o (renamed from core/wiring/LiquidCrystal.o) | bin | 16856 -> 16856 bytes | |||
-rwxr-xr-x | targets/wiring/Matrix.h (renamed from core/wiring/Matrix.h) | 0 | ||||
-rw-r--r-- | targets/wiring/Matrix.o (renamed from core/wiring/Matrix.o) | bin | 11328 -> 11328 bytes | |||
-rwxr-xr-x | targets/wiring/QSlide.h (renamed from core/wiring/QSlide.h) | 0 | ||||
-rw-r--r-- | targets/wiring/QSlide.o (renamed from core/wiring/QSlide.o) | bin | 9784 -> 9784 bytes | |||
-rwxr-xr-x | targets/wiring/Servo.h (renamed from core/wiring/Servo.h) | 0 | ||||
-rw-r--r-- | targets/wiring/Servo.o (renamed from core/wiring/Servo.o) | bin | 10056 -> 10056 bytes | |||
-rw-r--r-- | targets/wiring/Sprite.h (renamed from core/wiring/Sprite.h) | 0 | ||||
-rw-r--r-- | targets/wiring/Sprite.o (renamed from core/wiring/Sprite.o) | bin | 8204 -> 8204 bytes | |||
-rwxr-xr-x | targets/wiring/TwoWire.h (renamed from core/wiring/TwoWire.h) | 0 | ||||
-rw-r--r-- | targets/wiring/TwoWire.o (renamed from core/wiring/TwoWire.o) | bin | 14180 -> 14180 bytes | |||
-rw-r--r-- | targets/wiring/WApplet.o (renamed from core/wiring/WApplet.o) | bin | 9968 -> 9968 bytes | |||
-rwxr-xr-x | targets/wiring/WConstants.h (renamed from core/wiring/WConstants.h) | 0 | ||||
-rw-r--r-- | targets/wiring/WInterrupts.o (renamed from core/wiring/WInterrupts.o) | bin | 7528 -> 7528 bytes | |||
-rwxr-xr-x | targets/wiring/WProgram.h (renamed from core/wiring/WProgram.h) | 0 | ||||
-rw-r--r-- | targets/wiring/WRandom.o (renamed from core/wiring/WRandom.o) | bin | 3764 -> 3764 bytes | |||
-rw-r--r-- | targets/wiring/WTimer.o (renamed from core/wiring/WTimer.o) | bin | 20568 -> 20568 bytes | |||
-rwxr-xr-x | targets/wiring/buffer.h (renamed from core/wiring/buffer.h) | 0 | ||||
-rw-r--r-- | targets/wiring/buffer.o (renamed from core/wiring/buffer.o) | bin | 5316 -> 5316 bytes | |||
-rwxr-xr-x | targets/wiring/twi.h (renamed from core/wiring/twi.h) | 0 | ||||
-rw-r--r-- | targets/wiring/twi.o (renamed from core/wiring/twi.o) | bin | 9988 -> 9988 bytes | |||
-rwxr-xr-x | targets/wiring/uart.h (renamed from core/wiring/uart.h) | 0 | ||||
-rw-r--r-- | targets/wiring/uart.o (renamed from core/wiring/uart.o) | bin | 8792 -> 8792 bytes |
52 files changed, 10 insertions, 10 deletions
diff --git a/firmwares/Standard_Firmata/Makefile b/firmwares/Standard_Firmata/Makefile index 8ad2d2c..6edbf97 100644 --- a/firmwares/Standard_Firmata/Makefile +++ b/firmwares/Standard_Firmata/Makefile @@ -48,12 +48,12 @@ PORT = /dev/tty.usbserial-* TARGET = Pd_firmware ARDUINO = /Applications/arduino-0007 -ARDUINO_SRC = $(ARDUINO)/lib/targets/arduino -ARDUINO_LIB_SRC = $(ARDUINO)/lib/targets/libraries -INCLUDE = -I$(ARDUINO_SRC) -I$(ARDUINO)/tools/avr/avr/include \ - -I$(ARDUINO)/lib/targets/libraries/EEPROM \ - -I$(ARDUINO)/lib/targets/libraries/Firmata \ - -I$(ARDUINO)/lib/targets/libraries +ARDUINO_SRC = $(ARDUINO)/hardware/targets/arduino +ARDUINO_LIB_SRC = $(ARDUINO)/hardware/libraries +INCLUDE = -I$(ARDUINO_SRC) -I$(ARDUINO)/hardware/tools/avr/avr/include \ + -I$(ARDUINO_LIB_SRC)/EEPROM \ + -I$(ARDUINO_LIB_SRC)/Firmata \ + -I$(ARDUINO_LIB_SRC) SRC = $(ARDUINO_SRC)/pins_arduino.c $(ARDUINO_SRC)/wiring.c \ $(ARDUINO_SRC)/WInterrupts.c CXXSRC = applet/$(TARGET).cpp $(ARDUINO_SRC)/HardwareSerial.cpp \ @@ -242,10 +242,10 @@ etags: etags *.pde \ $(ARDUINO_SRC)/*.[ch] \ $(ARDUINO_SRC)/*.cpp \ - $(ARDUINO)/lib/targets/libraries/*/*.[ch] \ - $(ARDUINO)/lib/targets/libraries/*/*.cpp \ - $(ARDUINO)/tools/avr/avr/include/avr/*.[ch] \ - $(ARDUINO)/tools/avr/avr/include/*.[ch] + $(ARDUINO_LIB_SRC)/*/*.[ch] \ + $(ARDUINO_LIB_SRC)/*/*.cpp \ + $(ARDUINO)/hardware/tools/avr/avr/include/avr/*.[ch] \ + $(ARDUINO)/hardware/tools/avr/avr/include/*.[ch] etags_Darwin: # etags -a diff --git a/core/arduino/HardwareSerial.cpp b/targets/arduino/HardwareSerial.cpp index f78eb2d..f78eb2d 100755 --- a/core/arduino/HardwareSerial.cpp +++ b/targets/arduino/HardwareSerial.cpp diff --git a/core/arduino/HardwareSerial.h b/targets/arduino/HardwareSerial.h index 4f0cb54..4f0cb54 100755 --- a/core/arduino/HardwareSerial.h +++ b/targets/arduino/HardwareSerial.h diff --git a/core/arduino/Makefile b/targets/arduino/Makefile index 9290fcc..9290fcc 100755 --- a/core/arduino/Makefile +++ b/targets/arduino/Makefile diff --git a/core/arduino/WConstants.h b/targets/arduino/WConstants.h index 3e19ac4..3e19ac4 100644 --- a/core/arduino/WConstants.h +++ b/targets/arduino/WConstants.h diff --git a/core/arduino/WInterrupts.c b/targets/arduino/WInterrupts.c index 38992ee..38992ee 100755 --- a/core/arduino/WInterrupts.c +++ b/targets/arduino/WInterrupts.c diff --git a/core/arduino/WProgram.h b/targets/arduino/WProgram.h index d6d5ccc..d6d5ccc 100755 --- a/core/arduino/WProgram.h +++ b/targets/arduino/WProgram.h diff --git a/core/arduino/WRandom.cpp b/targets/arduino/WRandom.cpp index c45c306..c45c306 100644 --- a/core/arduino/WRandom.cpp +++ b/targets/arduino/WRandom.cpp diff --git a/core/arduino/binary.h b/targets/arduino/binary.h index af14980..af14980 100644 --- a/core/arduino/binary.h +++ b/targets/arduino/binary.h diff --git a/core/arduino/main.cxx b/targets/arduino/main.cxx index 52351e4..52351e4 100755 --- a/core/arduino/main.cxx +++ b/targets/arduino/main.cxx diff --git a/core/arduino/pins_arduino.c b/targets/arduino/pins_arduino.c index 3ef07b6..3ef07b6 100755 --- a/core/arduino/pins_arduino.c +++ b/targets/arduino/pins_arduino.c diff --git a/core/arduino/pins_arduino.h b/targets/arduino/pins_arduino.h index e0b7add..e0b7add 100644 --- a/core/arduino/pins_arduino.h +++ b/targets/arduino/pins_arduino.h diff --git a/core/arduino/wiring.c b/targets/arduino/wiring.c index 5dda822..5dda822 100755 --- a/core/arduino/wiring.c +++ b/targets/arduino/wiring.c diff --git a/core/arduino/wiring.h b/targets/arduino/wiring.h index 3c77389..3c77389 100755 --- a/core/arduino/wiring.h +++ b/targets/arduino/wiring.h diff --git a/core/arduino/wiring_analog.c b/targets/arduino/wiring_analog.c index 0ab32eb..0ab32eb 100755 --- a/core/arduino/wiring_analog.c +++ b/targets/arduino/wiring_analog.c diff --git a/core/arduino/wiring_digital.c b/targets/arduino/wiring_digital.c index f38b2e1..f38b2e1 100755 --- a/core/arduino/wiring_digital.c +++ b/targets/arduino/wiring_digital.c diff --git a/core/arduino/wiring_private.h b/targets/arduino/wiring_private.h index affccd8..affccd8 100755 --- a/core/arduino/wiring_private.h +++ b/targets/arduino/wiring_private.h diff --git a/core/arduino/wiring_pulse.c b/targets/arduino/wiring_pulse.c index 642a5a2..642a5a2 100755 --- a/core/arduino/wiring_pulse.c +++ b/targets/arduino/wiring_pulse.c diff --git a/core/arduino/wiring_serial.c b/targets/arduino/wiring_serial.c index 9392a09..9392a09 100755 --- a/core/arduino/wiring_serial.c +++ b/targets/arduino/wiring_serial.c diff --git a/core/arduino/wiring_shift.c b/targets/arduino/wiring_shift.c index 956f864..956f864 100755 --- a/core/arduino/wiring_shift.c +++ b/targets/arduino/wiring_shift.c diff --git a/core/atmega8/pins_atmega8.c b/targets/atmega8/pins_atmega8.c index ed1b2bd..ed1b2bd 100755 --- a/core/atmega8/pins_atmega8.c +++ b/targets/atmega8/pins_atmega8.c diff --git a/core/blank/WProgram.h b/targets/blank/WProgram.h index e69de29..e69de29 100755 --- a/core/blank/WProgram.h +++ b/targets/blank/WProgram.h diff --git a/core/blank/main.cxx b/targets/blank/main.cxx index e69de29..e69de29 100644 --- a/core/blank/main.cxx +++ b/targets/blank/main.cxx diff --git a/core/wiring/Binary.h b/targets/wiring/Binary.h index d5692e6..d5692e6 100644 --- a/core/wiring/Binary.h +++ b/targets/wiring/Binary.h diff --git a/core/wiring/Encoder.h b/targets/wiring/Encoder.h index c4a36cf..c4a36cf 100644 --- a/core/wiring/Encoder.h +++ b/targets/wiring/Encoder.h diff --git a/core/wiring/Encoder.o b/targets/wiring/Encoder.o Binary files differindex 6f92e7f..6f92e7f 100644 --- a/core/wiring/Encoder.o +++ b/targets/wiring/Encoder.o diff --git a/core/wiring/HardwareSerial.h b/targets/wiring/HardwareSerial.h index e9b4ad9..e9b4ad9 100755 --- a/core/wiring/HardwareSerial.h +++ b/targets/wiring/HardwareSerial.h diff --git a/core/wiring/HardwareSerial.o b/targets/wiring/HardwareSerial.o Binary files differindex bd104e5..bd104e5 100644 --- a/core/wiring/HardwareSerial.o +++ b/targets/wiring/HardwareSerial.o diff --git a/core/wiring/LiquidCrystal.h b/targets/wiring/LiquidCrystal.h index 0bed637..0bed637 100644 --- a/core/wiring/LiquidCrystal.h +++ b/targets/wiring/LiquidCrystal.h diff --git a/core/wiring/LiquidCrystal.o b/targets/wiring/LiquidCrystal.o Binary files differindex 327a083..327a083 100644 --- a/core/wiring/LiquidCrystal.o +++ b/targets/wiring/LiquidCrystal.o diff --git a/core/wiring/Matrix.h b/targets/wiring/Matrix.h index 6c2ac00..6c2ac00 100755 --- a/core/wiring/Matrix.h +++ b/targets/wiring/Matrix.h diff --git a/core/wiring/Matrix.o b/targets/wiring/Matrix.o Binary files differindex 8edf922..8edf922 100644 --- a/core/wiring/Matrix.o +++ b/targets/wiring/Matrix.o diff --git a/core/wiring/QSlide.h b/targets/wiring/QSlide.h index 9db4d29..9db4d29 100755 --- a/core/wiring/QSlide.h +++ b/targets/wiring/QSlide.h diff --git a/core/wiring/QSlide.o b/targets/wiring/QSlide.o Binary files differindex 16c6d7f..16c6d7f 100644 --- a/core/wiring/QSlide.o +++ b/targets/wiring/QSlide.o diff --git a/core/wiring/Servo.h b/targets/wiring/Servo.h index a49cf73..a49cf73 100755 --- a/core/wiring/Servo.h +++ b/targets/wiring/Servo.h diff --git a/core/wiring/Servo.o b/targets/wiring/Servo.o Binary files differindex 285f104..285f104 100644 --- a/core/wiring/Servo.o +++ b/targets/wiring/Servo.o diff --git a/core/wiring/Sprite.h b/targets/wiring/Sprite.h index 9c612dd..9c612dd 100644 --- a/core/wiring/Sprite.h +++ b/targets/wiring/Sprite.h diff --git a/core/wiring/Sprite.o b/targets/wiring/Sprite.o Binary files differindex e52bd93..e52bd93 100644 --- a/core/wiring/Sprite.o +++ b/targets/wiring/Sprite.o diff --git a/core/wiring/TwoWire.h b/targets/wiring/TwoWire.h index 9c91b9b..9c91b9b 100755 --- a/core/wiring/TwoWire.h +++ b/targets/wiring/TwoWire.h diff --git a/core/wiring/TwoWire.o b/targets/wiring/TwoWire.o Binary files differindex 16b4c23..16b4c23 100644 --- a/core/wiring/TwoWire.o +++ b/targets/wiring/TwoWire.o diff --git a/core/wiring/WApplet.o b/targets/wiring/WApplet.o Binary files differindex e86c8e2..e86c8e2 100644 --- a/core/wiring/WApplet.o +++ b/targets/wiring/WApplet.o diff --git a/core/wiring/WConstants.h b/targets/wiring/WConstants.h index e572378..e572378 100755 --- a/core/wiring/WConstants.h +++ b/targets/wiring/WConstants.h diff --git a/core/wiring/WInterrupts.o b/targets/wiring/WInterrupts.o Binary files differindex 4ca56aa..4ca56aa 100644 --- a/core/wiring/WInterrupts.o +++ b/targets/wiring/WInterrupts.o diff --git a/core/wiring/WProgram.h b/targets/wiring/WProgram.h index 7837da5..7837da5 100755 --- a/core/wiring/WProgram.h +++ b/targets/wiring/WProgram.h diff --git a/core/wiring/WRandom.o b/targets/wiring/WRandom.o Binary files differindex 26e64de..26e64de 100644 --- a/core/wiring/WRandom.o +++ b/targets/wiring/WRandom.o diff --git a/core/wiring/WTimer.o b/targets/wiring/WTimer.o Binary files differindex d081ab3..d081ab3 100644 --- a/core/wiring/WTimer.o +++ b/targets/wiring/WTimer.o diff --git a/core/wiring/buffer.h b/targets/wiring/buffer.h index 3d89136..3d89136 100755 --- a/core/wiring/buffer.h +++ b/targets/wiring/buffer.h diff --git a/core/wiring/buffer.o b/targets/wiring/buffer.o Binary files differindex 0256711..0256711 100644 --- a/core/wiring/buffer.o +++ b/targets/wiring/buffer.o diff --git a/core/wiring/twi.h b/targets/wiring/twi.h index 7ccbf5c..7ccbf5c 100755 --- a/core/wiring/twi.h +++ b/targets/wiring/twi.h diff --git a/core/wiring/twi.o b/targets/wiring/twi.o Binary files differindex 0e538db..0e538db 100644 --- a/core/wiring/twi.o +++ b/targets/wiring/twi.o diff --git a/core/wiring/uart.h b/targets/wiring/uart.h index f00af61..f00af61 100755 --- a/core/wiring/uart.h +++ b/targets/wiring/uart.h diff --git a/core/wiring/uart.o b/targets/wiring/uart.o Binary files differindex 85a64ac..85a64ac 100644 --- a/core/wiring/uart.o +++ b/targets/wiring/uart.o |