123 Commits (54deb9eea366295100ab9c0c9105dbb841cc826e)

Author SHA1 Message Date
Bernhard dfd240b260 overworked autotemp, removed one layer of nesting from the ultralcd. 13 years ago
Erik van der Zalm 6b86f15686 More 2nd extruder implementation. (Not usable)
Advance (not tested)
13 years ago
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
Bernhard 191f36b493 slowdown 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 379ea642e1 make tuneing sub-menu. 13 years ago
Erik van der Zalm 4e5becfc51 Added endstop reporting 13 years ago
Bernhard Kubicek f52e1a9571 autotemp working, default=disabled. 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 72ace55e6a better visibility of public/private/imported variables 13 years ago
Bernhard Kubicek 79d1bfb5c0 made many possible variables static, so they cannot be used extern. 13 years ago
Bernhard Kubicek 1d171e9e52 reformating and some minor bugs/things found on the way. 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 094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 13 years ago