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
|
2011-11-05 20:03:38 +01:00 |
|
Erik van der Zalm
|
d15f01e1b4
|
Temperature changes
|
2011-11-05 19:21:36 +01:00 |
|
Bernhard Kubicek
|
00674af3a8
|
merge from the branch bkubicek/Marlin/zalmmerge
|
2011-11-05 14:13:20 +01:00 |
|
Erik van der Zalm
|
95d3d9847c
|
M109 now equal to sprinter
|
2011-11-04 23:38:25 +01:00 |
|
Erik van der Zalm
|
bf879ceaa9
|
Added thermistor tables
|
2011-11-04 22:51:14 +01:00 |
|
Erik van der Zalm
|
094afe7c10
|
Merged Marlin, Marlin non gen6 and Ultimaker changes
|
2011-11-04 18:02:56 +01:00 |
|
Erik van der Zalm
|
8e017b81ab
|
Sync with non-gen6 version
|
2011-09-14 18:56:45 +02:00 |
|
Erik van der Zalm
|
b5f6482dce
|
Fixed small feedrate bug.
Copied Camiels comments in the Configuration.h file
|
2011-08-21 18:29:47 +02:00 |
|
Erik van der Zalm
|
26bf57e22c
|
first-commit
|
2011-08-13 10:09:54 +02:00 |
|
Erik van der Zalm
|
750f6c33e3
|
first commit
|
2011-08-12 22:28:35 +02:00 |
|