1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 05:48:43 +00:00
MarlinFirmware/Marlin
Bernhard Kubicek a9c7da06e3 and changed ultipanel to have the mm/sec and not mm/min
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.h
2011-11-15 22:50:43 +01:00
..
cardreader.h watchdog,percent done, 2011-11-15 20:54:40 +01:00
cardreader.pde project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram. 2011-11-09 20:27:44 +01:00
Configuration.h and changed ultipanel to have the mm/sec and not mm/min 2011-11-15 22:50:43 +01:00
COPYING first commit 2011-08-12 22:28:35 +02:00
createTemperatureLookup.py first commit 2011-08-12 22:28:35 +02:00
EEPROMwrite.h minor changes and first not-well working version of autotemp 2011-11-09 22:09:16 +01:00
fastio.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
FatStructs.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
Makefile overworked the serial responses. Quite difficult, since many texts are Pronterface protocol. 2011-11-06 17:33:09 +01:00
Marlin.h watchdog,percent done, 2011-11-15 20:54:40 +01:00
Marlin.pde and changed ultipanel to have the mm/sec and not mm/min 2011-11-15 22:50:43 +01:00
motion_control.cpp Fixed some arc bugs 2011-11-06 19:37:12 +01:00
motion_control.h First arcs version. (Arcs not working ok) 2011-11-06 12:39:00 +01:00
pins.h made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support. 2011-11-07 22:33:13 +01:00
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 changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
Sd2Card.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
Sd2PinMap.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdFat.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdFatmainpage.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdFatUtil.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdFile.cpp changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdInfo.h changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
SdVolume.cpp changed end of line to windows, which seems to be the majority of developers main platform. 2011-11-05 14:19:57 +01:00
speed_lookuptable.h reformating and some minor bugs/things found on the way. 2011-11-06 19:23:08 +01:00
stepper.cpp and changed ultipanel to have the mm/sec and not mm/min 2011-11-15 22:50:43 +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 reformating and some minor bugs/things found on the way. 2011-11-06 19:23:08 +01:00
watchdog.pde watchdog,percent done, 2011-11-15 20:54:40 +01:00