Commit Graph

413 Commits (2f55870edbebcbd52f51f72584342589656d63c1)

Author SHA1 Message Date
Bernhard Kubicek 900e0c9bf2 overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
Bernhard Kubicek 1740a83e11 correcting commit errors.
Bernhard Kubicek 2afb7bd4cf refactured temperature.cpp so that there are now abstract functions to access temperatures.
Erik van der Zalm 2e8e8878e5 Corrected temp variables.
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 ea86a5e10f moved the variables in the ISR, thats the most normal use case of static.
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 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 bf879ceaa9 Added thermistor tables
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes