Commit Graph

114 Commits (2327764980428143636be65340a250667fda4bcf)

Author SHA1 Message Date
Bernhard 7714b98da7 solved some compiler warnings that are now visible in arduino 1.0.
Found a couple of unused variables, that I commented.
Tried to solve the program memory warning message, and failed.
Bernhard 26a1de1e44 force inline
Bernhard Kubicek 924bab1a03 less lcd flickering
Bernhard Kubicek 379ea642e1 make tuneing sub-menu.
Bernhard Kubicek b21d5193f2 made ultralcd compatible with folders.
Bernhard Kubicek cd2268f10a code cleanup in ultralcd.
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
Bernhard Kubicek 7919a40d06 watchdog,percent done,
Bernhard Kubicek ab154d5592 project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
Bernhard Kubicek 01df04e02c first compile with the cardreader class
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way.
Bernhard Kubicek 40e8081623 changed end of line to windows, which seems to be the majority of developers main platform.
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes