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.
|
14 years ago |
|
Erik van der Zalm
|
5a1787b2f4
|
Fix M109
|
14 years ago |
|
Erik van der Zalm
|
26bf57e22c
|
first-commit
|
14 years ago |
|
Erik van der Zalm
|
f850af5c1c
|
Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
|
14 years ago |
|
Erik van der Zalm
|
750f6c33e3
|
first commit
|
14 years ago |
|
Erik van der Zalm
|
99653ff805
|
first commit
|
14 years ago |
