Commit Graph

5892 Commits

Author SHA1 Message Date
cd2268f10a code cleanup in ultralcd. 2011-11-20 11:55:33 +01:00
0e7fee9a9b Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-19 21:33:15 +01:00
915ef2d4a1 Added software endstops 2011-11-19 21:32:47 +01:00
e87df99e22 update mcode documentation 2011-11-19 21:01:07 +01:00
8a1e719a3f overworked config file 2011-11-19 20:52:43 +01:00
5ad1d19384 make it compile without sd_support 2011-11-19 20:18:54 +01:00
7a2d1f5aeb add M17, so the enable stepper button works in repg. 2011-11-19 18:22:22 +01:00
e02af3e66a Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-19 17:23:47 +01:00
537b5c155d Fixed arc flowrate. 2011-11-19 17:23:28 +01:00
953d830bba Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-19 17:09:43 +01:00
2a6afee832 make it compile without autotemp 2011-11-19 17:09:33 +01:00
f52e1a9571 autotemp working, default=disabled. 2011-11-19 17:07:44 +01:00
6e6fdb9a4e Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-19 16:18:13 +01:00
6841a10446 Fixed max/min temperature bug 2011-11-19 16:16:26 +01:00
8a08b8e07e trying to get autotemp to work. 2011-11-19 15:37:10 +01:00
f0154de5b3 found bug that disabled printing from root. 2011-11-19 15:36:49 +01:00
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
9d90220537 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-19 14:35:53 +01:00
869cee74e6 host-based sd card printing seems now to work with folders 2011-11-19 14:34:27 +01:00
70abca195a overworked cardreader for folder support; not finished yet. 2011-11-19 13:13:34 +01:00
ff69e0a772 Changed max/min temp init. Removed second uart from sabguino core 2011-11-19 12:19:53 +01:00
1e5e141ac9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-18 22:22:23 +01:00
edb5ea7efa the normal config again.. 2011-11-18 22:22:07 +01:00
5df5727e93 removed some debugging comments 2011-11-18 22:20:53 +01:00
64f2121ab1 updated to sdfatlib2010902 2011-11-18 22:17:37 +01:00
b15902d3b5 Fixed bug in configuration.h 2011-11-18 19:46:16 +01:00
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
e7dca8614b Advance experiments. Not working yet. 2011-11-18 18:59:17 +01:00
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
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
02b9eceead show sd% 2011-11-15 20:55:00 +01:00
7919a40d06 watchdog,percent done, 2011-11-15 20:54:40 +01:00
805d37f77b Fixed some small planner bugs 2011-11-15 18:14:00 +01:00
5fd41ae872 Some fixes in planner 2011-11-14 23:57:34 +01:00
95126c09c0 Added slowdown 2011-11-14 20:04:29 +01:00
331e82dcd3 Buffer size > 16 2011-11-14 18:53:09 +01:00
2643ae93d6 Added modified Sanguino files 2011-11-14 18:27:47 +01:00
c00eefb824 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-14 18:26:57 +01:00
1d0452f10c 250000 baud 2011-11-14 18:24:02 +01:00
c57906b627 fixed bug with adjusting ki in realtime. 2011-11-13 21:43:26 +01:00
ac82411c73 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-13 20:46:44 +01:00
65934eee9c A lot of changes in the planner code 2011-11-13 20:42:08 +01:00
9980ceb4a3 added a m400, that finished all moves,
and the mechanism so that if an endstop is hit it the ISR, the steps_to_be_taken are stored, and some current_block data that will be deleted in the next move
If the normal loop() then finds such an event, the position is calculated (floats would have taken too long in the ISR) A serial message is generated.
2011-11-13 19:58:09 +01:00
ff592b056a heater power repair. 2011-11-13 00:48:55 +01:00
e9adfa27b5 re-enabled heaterpower as storage for the current storage of the heater PWM duty cycle.
the M301 now returns the current PID settings of the machine.
M105 returns heating pwm duty cylce as "@:"
2011-11-12 20:37:28 +01:00
36958ee305 minor changes and first not-well working version of autotemp 2011-11-09 22:09:16 +01:00
ba8a53a40f Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho 2011-11-09 20:30:41 +01:00
27361e7cd0 beautified the config. ordered it into thematic sections. 2011-11-09 20:28:40 +01:00
ab154d5592 project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram. 2011-11-09 20:27:44 +01:00
7b70caab7c made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support. 2011-11-07 22:33:13 +01:00