Commit Graph

115 Commits

Author SHA1 Message Date
Bernhard
311627141b Merge branch 'smallopt' into Marlin_v1
Conflicts:
	Marlin/temperature.h
2011-11-28 21:36:01 +01:00
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).
2011-11-27 21:12:55 +01:00
Bernhard
26a1de1e44 force inline 2011-11-27 16:04:58 +01:00
Bernhard
f8e170a44b planner optimization by inline functions 2011-11-27 14:57:12 +01:00
Erik van der Zalm
aad4b75b94 First parts 2nd extruder 2011-11-26 17:33:25 +01:00
Erik van der Zalm
c0f8c9fd72 Seperate ENDSTOP_INVERTING for X Y and Z
Added simple endstop filter.
Corrected M114 count display.
2011-11-25 13:43:06 +01:00
Bernhard Kubicek
5535e51bf6 Yes, thats the beta. 2011-11-20 17:04:57 +01:00
Bernhard Kubicek
379ea642e1 make tuneing sub-menu. 2011-11-20 16:05:42 +01:00
Erik van der Zalm
915ef2d4a1 Added software endstops 2011-11-19 21:32:47 +01:00
Bernhard Kubicek
8a08b8e07e trying to get autotemp to work. 2011-11-19 15:37:10 +01:00
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
2011-11-15 22:50:43 +01:00
Bernhard Kubicek
36958ee305 minor changes and first not-well working version of autotemp 2011-11-09 22:09:16 +01:00
Bernhard Kubicek
1d171e9e52 reformating and some minor bugs/things found on the way. 2011-11-06 19:23:08 +01:00
Bernhard Kubicek
00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 2011-11-05 14:13:20 +01:00
Erik van der Zalm
094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 2011-11-04 18:02:56 +01:00