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 |
|
|
Bernhard Kubicek
|
7919a40d06
|
watchdog,percent done,
|
2011-11-15 20:54:40 +01:00 |
|
|
Bernhard Kubicek
|
ab154d5592
|
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
|
2011-11-09 20:27:44 +01:00 |
|
|
Bernhard Kubicek
|
01df04e02c
|
first compile with the cardreader class
|
2011-11-06 21:39:53 +01:00 |
|
|
Bernhard Kubicek
|
1d171e9e52
|
reformating and some minor bugs/things found on the way.
|
2011-11-06 19:23:08 +01:00 |
|
|
Bernhard Kubicek
|
40e8081623
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
2011-11-05 14:19:57 +01:00 |
|
|
Bernhard Kubicek
|
00674af3a8
|
merge from the branch bkubicek/Marlin/zalmmerge
|
2011-11-05 14:13:20 +01:00 |
|
Erik van der Zalm
|
094afe7c10
|
Merged Marlin, Marlin non gen6 and Ultimaker changes
|
2011-11-04 18:02:56 +01:00 |
|