chiark / gitweb /
Erik van der Zalm [Sun, 4 Dec 2011 18:54:07 +0000 (19:54 +0100)]
Some advance modifications
Erik van der Zalm [Fri, 2 Dec 2011 16:45:05 +0000 (17:45 +0100)]
More 2nd extruder implementation. (Not usable)
Advance (not tested)
Bernhard [Thu, 1 Dec 2011 15:38:01 +0000 (16:38 +0100)]
make it compile with arduino 1.0 ; function is still untested.
Bernhard [Wed, 30 Nov 2011 08:07:56 +0000 (09:07 +0100)]
more fixing of the sanguino math round problem
Bernhard [Wed, 30 Nov 2011 07:57:30 +0000 (08:57 +0100)]
removed stream.h referenece from marlinserial.
Bernhard [Wed, 30 Nov 2011 07:51:46 +0000 (08:51 +0100)]
preliminiary implementation for the early heating finish.
Might be replaced by something more clever, e.g. by erik, and does not yet support the second extruder or the bed.
its kind of not so cool, because you need 6 more ints.
Maybe isheating() should use the degrees directly, as it is not used in time-critical anyways.
Then it would be much easier. to have the offsets without additional variables.
Bernhard [Wed, 30 Nov 2011 07:32:28 +0000 (08:32 +0100)]
made it compile if arduino decides to include files in a differnt order. DEC HEX and stuff now defined in MarlinSerial.h
Bernhard [Tue, 29 Nov 2011 21:06:31 +0000 (22:06 +0100)]
first homing move diagonal towards home switches.
Bernhard [Mon, 28 Nov 2011 21:45:40 +0000 (22:45 +0100)]
repaired compiliation in windows
Bernhard [Mon, 28 Nov 2011 21:11:17 +0000 (22:11 +0100)]
more inlines
Bernhard [Mon, 28 Nov 2011 21:09:17 +0000 (22:09 +0100)]
possible stepper release after sd printing
Bernhard [Mon, 28 Nov 2011 20:52:16 +0000 (21:52 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard [Mon, 28 Nov 2011 20:51:44 +0000 (21:51 +0100)]
force inline
Erik van der Zalm [Mon, 28 Nov 2011 20:49:54 +0000 (21:49 +0100)]
Moved M88 into M84. (M84 E)
Bernhard [Mon, 28 Nov 2011 20:36:01 +0000 (21:36 +0100)]
Merge branch 'smallopt' into Marlin_v1
Conflicts:
Marlin/temperature.h
Erik van der Zalm [Mon, 28 Nov 2011 20:17:06 +0000 (21:17 +0100)]
Disabled M88 for boards that don't have seperate enable pins.
Erik van der Zalm [Mon, 28 Nov 2011 19:51:01 +0000 (20:51 +0100)]
Added M88 command. (Request from Action68)
Bernhard [Mon, 28 Nov 2011 18:34:42 +0000 (19:34 +0100)]
inlineing of small functions in serial
Bernhard [Mon, 28 Nov 2011 18:28:38 +0000 (19:28 +0100)]
removed unecessary indirect register adressing in serial.
Bernhard [Mon, 28 Nov 2011 18:13:40 +0000 (19:13 +0100)]
get rid of indirect ringbuffer calls, made some inlines, removed virtual and streaming class requirements.
Erik van der Zalm [Mon, 28 Nov 2011 16:42:49 +0000 (17:42 +0100)]
Fixed temperature reading bug.
(When using the lower and upper adc input bank)
Erik van der Zalm [Sun, 27 Nov 2011 20:12:55 +0000 (21:12 +0100)]
Removed interrupt nesting in the stepper ISR.
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
Bernhard [Sun, 27 Nov 2011 16:27:17 +0000 (17:27 +0100)]
first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops.
Bernhard [Sun, 27 Nov 2011 15:53:11 +0000 (16:53 +0100)]
lcd message from gcode, m117
Bernhard [Sun, 27 Nov 2011 15:45:19 +0000 (16:45 +0100)]
add autotemp support to the lcd
Bernhard [Sun, 27 Nov 2011 15:45:00 +0000 (16:45 +0100)]
overlooked some inlines..
Bernhard [Sun, 27 Nov 2011 15:04:58 +0000 (16:04 +0100)]
force inline
Bernhard [Sun, 27 Nov 2011 13:57:12 +0000 (14:57 +0100)]
planner optimization by inline functions
Erik van der Zalm [Sat, 26 Nov 2011 16:33:25 +0000 (17:33 +0100)]
First parts 2nd extruder
Bernhard [Sat, 26 Nov 2011 11:04:06 +0000 (12:04 +0100)]
Home retract distance configureable per axis.
Bernhard [Sat, 26 Nov 2011 10:51:38 +0000 (11:51 +0100)]
make an option if sd-card stop should release the steppers.
Bernhard [Sat, 26 Nov 2011 10:50:23 +0000 (11:50 +0100)]
disable steppers as routine in stepper.cpp
Bernhard [Sat, 26 Nov 2011 08:03:12 +0000 (09:03 +0100)]
cooldown blocking selectable by #define.
Bernhard [Fri, 25 Nov 2011 22:59:30 +0000 (23:59 +0100)]
slowdown
Bernhard [Fri, 25 Nov 2011 22:37:08 +0000 (23:37 +0100)]
overworked ultralcd a bit
Bernhard [Fri, 25 Nov 2011 21:36:33 +0000 (22:36 +0100)]
another typo
Bernhard [Fri, 25 Nov 2011 21:34:12 +0000 (22:34 +0100)]
typo
Bernhard [Fri, 25 Nov 2011 21:32:26 +0000 (22:32 +0100)]
now velocities are also set in mm/sec in gcode.
Bernhard [Fri, 25 Nov 2011 21:14:36 +0000 (22:14 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard [Fri, 25 Nov 2011 21:14:29 +0000 (22:14 +0100)]
overworked lcd+eeprom to have only mm/sec and PID including pid_dt
Erik van der Zalm [Fri, 25 Nov 2011 21:10:06 +0000 (22:10 +0100)]
Fixed variable (removed 0x)
Erik van der Zalm [Fri, 25 Nov 2011 19:07:30 +0000 (20:07 +0100)]
Fixed config bug when EEPROM was disabled
Erik van der Zalm [Fri, 25 Nov 2011 18:34:36 +0000 (19:34 +0100)]
Fixed residency time bug. (Thanks to Sound :-) )
Erik van der Zalm [Fri, 25 Nov 2011 14:32:50 +0000 (15:32 +0100)]
Small nominal speed improvement.
Erik van der Zalm [Fri, 25 Nov 2011 12:59:58 +0000 (13:59 +0100)]
Removed ISR overtaken message from ISR routine
Erik van der Zalm [Fri, 25 Nov 2011 12:43:06 +0000 (13:43 +0100)]
Seperate ENDSTOP_INVERTING for X Y and Z
Added simple endstop filter.
Corrected M114 count display.
ErikZalm [Mon, 21 Nov 2011 21:40:47 +0000 (22:40 +0100)]
Update README.md
Bernhard Kubicek [Sun, 20 Nov 2011 16:04:57 +0000 (17:04 +0100)]
Yes, thats the beta.
Bernhard Kubicek [Sun, 20 Nov 2011 15:39:39 +0000 (16:39 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek [Sun, 20 Nov 2011 15:37:01 +0000 (16:37 +0100)]
less lcd flickering
Bernhard Kubicek [Sun, 20 Nov 2011 15:05:42 +0000 (16:05 +0100)]
make tuneing sub-menu.
Erik van der Zalm [Sun, 20 Nov 2011 14:03:35 +0000 (15:03 +0100)]
Small temperature disable bug.
Erik van der Zalm [Sun, 20 Nov 2011 13:51:40 +0000 (14:51 +0100)]
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm [Sun, 20 Nov 2011 13:50:08 +0000 (14:50 +0100)]
Added endstop reporting
Bernhard Kubicek [Sun, 20 Nov 2011 13:45:38 +0000 (14:45 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek [Sun, 20 Nov 2011 13:43:47 +0000 (14:43 +0100)]
made ultralcd compatible with folders.
Erik van der Zalm [Sun, 20 Nov 2011 12:31:07 +0000 (13:31 +0100)]
Small changes to README.md
Erik van der Zalm [Sun, 20 Nov 2011 12:14:58 +0000 (13:14 +0100)]
Changed min max temperature code.
Bernhard Kubicek [Sun, 20 Nov 2011 10:55:33 +0000 (11:55 +0100)]
code cleanup in ultralcd.
Bernhard Kubicek [Sun, 20 Nov 2011 10:55:06 +0000 (11:55 +0100)]
more readme
Bernhard Kubicek [Sun, 20 Nov 2011 08:09:11 +0000 (09:09 +0100)]
even more format.
Bernhard Kubicek [Sun, 20 Nov 2011 08:06:05 +0000 (09:06 +0100)]
format
Bernhard Kubicek [Sun, 20 Nov 2011 08:03:42 +0000 (09:03 +0100)]
format
Bernhard Kubicek [Sun, 20 Nov 2011 08:00:19 +0000 (09:00 +0100)]
format readme.
Bernhard Kubicek [Sat, 19 Nov 2011 21:04:55 +0000 (22:04 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek [Sat, 19 Nov 2011 21:04:37 +0000 (22:04 +0100)]
overworked readme
Erik van der Zalm [Sat, 19 Nov 2011 20:33:15 +0000 (21:33 +0100)]
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm [Sat, 19 Nov 2011 20:32:47 +0000 (21:32 +0100)]
Added software endstops
Bernhard Kubicek [Sat, 19 Nov 2011 20:01:07 +0000 (21:01 +0100)]
update mcode documentation
Bernhard Kubicek [Sat, 19 Nov 2011 19:52:43 +0000 (20:52 +0100)]
overworked config file
Bernhard Kubicek [Sat, 19 Nov 2011 19:18:54 +0000 (20:18 +0100)]
make it compile without sd_support
Bernhard Kubicek [Sat, 19 Nov 2011 17:22:22 +0000 (18:22 +0100)]
add M17, so the enable stepper button works in repg.
Erik van der Zalm [Sat, 19 Nov 2011 16:23:47 +0000 (17:23 +0100)]
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm [Sat, 19 Nov 2011 16:23:28 +0000 (17:23 +0100)]
Fixed arc flowrate.
Bernhard Kubicek [Sat, 19 Nov 2011 16:09:43 +0000 (17:09 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek [Sat, 19 Nov 2011 16:09:33 +0000 (17:09 +0100)]
make it compile without autotemp
Bernhard Kubicek [Sat, 19 Nov 2011 16:07:44 +0000 (17:07 +0100)]
autotemp working, default=disabled.
Erik van der Zalm [Sat, 19 Nov 2011 15:18:13 +0000 (16:18 +0100)]
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm [Sat, 19 Nov 2011 15:16:26 +0000 (16:16 +0100)]
Fixed max/min temperature bug
Bernhard Kubicek [Sat, 19 Nov 2011 14:37:10 +0000 (15:37 +0100)]
trying to get autotemp to work.
Bernhard Kubicek [Sat, 19 Nov 2011 14:36:49 +0000 (15:36 +0100)]
found bug that disabled printing from root.
Bernhard Kubicek [Sat, 19 Nov 2011 13:50:31 +0000 (14:50 +0100)]
corrected the ultimaker default values, the previous had a calculation error: see: groups.google.com/group/ultimaker/browse_thread/thread/
91906788639703cf
Bernhard Kubicek [Sat, 19 Nov 2011 13:35:53 +0000 (14:35 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek [Sat, 19 Nov 2011 13:34:27 +0000 (14:34 +0100)]
host-based sd card printing seems now to work with folders
Bernhard Kubicek [Sat, 19 Nov 2011 12:13:34 +0000 (13:13 +0100)]
overworked cardreader for folder support; not finished yet.
Erik van der Zalm [Sat, 19 Nov 2011 11:19:53 +0000 (12:19 +0100)]
Changed max/min temp init. Removed second uart from sabguino core
Bernhard Kubicek [Fri, 18 Nov 2011 21:22:23 +0000 (22:22 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek [Fri, 18 Nov 2011 21:22:07 +0000 (22:22 +0100)]
the normal config again..
Bernhard Kubicek [Fri, 18 Nov 2011 21:20:53 +0000 (22:20 +0100)]
removed some debugging comments
Bernhard Kubicek [Fri, 18 Nov 2011 21:17:37 +0000 (22:17 +0100)]
updated to sdfatlib2010902
Erik van der Zalm [Fri, 18 Nov 2011 18:46:16 +0000 (19:46 +0100)]
Fixed bug in configuration.h
Erik van der Zalm [Fri, 18 Nov 2011 18:04:09 +0000 (19:04 +0100)]
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
Erik van der Zalm [Fri, 18 Nov 2011 17:59:17 +0000 (18:59 +0100)]
Advance experiments. Not working yet.
Bernhard Kubicek [Tue, 15 Nov 2011 21:53:04 +0000 (22:53 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
Marlin/ultralcd.h
Bernhard Kubicek [Tue, 15 Nov 2011 21:50:43 +0000 (22:50 +0100)]
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
Bernhard Kubicek [Tue, 15 Nov 2011 19:55:00 +0000 (20:55 +0100)]
show sd%
Bernhard Kubicek [Tue, 15 Nov 2011 19:54:40 +0000 (20:54 +0100)]
watchdog,percent done,
Erik van der Zalm [Tue, 15 Nov 2011 17:14:00 +0000 (18:14 +0100)]
Fixed some small planner bugs
Erik van der Zalm [Mon, 14 Nov 2011 22:57:34 +0000 (23:57 +0100)]
Some fixes in planner
Erik van der Zalm [Mon, 14 Nov 2011 19:04:29 +0000 (20:04 +0100)]
Added slowdown
~ianmdlvl / marlin.git / log