Commit Graph

116 Commits (34e51f576f5c4edfb6c0e56a73a9b739b40ad351)

Author SHA1 Message Date
Bernhard Kubicek 36958ee305 minor changes and first not-well working version of autotemp
Bernhard Kubicek ba8a53a40f Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
Bernhard Kubicek ab154d5592 project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
Bernhard Kubicek 7b70caab7c made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way.
Bernhard Kubicek 900e0c9bf2 overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
Bernhard Kubicek 1740a83e11 correcting commit errors.
Bernhard Kubicek e8092898b1 watchdog into dedicated file
Erik van der Zalm 04d3b5537f Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/EEPROMwrite.h
	Marlin/Marlin.h
	Marlin/Marlin.pde
	Marlin/temperature.cpp
	Marlin/temperature.h
	Marlin/thermistortables.h
Erik van der Zalm d15f01e1b4 Temperature changes
Bernhard Kubicek b9ea0651ec Revert "this is not working. Do you maybe know why?"
This reverts commit 8bcdb9f5f0.
Bernhard Kubicek 8bcdb9f5f0 this is not working. Do you maybe know why?
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes
Erik van der Zalm 8e017b81ab Sync with non-gen6 version
Erik van der Zalm 750f6c33e3 first commit