60 Commits (406127921843345ef0d6d434cab1bfb13b056935)

Author SHA1 Message Date
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way.
13 years ago
Bernhard Kubicek 1740a83e11 correcting commit errors.
13 years ago
Bernhard Kubicek 2afb7bd4cf refactured temperature.cpp so that there are now abstract functions to access temperatures.
13 years ago
Erik van der Zalm 2e8e8878e5 Corrected temp variables.
13 years ago
Erik van der Zalm 04d3b5537f Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
Erik van der Zalm d15f01e1b4 Temperature changes
13 years ago
Bernhard Kubicek b9ea0651ec Revert "this is not working. Do you maybe know why?"
13 years ago
Bernhard Kubicek 8bcdb9f5f0 this is not working. Do you maybe know why?
13 years ago
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge
13 years ago
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes
13 years ago