Bernhard Kubicek
|
5535e51bf6
|
Yes, thats the beta.
|
2011-11-20 17:04:57 +01:00 |
|
Bernhard Kubicek
|
8b14a8ad34
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2011-11-20 16:39:39 +01:00 |
|
Bernhard Kubicek
|
924bab1a03
|
less lcd flickering
|
2011-11-20 16:37:01 +01:00 |
|
Bernhard Kubicek
|
379ea642e1
|
make tuneing sub-menu.
|
2011-11-20 16:05:42 +01:00 |
|
Erik van der Zalm
|
959d82e81e
|
Small temperature disable bug.
|
2011-11-20 15:03:35 +01:00 |
|
Erik van der Zalm
|
15bb3f284e
|
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
2011-11-20 14:51:40 +01:00 |
|
Erik van der Zalm
|
4e5becfc51
|
Added endstop reporting
|
2011-11-20 14:50:08 +01:00 |
|
Bernhard Kubicek
|
eeb4f029db
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2011-11-20 14:45:38 +01:00 |
|
Bernhard Kubicek
|
b21d5193f2
|
made ultralcd compatible with folders.
|
2011-11-20 14:43:47 +01:00 |
|
Erik van der Zalm
|
2e43f9c809
|
Changed min max temperature code.
|
2011-11-20 13:14:58 +01:00 |
|
Bernhard Kubicek
|
cd2268f10a
|
code cleanup in ultralcd.
|
2011-11-20 11:55:33 +01:00 |
|
Erik van der Zalm
|
0e7fee9a9b
|
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
2011-11-19 21:33:15 +01:00 |
|
Erik van der Zalm
|
915ef2d4a1
|
Added software endstops
|
2011-11-19 21:32:47 +01:00 |
|
Bernhard Kubicek
|
e87df99e22
|
update mcode documentation
|
2011-11-19 21:01:07 +01:00 |
|
Bernhard Kubicek
|
8a1e719a3f
|
overworked config file
|
2011-11-19 20:52:43 +01:00 |
|
Bernhard Kubicek
|
5ad1d19384
|
make it compile without sd_support
|
2011-11-19 20:18:54 +01:00 |
|
Bernhard Kubicek
|
7a2d1f5aeb
|
add M17, so the enable stepper button works in repg.
|
2011-11-19 18:22:22 +01:00 |
|
Erik van der Zalm
|
e02af3e66a
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
2011-11-19 17:23:47 +01:00 |
|
Erik van der Zalm
|
537b5c155d
|
Fixed arc flowrate.
|
2011-11-19 17:23:28 +01:00 |
|
Bernhard Kubicek
|
953d830bba
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2011-11-19 17:09:43 +01:00 |
|
Bernhard Kubicek
|
2a6afee832
|
make it compile without autotemp
|
2011-11-19 17:09:33 +01:00 |
|
Bernhard Kubicek
|
f52e1a9571
|
autotemp working, default=disabled.
|
2011-11-19 17:07:44 +01:00 |
|
Erik van der Zalm
|
6e6fdb9a4e
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
2011-11-19 16:18:13 +01:00 |
|
Erik van der Zalm
|
6841a10446
|
Fixed max/min temperature bug
|
2011-11-19 16:16:26 +01:00 |
|
Bernhard Kubicek
|
8a08b8e07e
|
trying to get autotemp to work.
|
2011-11-19 15:37:10 +01:00 |
|
Bernhard Kubicek
|
f0154de5b3
|
found bug that disabled printing from root.
|
2011-11-19 15:36:49 +01:00 |
|
Bernhard Kubicek
|
70650c331d
|
corrected the ultimaker default values, the previous had a calculation error: see: http://groups.google.com/group/ultimaker/browse_thread/thread/91906788639703cf
|
2011-11-19 14:50:31 +01:00 |
|
Bernhard Kubicek
|
9d90220537
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2011-11-19 14:35:53 +01:00 |
|
Bernhard Kubicek
|
869cee74e6
|
host-based sd card printing seems now to work with folders
|
2011-11-19 14:34:27 +01:00 |
|
Bernhard Kubicek
|
70abca195a
|
overworked cardreader for folder support; not finished yet.
|
2011-11-19 13:13:34 +01:00 |
|
Erik van der Zalm
|
ff69e0a772
|
Changed max/min temp init. Removed second uart from sabguino core
|
2011-11-19 12:19:53 +01:00 |
|
Bernhard Kubicek
|
1e5e141ac9
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2011-11-18 22:22:23 +01:00 |
|
Bernhard Kubicek
|
edb5ea7efa
|
the normal config again..
|
2011-11-18 22:22:07 +01:00 |
|
Bernhard Kubicek
|
5df5727e93
|
removed some debugging comments
|
2011-11-18 22:20:53 +01:00 |
|
Bernhard Kubicek
|
64f2121ab1
|
updated to sdfatlib2010902
|
2011-11-18 22:17:37 +01:00 |
|
Erik van der Zalm
|
b15902d3b5
|
Fixed bug in configuration.h
|
2011-11-18 19:46:16 +01:00 |
|
Erik van der Zalm
|
e63e224a33
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
|
2011-11-18 19:04:09 +01:00 |
|
Erik van der Zalm
|
e7dca8614b
|
Advance experiments. Not working yet.
|
2011-11-18 18:59:17 +01:00 |
|
Bernhard Kubicek
|
46f80e82d9
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
Marlin/ultralcd.h
|
2011-11-15 22:53:04 +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
|
02b9eceead
|
show sd%
|
2011-11-15 20:55:00 +01:00 |
|
Bernhard Kubicek
|
7919a40d06
|
watchdog,percent done,
|
2011-11-15 20:54:40 +01:00 |
|
Erik van der Zalm
|
805d37f77b
|
Fixed some small planner bugs
|
2011-11-15 18:14:00 +01:00 |
|
Erik van der Zalm
|
5fd41ae872
|
Some fixes in planner
|
2011-11-14 23:57:34 +01:00 |
|
Erik van der Zalm
|
95126c09c0
|
Added slowdown
|
2011-11-14 20:04:29 +01:00 |
|
Erik van der Zalm
|
331e82dcd3
|
Buffer size > 16
|
2011-11-14 18:53:09 +01:00 |
|
Erik van der Zalm
|
2643ae93d6
|
Added modified Sanguino files
|
2011-11-14 18:27:47 +01:00 |
|
Erik van der Zalm
|
c00eefb824
|
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
|
2011-11-14 18:26:57 +01:00 |
|
Erik van der Zalm
|
1d0452f10c
|
250000 baud
|
2011-11-14 18:24:02 +01:00 |
|
Bernhard Kubicek
|
c57906b627
|
fixed bug with adjusting ki in realtime.
|
2011-11-13 21:43:26 +01:00 |
|