Bernhard
|
311627141b
|
Merge branch 'smallopt' into Marlin_v1
Conflicts:
Marlin/temperature.h
|
13 years ago |
|
Erik van der Zalm
|
f75f426dfa
|
Removed interrupt nesting in the stepper ISR.
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
|
13 years ago |
|
Bernhard
|
26a1de1e44
|
force inline
|
13 years ago |
|
Bernhard
|
f8e170a44b
|
planner optimization by inline functions
|
13 years ago |
|
Erik van der Zalm
|
aad4b75b94
|
First parts 2nd extruder
|
13 years ago |
|
Erik van der Zalm
|
c0f8c9fd72
|
Seperate ENDSTOP_INVERTING for X Y and Z
Added simple endstop filter.
Corrected M114 count display.
|
13 years ago |
|
Bernhard Kubicek
|
5535e51bf6
|
Yes, thats the beta.
|
13 years ago |
|
Bernhard Kubicek
|
379ea642e1
|
make tuneing sub-menu.
|
13 years ago |
|
Erik van der Zalm
|
915ef2d4a1
|
Added software endstops
|
13 years ago |
|
Bernhard Kubicek
|
8a08b8e07e
|
trying to get autotemp to work.
|
13 years ago |
|
Bernhard Kubicek
|
a9c7da06e3
|
and changed ultipanel to have the mm/sec and not mm/min
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.h
|
13 years ago |
|
Bernhard Kubicek
|
36958ee305
|
minor changes and first not-well working version of autotemp
|
13 years ago |
|
Bernhard Kubicek
|
1d171e9e52
|
reformating and some minor bugs/things found on the way.
|
13 years ago |
|
Bernhard Kubicek
|
00674af3a8
|
merge from the branch bkubicek/Marlin/zalmmerge
|
13 years ago |
|
Erik van der Zalm
|
094afe7c10
|
Merged Marlin, Marlin non gen6 and Ultimaker changes
|
13 years ago |
