chiark / gitweb /
marlin.git
13 years agoDisabled M88 for boards that don't have seperate enable pins.
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.

13 years agoAdded M88 command. (Request from Action68)
Erik van der Zalm [Mon, 28 Nov 2011 19:51:01 +0000 (20:51 +0100)]
Added M88 command. (Request from Action68)

13 years agoFixed temperature reading bug.
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)

13 years agoRemoved interrupt nesting in the stepper ISR.
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).

13 years agoFirst parts 2nd extruder
Erik van der Zalm [Sat, 26 Nov 2011 16:33:25 +0000 (17:33 +0100)]
First parts 2nd extruder

13 years agoHome retract distance configureable per axis.
Bernhard [Sat, 26 Nov 2011 11:04:06 +0000 (12:04 +0100)]
Home retract distance configureable per axis.

13 years agomake an option if sd-card stop should release the steppers.
Bernhard [Sat, 26 Nov 2011 10:51:38 +0000 (11:51 +0100)]
make an option if sd-card stop should release the steppers.

13 years agodisable steppers as routine in stepper.cpp
Bernhard [Sat, 26 Nov 2011 10:50:23 +0000 (11:50 +0100)]
disable steppers as routine in stepper.cpp

13 years agocooldown blocking selectable by #define.
Bernhard [Sat, 26 Nov 2011 08:03:12 +0000 (09:03 +0100)]
cooldown blocking selectable by #define.

13 years agoslowdown
Bernhard [Fri, 25 Nov 2011 22:59:30 +0000 (23:59 +0100)]
slowdown

13 years agooverworked ultralcd a bit
Bernhard [Fri, 25 Nov 2011 22:37:08 +0000 (23:37 +0100)]
overworked ultralcd a bit

13 years agoanother typo
Bernhard [Fri, 25 Nov 2011 21:36:33 +0000 (22:36 +0100)]
another typo

13 years agotypo
Bernhard [Fri, 25 Nov 2011 21:34:12 +0000 (22:34 +0100)]
typo

13 years agonow velocities are also set in mm/sec in gcode.
Bernhard [Fri, 25 Nov 2011 21:32:26 +0000 (22:32 +0100)]
now velocities are also set in mm/sec in gcode.

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
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

13 years agooverworked lcd+eeprom to have only mm/sec and PID including pid_dt
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

13 years agoFixed variable (removed 0x)
Erik van der Zalm [Fri, 25 Nov 2011 21:10:06 +0000 (22:10 +0100)]
Fixed variable (removed 0x)

13 years agoFixed config bug when EEPROM was disabled
Erik van der Zalm [Fri, 25 Nov 2011 19:07:30 +0000 (20:07 +0100)]
Fixed config bug when EEPROM was disabled

13 years agoFixed residency time bug. (Thanks to Sound :-) )
Erik van der Zalm [Fri, 25 Nov 2011 18:34:36 +0000 (19:34 +0100)]
Fixed residency time bug. (Thanks to Sound :-)  )

13 years agoSmall nominal speed improvement.
Erik van der Zalm [Fri, 25 Nov 2011 14:32:50 +0000 (15:32 +0100)]
Small nominal speed improvement.

13 years agoRemoved ISR overtaken message from ISR routine
Erik van der Zalm [Fri, 25 Nov 2011 12:59:58 +0000 (13:59 +0100)]
Removed ISR overtaken message from ISR routine

13 years agoSeperate ENDSTOP_INVERTING for X Y and Z
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.

13 years agoUpdate README.md
ErikZalm [Mon, 21 Nov 2011 21:40:47 +0000 (22:40 +0100)]
Update README.md

13 years agoYes, thats the beta.
Bernhard Kubicek [Sun, 20 Nov 2011 16:04:57 +0000 (17:04 +0100)]
Yes, thats the beta.

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
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

13 years agoless lcd flickering
Bernhard Kubicek [Sun, 20 Nov 2011 15:37:01 +0000 (16:37 +0100)]
less lcd flickering

13 years agomake tuneing sub-menu.
Bernhard Kubicek [Sun, 20 Nov 2011 15:05:42 +0000 (16:05 +0100)]
make tuneing sub-menu.

13 years agoSmall temperature disable bug.
Erik van der Zalm [Sun, 20 Nov 2011 14:03:35 +0000 (15:03 +0100)]
Small temperature disable bug.

13 years agoMerge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
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

13 years agoAdded endstop reporting
Erik van der Zalm [Sun, 20 Nov 2011 13:50:08 +0000 (14:50 +0100)]
Added endstop reporting

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
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

13 years agomade ultralcd compatible with folders.
Bernhard Kubicek [Sun, 20 Nov 2011 13:43:47 +0000 (14:43 +0100)]
made ultralcd compatible with folders.

13 years agoSmall changes to README.md
Erik van der Zalm [Sun, 20 Nov 2011 12:31:07 +0000 (13:31 +0100)]
Small changes to README.md

13 years agoChanged min max temperature code.
Erik van der Zalm [Sun, 20 Nov 2011 12:14:58 +0000 (13:14 +0100)]
Changed min max temperature code.

