Erik van der Zalm
|
2e8e8878e5
|
Corrected temp variables.
|
14 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
|
14 years ago |
|
Erik van der Zalm
|
d15f01e1b4
|
Temperature changes
|
14 years ago |
|
Bernhard Kubicek
|
00674af3a8
|
merge from the branch bkubicek/Marlin/zalmmerge
|
14 years ago |
|
Erik van der Zalm
|
95d3d9847c
|
M109 now equal to sprinter
|
14 years ago |
|
Erik van der Zalm
|
bf879ceaa9
|
Added thermistor tables
|
14 years ago |
|
Erik van der Zalm
|
094afe7c10
|
Merged Marlin, Marlin non gen6 and Ultimaker changes
|
14 years ago |
|
Erik van der Zalm
|
8e017b81ab
|
Sync with non-gen6 version
|
14 years ago |
|
Erik van der Zalm
|
b5f6482dce
|
Fixed small feedrate bug.
Copied Camiels comments in the Configuration.h file
|
14 years ago |
|
Erik van der Zalm
|
26bf57e22c
|
first-commit
|
14 years ago |
|
Erik van der Zalm
|
750f6c33e3
|
first commit
|
14 years ago |
