Erik van der Zalm e63e224a33 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 ...

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde

2011-11-18 19:04:09 +01:00

..

Sanguino

Added modified Sanguino files

2011-11-14 18:27:47 +01:00

cardreader.h

watchdog,percent done,

2011-11-15 20:54:40 +01:00

cardreader.pde

…

Configuration.h

Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

2011-11-18 19:04:09 +01:00

COPYING

…

createTemperatureLookup.py

…

EEPROMwrite.h

…

fastio.h

…

FatStructs.h

…

Makefile

…

Marlin.h

watchdog,percent done,

2011-11-15 20:54:40 +01:00

Marlin.pde

Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

2011-11-18 19:04:09 +01:00

motion_control.cpp

…

motion_control.h

…

pins.h

…

planner.cpp

and changed ultipanel to have the mm/sec and not mm/min

2011-11-15 22:50:43 +01:00

planner.h

and changed ultipanel to have the mm/sec and not mm/min

2011-11-15 22:50:43 +01:00

Sd2Card.cpp

…

Sd2Card.h

…

Sd2PinMap.h

…

SdFat.h

…

SdFatmainpage.h

…

SdFatUtil.h

…

SdFile.cpp

…

SdInfo.h

…

SdVolume.cpp

…

speed_lookuptable.h

…

stepper.cpp

Advance experiments. Not working yet.

2011-11-18 18:59:17 +01:00

stepper.h

added a m400, that finished all moves,

2011-11-13 19:58:09 +01:00

temperature.cpp

and changed ultipanel to have the mm/sec and not mm/min

2011-11-15 22:50:43 +01:00

temperature.h

fixed bug with adjusting ki in realtime.

2011-11-13 21:43:26 +01:00

thermistortables.h

and changed ultipanel to have the mm/sec and not mm/min

2011-11-15 22:50:43 +01:00

ultralcd.h

and changed ultipanel to have the mm/sec and not mm/min

2011-11-15 22:50:43 +01:00

ultralcd.pde

and changed ultipanel to have the mm/sec and not mm/min

2011-11-15 22:50:43 +01:00

watchdog.h

…

watchdog.pde

Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

2011-11-18 19:04:09 +01:00