chiark / gitweb /
marlin.git
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

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard Kubicek [Sun, 6 Nov 2011 18:49:04 +0000 (19:49 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

13 years agostatic'ified Marlin.pde.
Bernhard Kubicek [Sun, 6 Nov 2011 18:48:37 +0000 (19:48 +0100)]
static'ified Marlin.pde.

13 years agoFixed some arc bugs
Erik van der Zalm [Sun, 6 Nov 2011 18:37:12 +0000 (19:37 +0100)]
Fixed some arc bugs

13 years agomade many possible variables static, so they cannot be used extern.
Bernhard Kubicek [Sun, 6 Nov 2011 18:36:29 +0000 (19:36 +0100)]
made many possible variables static, so they cannot be used extern.

13 years agoAdded teensylu pins
Erik van der Zalm [Sun, 6 Nov 2011 18:30:04 +0000 (19:30 +0100)]
Added teensylu pins

13 years agoreformating and some minor bugs/things found on the way.
Bernhard Kubicek [Sun, 6 Nov 2011 18:23:08 +0000 (19:23 +0100)]
reformating and some minor bugs/things found on the way.

13 years agooverworked the serial responses. Quite difficult, since many texts are Pronterface...
Bernhard Kubicek [Sun, 6 Nov 2011 16:33:09 +0000 (17:33 +0100)]
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.

13 years agocorrecting commit errors.
Bernhard Kubicek [Sun, 6 Nov 2011 14:10:29 +0000 (15:10 +0100)]
correcting commit errors.

13 years agowrong file location
Bernhard Kubicek [Sun, 6 Nov 2011 13:58:12 +0000 (14:58 +0100)]
wrong file location

13 years agowatchdog into dedicated file
Bernhard Kubicek [Sun, 6 Nov 2011 13:22:15 +0000 (14:22 +0100)]
watchdog into dedicated file

13 years agorefactured temperature.cpp so that there are now abstract functions to access tempera...
Bernhard Kubicek [Sun, 6 Nov 2011 13:03:41 +0000 (14:03 +0100)]
refactured temperature.cpp so that there are now abstract functions to access temperatures.

13 years agoFirst arcs version. (Arcs not working ok)
Erik van der Zalm [Sun, 6 Nov 2011 11:39:00 +0000 (12:39 +0100)]
First arcs version. (Arcs not working ok)

13 years agoCorrected temp variables.
Erik van der Zalm [Sat, 5 Nov 2011 19:21:09 +0000 (20:21 +0100)]
Corrected temp variables.

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

Conflicts:
Marlin/Configuration.h
Marlin/EEPROMwrite.h
Marlin/Marlin.h
Marlin/Marlin.pde
Marlin/temperature.cpp
Marlin/temperature.h
Marlin/thermistortables.h

13 years agoTemperature changes
Erik van der Zalm [Sat, 5 Nov 2011 18:21:36 +0000 (19:21 +0100)]
Temperature changes

13 years agomoved the variables in the ISR, thats the most normal use case of static.
Bernhard Kubicek [Sat, 5 Nov 2011 15:53:37 +0000 (16:53 +0100)]
moved the variables in the ISR, thats the most normal use case of static.

13 years agoRevert "this is not working. Do you maybe know why?"
Bernhard Kubicek [Sat, 5 Nov 2011 15:49:29 +0000 (16:49 +0100)]
Revert "this is not working. Do you maybe know why?"

This reverts commit 8bcdb9f5f062fe68d90e31752453e1d662b3f0e2.

13 years agothis is not working. Do you maybe know why?
Bernhard Kubicek [Sat, 5 Nov 2011 15:43:44 +0000 (16:43 +0100)]
this is not working. Do you maybe know why?

13 years agochanged end of line to windows, which seems to be the majority of developers main...
Bernhard Kubicek [Sat, 5 Nov 2011 13:19:57 +0000 (14:19 +0100)]
changed end of line to windows, which seems to be the majority of developers main platform.

13 years agomerge from the branch bkubicek/Marlin/zalmmerge
Bernhard Kubicek [Sat, 5 Nov 2011 13:13:20 +0000 (14:13 +0100)]
merge from the branch bkubicek/Marlin/zalmmerge

13 years agoAdded M42, M80 and M81
Erik van der Zalm [Sat, 5 Nov 2011 10:18:52 +0000 (11:18 +0100)]
Added M42, M80 and M81

13 years agoM109 now equal to sprinter
Erik van der Zalm [Fri, 4 Nov 2011 22:38:25 +0000 (23:38 +0100)]
M109 now equal to sprinter

13 years agoAdded thermistor tables
Erik van der Zalm [Fri, 4 Nov 2011 21:51:14 +0000 (22:51 +0100)]
Added thermistor tables

13 years agoMerged Marlin, Marlin non gen6 and Ultimaker changes
Erik van der Zalm [Fri, 4 Nov 2011 17:02:56 +0000 (18:02 +0100)]
Merged Marlin, Marlin non gen6 and Ultimaker changes

13 years agoFixed crashes.
Erik van der Zalm [Tue, 18 Oct 2011 17:13:30 +0000 (19:13 +0200)]
Fixed crashes.

13 years agoSoftware endstps added
Erik van der Zalm [Thu, 15 Sep 2011 15:37:58 +0000 (17:37 +0200)]
Software endstps added

13 years agoMerge branch 'master' of github.com:ErikZalm/Marlin
Erik van der Zalm [Wed, 14 Sep 2011 16:57:32 +0000 (18:57 +0200)]
Merge branch 'master' of github.com:ErikZalm/Marlin

13 years agoSync with non-gen6 version
Erik van der Zalm [Wed, 14 Sep 2011 16:56:45 +0000 (18:56 +0200)]
Sync with non-gen6 version

13 years agoEdited README via GitHub
ErikZalm [Sun, 28 Aug 2011 21:09:18 +0000 (00:09 +0300)]
Edited README via GitHub

13 years agoFixed small feedrate bug.
Erik van der Zalm [Sun, 21 Aug 2011 16:29:47 +0000 (18:29 +0200)]
Fixed small feedrate bug.
Copied Camiels comments in the Configuration.h file

13 years agoFixed lookup table bug.
Erik van der Zalm [Mon, 15 Aug 2011 17:26:40 +0000 (19:26 +0200)]
Fixed lookup table bug.

13 years agoFix M109
Erik van der Zalm [Sun, 14 Aug 2011 20:15:33 +0000 (22:15 +0200)]
Fix M109

13 years agofirst-commit
Erik van der Zalm [Sat, 13 Aug 2011 08:09:54 +0000 (10:09 +0200)]
first-commit

13 years agoSigned-off-by: Erik van der Zalm <erik@vdzalm.eu>
Erik van der Zalm [Fri, 12 Aug 2011 20:31:59 +0000 (22:31 +0200)]
Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
13 years agofirst commit
Erik van der Zalm [Fri, 12 Aug 2011 20:28:35 +0000 (22:28 +0200)]
first commit