13 years agocode cleanup in ultralcd.
Bernhard Kubicek [Sun, 20 Nov 2011 10:55:33 +0000 (11:55 +0100)]
code cleanup in ultralcd.

13 years agomore readme
Bernhard Kubicek [Sun, 20 Nov 2011 10:55:06 +0000 (11:55 +0100)]
more readme

13 years agoeven more format.
Bernhard Kubicek [Sun, 20 Nov 2011 08:09:11 +0000 (09:09 +0100)]
even more format.

13 years agoformat
Bernhard Kubicek [Sun, 20 Nov 2011 08:06:05 +0000 (09:06 +0100)]
format

13 years agoformat
Bernhard Kubicek [Sun, 20 Nov 2011 08:03:42 +0000 (09:03 +0100)]
format

13 years agoformat readme.
Bernhard Kubicek [Sun, 20 Nov 2011 08:00:19 +0000 (09:00 +0100)]
format readme.

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
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

13 years agooverworked readme
Bernhard Kubicek [Sat, 19 Nov 2011 21:04:37 +0000 (22:04 +0100)]
overworked readme

13 years agoMerge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
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

13 years agoAdded software endstops
Erik van der Zalm [Sat, 19 Nov 2011 20:32:47 +0000 (21:32 +0100)]
Added software endstops

13 years agoupdate mcode documentation
Bernhard Kubicek [Sat, 19 Nov 2011 20:01:07 +0000 (21:01 +0100)]
update mcode documentation

13 years agooverworked config file
Bernhard Kubicek [Sat, 19 Nov 2011 19:52:43 +0000 (20:52 +0100)]
overworked config file

13 years agomake it compile without sd_support
Bernhard Kubicek [Sat, 19 Nov 2011 19:18:54 +0000 (20:18 +0100)]
make it compile without sd_support

13 years agoadd M17, so the enable stepper button works in repg.
Bernhard Kubicek [Sat, 19 Nov 2011 17:22:22 +0000 (18:22 +0100)]
add M17, so the enable stepper button works in repg.

13 years agoMerge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
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

13 years agoFixed arc flowrate.
Erik van der Zalm [Sat, 19 Nov 2011 16:23:28 +0000 (17:23 +0100)]
Fixed arc flowrate.

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
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

13 years agomake it compile without autotemp
Bernhard Kubicek [Sat, 19 Nov 2011 16:09:33 +0000 (17:09 +0100)]
make it compile without autotemp

13 years agoautotemp working, default=disabled.
Bernhard Kubicek [Sat, 19 Nov 2011 16:07:44 +0000 (17:07 +0100)]
autotemp working, default=disabled.

13 years agoMerge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
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

13 years agoFixed max/min temperature bug
Erik van der Zalm [Sat, 19 Nov 2011 15:16:26 +0000 (16:16 +0100)]
Fixed max/min temperature bug

13 years agotrying to get autotemp to work.
Bernhard Kubicek [Sat, 19 Nov 2011 14:37:10 +0000 (15:37 +0100)]
trying to get autotemp to work.

13 years agofound bug that disabled printing from root.
Bernhard Kubicek [Sat, 19 Nov 2011 14:36:49 +0000 (15:36 +0100)]
found bug that disabled printing from root.

13 years agocorrected the ultimaker default values, the previous had a calculation error: see...
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

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
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

13 years agohost-based sd card printing seems now to work with folders
Bernhard Kubicek [Sat, 19 Nov 2011 13:34:27 +0000 (14:34 +0100)]
host-based sd card printing seems now to work with folders

13 years agooverworked cardreader for folder support; not finished yet.
Bernhard Kubicek [Sat, 19 Nov 2011 12:13:34 +0000 (13:13 +0100)]
overworked cardreader for folder support; not finished yet.

13 years agoChanged max/min temp init. Removed second uart from sabguino core
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

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
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

13 years agothe normal config again..
Bernhard Kubicek [Fri, 18 Nov 2011 21:22:07 +0000 (22:22 +0100)]
the normal config again..

13 years agoremoved some debugging comments
Bernhard Kubicek [Fri, 18 Nov 2011 21:20:53 +0000 (22:20 +0100)]
removed some debugging comments

13 years agoupdated to sdfatlib2010902
Bernhard Kubicek [Fri, 18 Nov 2011 21:17:37 +0000 (22:17 +0100)]
updated to sdfatlib2010902

13 years agoFixed bug in configuration.h
Erik van der Zalm [Fri, 18 Nov 2011 18:46:16 +0000 (19:46 +0100)]
Fixed bug in configuration.h

13 years agoMerge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
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

13 years agoAdvance experiments. Not working yet.
Erik van der Zalm [Fri, 18 Nov 2011 17:59:17 +0000 (18:59 +0100)]
Advance experiments. Not working yet.

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
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

13 years agoand changed ultipanel to have the mm/sec and not mm/min
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

13 years agoshow sd%
Bernhard Kubicek [Tue, 15 Nov 2011 19:55:00 +0000 (20:55 +0100)]
show sd%

