19242 Commits (f503722c4556631745f35b9ae86d6d3c0c112a77)
 

Author SHA1 Message Date
Erik van der Zalm e3af73ee0c Thermistor name problem 13 years ago
Bernhard Kubicek 0b43761c3a preprocessor magic to have a single source principle 13 years ago
Bernhard Kubicek 156763d027 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek fc0064e525 made cardreader more selfsustained 13 years ago
Erik van der Zalm d3bfffcb6e Corrected thermistor naming 13 years ago
Bernhard Kubicek 01df04e02c first compile with the cardreader class 13 years ago
Bernhard Kubicek 163efdf1c7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
Bernhard Kubicek 87aaf0f70a static'ified Marlin.pde. 13 years ago
Erik van der Zalm 5cf349a24a Fixed some arc bugs 13 years ago
Bernhard Kubicek 79d1bfb5c0 made many possible variables static, so they cannot be used extern. 13 years ago
Erik van der Zalm 76b3f805c0 Added teensylu pins 13 years ago
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way. 13 years ago
Bernhard Kubicek 900e0c9bf2 overworked the serial responses. Quite difficult, since many texts are Pronterface protocol. 13 years ago
Bernhard Kubicek 1740a83e11 correcting commit errors. 13 years ago
Bernhard Kubicek 7cc358b56b wrong file location 13 years ago
Bernhard Kubicek e8092898b1 watchdog into dedicated file 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 0b82465168 First arcs version. (Arcs not working ok) 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
Conflicts:
	Marlin/Configuration.h
	Marlin/EEPROMwrite.h
	Marlin/Marlin.h
	Marlin/Marlin.pde
	Marlin/temperature.cpp
	Marlin/temperature.h
	Marlin/thermistortables.h
13 years ago
Erik van der Zalm d15f01e1b4 Temperature changes 13 years ago
Bernhard Kubicek ea86a5e10f moved the variables in the ISR, thats the most normal use case of static. 13 years ago
Bernhard Kubicek b9ea0651ec Revert "this is not working. Do you maybe know why?"
This reverts commit 8bcdb9f5f0.
13 years ago
Bernhard Kubicek 8bcdb9f5f0 this is not working. Do you maybe know why? 13 years ago
Bernhard Kubicek 40e8081623 changed end of line to windows, which seems to be the majority of developers main platform. 13 years ago
Bernhard Kubicek 00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 13 years ago
Erik van der Zalm d7c4f0780b Added M42, M80 and M81 13 years ago
Erik van der Zalm 95d3d9847c M109 now equal to sprinter 13 years ago
Erik van der Zalm bf879ceaa9 Added thermistor tables 13 years ago
Erik van der Zalm 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 13 years ago
Erik van der Zalm 0b1423c303 Fixed crashes. 13 years ago
Erik van der Zalm 27664c6da6 Software endstps added 13 years ago
Erik van der Zalm b099fe142c Merge branch 'master' of github.com:ErikZalm/Marlin 13 years ago
Erik van der Zalm 8e017b81ab Sync with non-gen6 version 13 years ago
ErikZalm 67967a4b60 Edited README via GitHub 13 years ago
Erik van der Zalm b5f6482dce Fixed small feedrate bug.
Copied Camiels comments in the Configuration.h file
13 years ago
Erik van der Zalm 0024a26ccf Fixed lookup table bug. 13 years ago
Erik van der Zalm 5a1787b2f4 Fix M109 13 years ago
Erik van der Zalm 26bf57e22c first-commit 13 years ago
Erik van der Zalm f850af5c1c Signed-off-by: Erik van der Zalm <erik@vdzalm.eu> 13 years ago
Erik van der Zalm 750f6c33e3 first commit 13 years ago
Erik van der Zalm 99653ff805 first commit 13 years ago