Erik van der Zalm
|
95a0b28acb
|
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
2011-12-04 19:54:43 +01:00 |
|
|
Erik van der Zalm
|
af22e9cd38
|
Some advance modifications
|
2011-12-04 19:54:07 +01:00 |
|
Bernhard
|
7714b98da7
|
solved some compiler warnings that are now visible in arduino 1.0.
Found a couple of unused variables, that I commented.
Tried to solve the program memory warning message, and failed.
|
2011-12-04 12:40:18 +01:00 |
|
|
Bernhard
|
dfd240b260
|
overworked autotemp, removed one layer of nesting from the ultralcd.
|
2011-12-04 09:48:53 +01:00 |
|
|
Erik van der Zalm
|
6b86f15686
|
More 2nd extruder implementation. (Not usable)
Advance (not tested)
|
2011-12-02 17:45:05 +01:00 |
|
|
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 |
|
|
Bernhard
|
191f36b493
|
slowdown
|
2011-11-25 23:59:30 +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
|
379ea642e1
|
make tuneing sub-menu.
|
2011-11-20 16:05:42 +01:00 |
|
|
Erik van der Zalm
|
4e5becfc51
|
Added endstop reporting
|
2011-11-20 14:50:08 +01:00 |
|
|
Bernhard Kubicek
|
f52e1a9571
|
autotemp working, default=disabled.
|
2011-11-19 17:07:44 +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
|
72ace55e6a
|
better visibility of public/private/imported variables
|
2011-11-06 23:34:40 +01:00 |
|
|
Bernhard Kubicek
|
79d1bfb5c0
|
made many possible variables static, so they cannot be used extern.
|
2011-11-06 19:36:29 +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
|
b9ea0651ec
|
Revert "this is not working. Do you maybe know why?"
This reverts commit 8bcdb9f5f0.
|
2011-11-05 16:49:29 +01:00 |
|
|
Bernhard Kubicek
|
8bcdb9f5f0
|
this is not working. Do you maybe know why?
|
2011-11-05 16:43:44 +01:00 |
|
|
Bernhard Kubicek
|
40e8081623
|
changed end of line to windows, which seems to be the majority of developers main platform.
|
2011-11-05 14:19:57 +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 |
|