13 years agowatchdog,percent done,
Bernhard Kubicek [Tue, 15 Nov 2011 19:54:40 +0000 (20:54 +0100)]
watchdog,percent done,

13 years agoFixed some small planner bugs
Erik van der Zalm [Tue, 15 Nov 2011 17:14:00 +0000 (18:14 +0100)]
Fixed some small planner bugs

13 years agoSome fixes in planner
Erik van der Zalm [Mon, 14 Nov 2011 22:57:34 +0000 (23:57 +0100)]
Some fixes in planner

13 years agoAdded slowdown
Erik van der Zalm [Mon, 14 Nov 2011 19:04:29 +0000 (20:04 +0100)]
Added slowdown

13 years agoBuffer size > 16
Erik van der Zalm [Mon, 14 Nov 2011 17:53:09 +0000 (18:53 +0100)]
Buffer size > 16

13 years agoAdded modified Sanguino files
Erik van der Zalm [Mon, 14 Nov 2011 17:27:47 +0000 (18:27 +0100)]
Added modified Sanguino files

13 years agoMerge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm [Mon, 14 Nov 2011 17:26:57 +0000 (18:26 +0100)]
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

13 years ago250000 baud
Erik van der Zalm [Mon, 14 Nov 2011 17:24:02 +0000 (18:24 +0100)]
250000 baud

13 years agofixed bug with adjusting ki in realtime.
Bernhard Kubicek [Sun, 13 Nov 2011 20:43:26 +0000 (21:43 +0100)]
fixed bug with adjusting ki in realtime.

13 years agoMerge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm [Sun, 13 Nov 2011 19:46:44 +0000 (20:46 +0100)]
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

13 years agoA lot of changes in the planner code
Erik van der Zalm [Sun, 13 Nov 2011 19:42:08 +0000 (20:42 +0100)]
A lot of changes in the planner code

13 years agoadded a m400, that finished all moves,
Bernhard Kubicek [Sun, 13 Nov 2011 18:58:09 +0000 (19:58 +0100)]
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.

13 years agoheater power repair.
Bernhard Kubicek [Sat, 12 Nov 2011 23:48:55 +0000 (00:48 +0100)]
heater power repair.

13 years agore-enabled heaterpower as storage for the current storage of the heater PWM duty...
Bernhard Kubicek [Sat, 12 Nov 2011 19:37:28 +0000 (20:37 +0100)]
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 "@:"

13 years agominor changes and first not-well working version of autotemp
Bernhard Kubicek [Wed, 9 Nov 2011 21:09:16 +0000 (22:09 +0100)]
minor changes and first not-well working version of autotemp

13 years agoStreaming.h is gone. It conflicted with PROGMEM. And saving memory is more important...
Bernhard Kubicek [Wed, 9 Nov 2011 19:30:41 +0000 (20:30 +0100)]
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho

13 years agobeautified the config. ordered it into thematic sections.
Bernhard Kubicek [Wed, 9 Nov 2011 19:28:40 +0000 (20:28 +0100)]
beautified the config. ordered it into thematic sections.

13 years agoproject progmem finished: total change with ultipanel: 2456 byte free ram initial...
Bernhard Kubicek [Wed, 9 Nov 2011 19:27:15 +0000 (20:27 +0100)]
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.

13 years agomade progmem mainly, found one bug in cardreader, added a empty class for cardreader...
Bernhard Kubicek [Mon, 7 Nov 2011 21:33:13 +0000 (22:33 +0100)]
made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.

13 years agobetter visibility of public/private/imported variables
Bernhard Kubicek [Sun, 6 Nov 2011 22:34:40 +0000 (23:34 +0100)]
better visibility of public/private/imported variables

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek [Sun, 6 Nov 2011 22:21:33 +0000 (23:21 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

13 years agomade loop counters uint8_t most were int(16_t) before
Bernhard Kubicek [Sun, 6 Nov 2011 22:21:12 +0000 (23:21 +0100)]
made loop counters uint8_t most were int(16_t) before

13 years agoThermistor name problem
Erik van der Zalm [Sun, 6 Nov 2011 22:20:01 +0000 (23:20 +0100)]
Thermistor name problem

13 years agopreprocessor magic to have a single source principle
Bernhard Kubicek [Sun, 6 Nov 2011 22:13:19 +0000 (23:13 +0100)]
preprocessor magic to have a single source principle

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek [Sun, 6 Nov 2011 21:48:36 +0000 (22:48 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

13 years agomade cardreader more selfsustained
Bernhard Kubicek [Sun, 6 Nov 2011 21:48:15 +0000 (22:48 +0100)]
made cardreader more selfsustained

13 years agoCorrected thermistor naming
Erik van der Zalm [Sun, 6 Nov 2011 21:37:43 +0000 (22:37 +0100)]
Corrected thermistor naming

13 years agofirst compile with the cardreader class
Bernhard Kubicek [Sun, 6 Nov 2011 20:39:53 +0000 (21:39 +0100)]
first compile with the cardreader class