You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Christian Thalhammer d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
13 years ago
..
Gen7 added arduino ide GEN7 support Files 13 years ago
Sanguino more fixing of the sanguino math round problem 13 years ago
COPYING first commit 14 years ago
Configuration.h Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 13 years ago
Configuration_adv.h removed unused HEATING_EARLY_FINISH_DEG_OFFSET 13 years ago
EEPROMwrite.h simplified the includes, makefile now works with arduino23 13 years ago
Makefile more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output 13 years ago
Marlin.h Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 13 years ago
Marlin.pde Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 13 years ago
MarlinSerial.cpp Teensylu support. 13 years ago
MarlinSerial.h Teensylu support. 13 years ago
Sd2Card.cpp made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
Sd2Card.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
Sd2PinMap.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
SdBaseFile.cpp Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 13 years ago
SdBaseFile.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
SdFatConfig.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
SdFatStructs.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
SdFatUtil.cpp Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 13 years ago
SdFatUtil.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
SdFile.cpp made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
SdFile.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
SdInfo.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
SdVolume.cpp made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
SdVolume.h made sd code only compile with SDSUPPORT defined. safes 10k of codespace 13 years ago
cardreader.cpp merged with triffid fork 13 years ago
cardreader.h fix autostart failure if in wrong directory 13 years ago
createTemperatureLookup.py first commit 14 years ago
fastio.h Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 13 years ago
motion_control.cpp Changed check i mtion_conrol 13 years ago
motion_control.h Removed interrupt nesting in the stepper ISR. 13 years ago
pins.h Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 13 years ago
planner.cpp Corrected e-length calculation in planner 13 years ago
planner.h simplified the includes, makefile now works with arduino23 13 years ago
speed_lookuptable.h merged with triffid fork 13 years ago
stepper.cpp Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 13 years ago
stepper.h merging 13 years ago
temperature.cpp Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 13 years ago
temperature.h header file simplification 13 years ago
thermistortables.h simplified the includes, makefile now works with arduino23 13 years ago
ultralcd.h lcd menue "move_axis" added 13 years ago
ultralcd.pde Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 13 years ago
watchdog.h header file simplification 13 years ago
watchdog.pde simplified the includes, makefile now works with arduino23 13 years ago
wiring.h add wiring.h, that can be used to overwrite: 13 years ago