a0a1f81913
various changes
14 years ago
57f9359a41
simplified the includes, makefile now works with arduino23
14 years ago
3c1a4aac2b
header file simplification
14 years ago
84d9cf7339
merging
14 years ago
2bc5e7ec9e
prevent too long extrudes, or too cold extrudes
14 years ago
61c943b4bf
fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped.
14 years ago
4fd75dc813
Working version of multiple extruders (up to 3)
...
- The temperature control is pretty much complete
(not sure what to do w/ autotemp though)
Changed the pins assignment to clearly separate bed and extruder heaters
and temp sensors, changed a bit how termistor tables are handled.
- The steppers control is rudimentary
(only chanages what pins it uses depending on the active_extruder var,
but that's enough for switching extruder in the start.gcode in the
the profiles)
- Tested only w/ RAMPS 1.4
14 years ago
6b86f15686
More 2nd extruder implementation. (Not usable)
...
Advance (not tested)
14 years ago
0bc9daa4f7
make it compile with arduino 1.0 ; function is still untested.
14 years ago
b0c3871750
more fixing of the sanguino math round problem
14 years ago
311627141b
Merge branch 'smallopt' into Marlin_v1
...
Conflicts:
Marlin/temperature.h
14 years ago
f75f426dfa
Removed interrupt nesting in the stepper ISR.
...
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
14 years ago
26a1de1e44
force inline
14 years ago
f8e170a44b
planner optimization by inline functions
14 years ago
aad4b75b94
First parts 2nd extruder
14 years ago
c0f8c9fd72
Seperate ENDSTOP_INVERTING for X Y and Z
...
Added simple endstop filter.
Corrected M114 count display.
14 years ago
5535e51bf6
Yes, thats the beta.
14 years ago
379ea642e1
make tuneing sub-menu.
14 years ago
915ef2d4a1
Added software endstops
14 years ago
8a08b8e07e
trying to get autotemp to work.
14 years ago
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
14 years ago
36958ee305
minor changes and first not-well working version of autotemp
14 years ago
1d171e9e52
reformating and some minor bugs/things found on the way.
14 years ago
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
14 years ago
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
14 years ago
Erik van der Zalm