bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Added libraries from Arduino 1.0.3 for sanguino build

Browse Source
This commit is contained in:
Yuri Valentini
2013-01-07 17:26:50 +01:00
parent dad7691df9
commit 7d20ec706e
63 changed files with 12042 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/Makefile
View File

@ -171,15 +171,15 @@ F_CPU ?= 16000000
# that derives from that, and their source are present in
# the main Marlin source directory
ifeq ($(HARDWARE_VARIANT), arduino)
HARDWARE_SRC = $(ARDUINO_INSTALL_DIR)/hardware/arduino/cores/arduino
HARDWARE_DIR = $(ARDUINO_INSTALL_DIR)/hardware
else
ifeq ($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
HARDWARE_SRC = ../ArduinoAddons/Arduino_1.x.x/$(HARDWARE_VARIANT)/cores/arduino
HARDWARE_DIR = ../ArduinoAddons/Arduino_1.x.x
else
HARDWARE_SRC = ../ArduinoAddons/Arduino_0.xx/$(HARDWARE_VARIANT)/cores/arduino
HARDWARE_DIR = ../ArduinoAddons/Arduino_0.xx
endif
endif
HARDWARE_SRC = $(HARDWARE_DIR)/$(HARDWARE_VARIANT)/cores/arduino
TARGET = $(notdir $(CURDIR))
@ -190,11 +190,14 @@ TARGET = $(notdir $(CURDIR))
VPATH = .
VPATH += $(BUILD_DIR)
VPATH += $(HARDWARE_SRC)
VPATH += ../ArduinoAddons/Arduino_0.xx/libraries/LiquidCrystal
VPATH += ../ArduinoAddons/Arduino_0.xx/libraries/SPI
VPATH += $(HARDWARE_DIR)/libraries/LiquidCrystal
VPATH += $(HARDWARE_DIR)/libraries/SPI
ifeq ($(HARDWARE_VARIANT), arduino)
HARDWARE_SUB_VARIANT ?= mega
VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/variants/$(HARDWARE_SUB_VARIANT)
else
HARDWARE_SUB_VARIANT ?= standard
VPATH += $(HARDWARE_DIR)/$(HARDWARE_VARIANT)/variants/$(HARDWARE_SUB_VARIANT)
endif
SRC = wiring.c \
wiring_analog.c wiring_digital.c \

2
Marlin/Marlin.h
View File

@ -26,7 +26,7 @@
#define HardwareSerial_h // trick to disable the standard HWserial
#endif
#if (ARDUINO >= 100) && !defined(__AVR_ATmega644P__)
#if (ARDUINO >= 100)
# include "Arduino.h"
#else
# include "WProgram.h"