Erik van der Zalm
|
ac82411c73
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
13 years ago |
|
Erik van der Zalm
|
65934eee9c
|
A lot of changes in the planner code
|
13 years ago |
|
Bernhard Kubicek
|
36958ee305
|
minor changes and first not-well working version of autotemp
|
13 years ago |
|
Bernhard Kubicek
|
27361e7cd0
|
beautified the config. ordered it into thematic sections.
|
13 years ago |
|
Erik van der Zalm
|
d3bfffcb6e
|
Corrected thermistor naming
|
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
|
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
|
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
|
00674af3a8
|
merge from the branch bkubicek/Marlin/zalmmerge
|
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
|
8e017b81ab
|
Sync with non-gen6 version
|
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
|
26bf57e22c
|
first-commit
|
13 years ago |
|
Erik van der Zalm
|
750f6c33e3
|
first commit
|
13 years ago |