chiark / gitweb /
marlin.git
13 years agoCorrectly build the produced applet/Marlin.cpp source
Guillaume Seguin [Fri, 24 Feb 2012 20:21:19 +0000 (21:21 +0100)]
Correctly build the produced applet/Marlin.cpp source

13 years agochanged default EXTRUDE_MINTEMP to 170.
Erik van der Zalm [Sun, 12 Feb 2012 16:38:54 +0000 (17:38 +0100)]
changed default EXTRUDE_MINTEMP to 170.

13 years agoFixed small merge bug
Erik van der Zalm [Sun, 12 Feb 2012 13:06:08 +0000 (14:06 +0100)]
Fixed small merge bug

13 years agomerged with triffid fork
Erik van der Zalm [Sun, 12 Feb 2012 12:58:36 +0000 (13:58 +0100)]
merged with triffid fork

13 years agoremoved unused HEATING_EARLY_FINISH_DEG_OFFSET
Erik van der Zalm [Sat, 11 Feb 2012 22:22:16 +0000 (23:22 +0100)]
removed unused HEATING_EARLY_FINISH_DEG_OFFSET
Simplified stepper inactive time

13 years agoCorrected e-length calculation in planner
Erik van der Zalm [Sat, 11 Feb 2012 17:36:42 +0000 (18:36 +0100)]
Corrected e-length calculation in planner

13 years agoMerge pull request #61 from daid/Marlin_v1
ErikZalm [Sat, 11 Feb 2012 15:36:24 +0000 (07:36 -0800)]
Merge pull request #61 from daid/Marlin_v1

Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.

13 years agoUpdated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.
daid [Sat, 11 Feb 2012 15:02:47 +0000 (16:02 +0100)]
Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.

13 years agoChanged check i mtion_conrol
Erik van der Zalm [Thu, 9 Feb 2012 20:02:01 +0000 (21:02 +0100)]
Changed check i mtion_conrol
if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001)
(thanks mooselake)

13 years agoFixed M109 timer overflow (reported by triffid)
Erik van der Zalm [Thu, 9 Feb 2012 19:54:49 +0000 (20:54 +0100)]
Fixed M109 timer overflow (reported by triffid)

13 years agoPrint configuration.h version during startup (thanks hairykiwi)
Erik van der Zalm [Thu, 9 Feb 2012 19:26:17 +0000 (20:26 +0100)]
Print configuration.h version during startup (thanks hairykiwi)

13 years agoCorrected distance calculation. (thanks jv4779)
Erik van der Zalm [Thu, 9 Feb 2012 18:53:06 +0000 (19:53 +0100)]
Corrected distance calculation. (thanks jv4779)

13 years agoFixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid)
Erik van der Zalm [Thu, 9 Feb 2012 18:38:53 +0000 (19:38 +0100)]
Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid)

13 years agoTeensylu support.
Erik van der Zalm [Thu, 9 Feb 2012 18:27:45 +0000 (19:27 +0100)]
Teensylu support.

13 years agoFixed ultimaker heater 1 pins. (Thanks daid)
Erik van der Zalm [Thu, 9 Feb 2012 16:19:45 +0000 (17:19 +0100)]
Fixed ultimaker heater 1 pins. (Thanks daid)

13 years agoWarning for 10k thermistor
Erik van der Zalm [Wed, 8 Feb 2012 17:38:45 +0000 (18:38 +0100)]
Warning for 10k thermistor

13 years agoRC 1
Erik van der Zalm [Wed, 8 Feb 2012 17:28:54 +0000 (18:28 +0100)]
RC 1

13 years agoSplit the configuration file in two parts.
Erik van der Zalm [Tue, 7 Feb 2012 19:23:43 +0000 (20:23 +0100)]
Split the configuration file in two parts.
One for common settings.
One for advanced settings.

13 years agoMade "stop heating wait" optional.
Erik van der Zalm [Mon, 6 Feb 2012 19:13:44 +0000 (20:13 +0100)]
Made "stop heating wait" optional.
Default off.

13 years agoFix Z_LATE_ENABLE
Erik van der Zalm [Mon, 6 Feb 2012 16:38:16 +0000 (17:38 +0100)]
Fix Z_LATE_ENABLE

13 years agofixed z-disable bug.
Erik van der Zalm [Sun, 5 Feb 2012 20:14:55 +0000 (21:14 +0100)]
fixed z-disable bug.

13 years agoAdded MAX6675 support. (Thanks to gregfrost)
Erik van der Zalm [Sun, 5 Feb 2012 12:05:07 +0000 (13:05 +0100)]
Added MAX6675 support. (Thanks to gregfrost)
Needs some work to remove the blocking in read max6675.

13 years agoAdded support for Gen3+ (Pins file only)
Erik van der Zalm [Sun, 5 Feb 2012 11:42:15 +0000 (12:42 +0100)]
Added support for Gen3+ (Pins file only)
Added late z enable. (blddk request)
Only calculate look ahead if >2 moves in buffer.
Removed some FORCE_INLINE to save memory.

Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
13 years agoMerge pull request #54 from haxar/patch-1
ErikZalm [Sun, 5 Feb 2012 10:19:35 +0000 (02:19 -0800)]
Merge pull request #54 from haxar/patch-1

M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (p...

13 years agomore work on Makefile - actually rebuilds if Makefile or Configuration.h are altered...
Michael Moon [Wed, 25 Jan 2012 09:46:27 +0000 (20:46 +1100)]
more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output

13 years agolocal configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes
Michael Moon [Tue, 24 Jan 2012 06:02:45 +0000 (17:02 +1100)]
local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes

13 years agoPROGMEM elements must be const
Michael Moon [Tue, 24 Jan 2012 04:57:42 +0000 (15:57 +1100)]
PROGMEM elements must be const

13 years agoenable auto-reset before programming, disable afterwards
Michael Moon [Tue, 24 Jan 2012 03:25:28 +0000 (14:25 +1100)]
enable auto-reset before programming, disable afterwards

13 years agoget M81 working
Michael Moon [Tue, 24 Jan 2012 03:24:41 +0000 (14:24 +1100)]
get M81 working

13 years agohelp residency not overflow
Michael Moon [Tue, 24 Jan 2012 03:24:24 +0000 (14:24 +1100)]
help residency not overflow

13 years agomy local configuration
Michael Moon [Tue, 24 Jan 2012 02:19:37 +0000 (13:19 +1100)]
my local configuration

13 years agocardreader needs to include some other files
Michael Moon [Tue, 24 Jan 2012 02:19:24 +0000 (13:19 +1100)]
cardreader needs to include some other files

13 years agoallow Marlin to actually compile with Makefile pulled from Sprinter and a few other...
Michael Moon [Tue, 24 Jan 2012 02:18:54 +0000 (13:18 +1100)]
allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications

13 years agoM109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface...
haxar [Sun, 22 Jan 2012 11:25:56 +0000 (03:25 -0800)]
M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface) could not see target extruder heater temperature to continue print

13 years agom115 eol fix
Bernhard [Sun, 15 Jan 2012 19:51:49 +0000 (20:51 +0100)]
m115 eol fix

13 years agosmall mistake
Bernhard [Sun, 15 Jan 2012 17:31:21 +0000 (18:31 +0100)]
small mistake

13 years agoadded suicide pin for a power supply to the arduino that is only active if the arduin...
Bernhard [Sun, 15 Jan 2012 16:06:10 +0000 (17:06 +0100)]
added suicide pin for a power supply to the arduino that is only active if the arduino is holding high for an output.

13 years agomade sd code only compile with SDSUPPORT defined. safes 10k of codespace
Bernhard [Mon, 26 Dec 2011 08:28:51 +0000 (09:28 +0100)]
made sd code only compile with SDSUPPORT defined. safes 10k of codespace

13 years agofix autostart failure if in wrong directory
Bernhard [Mon, 26 Dec 2011 08:20:33 +0000 (09:20 +0100)]
fix autostart failure if in wrong directory

13 years agofix duplicated definition of MOSI MISO pins in case motherboard==33
Bernhard [Mon, 26 Dec 2011 08:20:21 +0000 (09:20 +0100)]
fix duplicated definition of MOSI MISO pins in case motherboard==33

13 years agoone step closer to a functional makefile..
Bernhard [Thu, 22 Dec 2011 15:43:28 +0000 (16:43 +0100)]
one step closer to a functional makefile..

13 years agostarting with sanguino arduino 1.0 compatibility
Bernhard [Thu, 22 Dec 2011 15:11:15 +0000 (16:11 +0100)]
starting with sanguino arduino 1.0 compatibility

13 years agoadd wiring.h, that can be used to overwrite:
Bernhard [Thu, 22 Dec 2011 13:57:28 +0000 (14:57 +0100)]
add wiring.h, that can be used to overwrite:
 arduino-0023/hardware/arduino/cores/arduino/wiring.h
this is necessary if the avr libraries are recent, but arduino is old. Alternative: newer arduino

13 years agosimplified the includes, makefile now works with arduino23
Bernhard [Thu, 22 Dec 2011 13:55:45 +0000 (14:55 +0100)]
simplified the includes, makefile now works with arduino23

13 years agoheader file simplification
Bernhard [Thu, 22 Dec 2011 11:38:50 +0000 (12:38 +0100)]
header file simplification

13 years agoadded m240 photography support. default off
Bernhard [Thu, 22 Dec 2011 11:11:39 +0000 (12:11 +0100)]
added m240 photography support. default off

13 years agocooldown
Bernhard [Thu, 22 Dec 2011 11:02:33 +0000 (12:02 +0100)]
cooldown

13 years agolcd panel bed support
Bernhard [Thu, 22 Dec 2011 10:45:52 +0000 (11:45 +0100)]
lcd panel bed support
advance and ultipanel not any more in default config

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard [Thu, 22 Dec 2011 08:22:39 +0000 (09:22 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

13 years agoRevert "untestest commit, so I don't loose code.. features runout prevention addons"
Bernhard [Thu, 22 Dec 2011 08:22:22 +0000 (09:22 +0100)]
Revert "untestest commit, so I don't loose code.. features runout prevention addons"

This reverts commit 651cde8b98b9499796e96cad9e267dcd6bbb86d4.

13 years agountestest commit, so I don't loose code.. features runout prevention addons
Bernhard [Thu, 22 Dec 2011 08:20:34 +0000 (09:20 +0100)]
untestest commit, so I don't loose code.. features runout prevention addons

13 years agoFiexed E_ENABLE_PIN errors
Erik van der Zalm [Thu, 15 Dec 2011 10:59:07 +0000 (11:59 +0100)]
Fiexed E_ENABLE_PIN errors

13 years agoG92 fix
Erik van der Zalm [Mon, 12 Dec 2011 19:43:47 +0000 (20:43 +0100)]
G92 fix

13 years agomerging
Erik van der Zalm [Mon, 12 Dec 2011 19:35:46 +0000 (20:35 +0100)]
merging

13 years agoMerged multiple extruder support.
Erik van der Zalm [Mon, 12 Dec 2011 18:34:37 +0000 (19:34 +0100)]
Merged multiple extruder support.
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF

13 years agomake autotemp compatile for use without pid
Bernhard [Sun, 11 Dec 2011 21:25:52 +0000 (22:25 +0100)]
make autotemp compatile for use without pid

13 years agoultralcd can now also stop the wait loop for the hot-end m109 heating when stopping...
Bernhard [Sun, 11 Dec 2011 21:18:50 +0000 (22:18 +0100)]
ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints.

13 years agoinstant stop of sd prints from the panel.
Bernhard [Sun, 11 Dec 2011 21:10:06 +0000 (22:10 +0100)]
instant stop of sd prints from the panel.

13 years agorepaired nozzle runout prevention to not collide with automatic stepper disabeling.
Bernhard [Sun, 11 Dec 2011 14:42:56 +0000 (15:42 +0100)]
repaired nozzle runout prevention to not collide with automatic stepper disabeling.

13 years agoheating up santity, formarly knows as "watchdog", but renamed due to the existance...
Bernhard [Fri, 9 Dec 2011 16:06:56 +0000 (17:06 +0100)]
heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now.

13 years agost_synchronize back to normal..
Bernhard [Fri, 9 Dec 2011 15:13:58 +0000 (16:13 +0100)]
st_synchronize back to normal..

13 years agoMerge pull request #29 from k-eex/Marlin_v1
Bernhard Kubicek [Fri, 9 Dec 2011 14:37:42 +0000 (06:37 -0800)]
Merge pull request #29 from k-eex/Marlin_v1

Fix M201 not saving settings in all places, so the changes did not get written into EEPROM

13 years agodisable steppers in runout prevention
Bernhard [Fri, 9 Dec 2011 14:37:24 +0000 (15:37 +0100)]
disable steppers in runout prevention

13 years agoprevent too long extrudes, or too cold extrudes
Bernhard [Fri, 9 Dec 2011 14:09:52 +0000 (15:09 +0100)]
prevent too long extrudes, or too cold extrudes

13 years agobetter values.
Bernhard [Fri, 9 Dec 2011 13:07:32 +0000 (14:07 +0100)]
better values.

13 years agomade runout prevention independent of tempeorarily set esteps
Bernhard [Fri, 9 Dec 2011 12:56:28 +0000 (13:56 +0100)]
made runout prevention independent of tempeorarily set esteps

13 years agoextruder runout prevention.
Bernhard [Fri, 9 Dec 2011 12:39:00 +0000 (13:39 +0100)]
extruder runout prevention.

13 years agoadded a partial release option to "m84" aka "stepper release". If you do tiny layers...
Bernhard [Fri, 9 Dec 2011 11:51:08 +0000 (12:51 +0100)]
added a partial release option to "m84" aka "stepper release". If you do tiny layers, you might want to keep the z-axis powered to not loose height positioning after homeing.

13 years agoadded autostart procedure trigger to the ultralcd menu
Bernhard [Fri, 9 Dec 2011 11:33:00 +0000 (12:33 +0100)]
added autostart procedure trigger to the ultralcd menu

13 years agofixed the st_synchronize. it would have continued if there is only the last move...
Bernhard [Fri, 9 Dec 2011 11:32:31 +0000 (12:32 +0100)]
fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped.

13 years agoFix M201 not saving settings in all places, so the changes did not get written into...
Keegi [Thu, 8 Dec 2011 10:25:32 +0000 (12:25 +0200)]
Fix M201 not saving settings in all places, so the changes did not get written into EEPROM

13 years agoz homing sound fix, for now until the actual cause is found..
Bernhard [Wed, 7 Dec 2011 22:08:13 +0000 (23:08 +0100)]
z homing sound fix, for now until the actual cause is found..

13 years agomoved <stdio.h> to more dominant location.
Bernhard [Wed, 7 Dec 2011 19:56:47 +0000 (20:56 +0100)]
moved <stdio.h> to more dominant location.

13 years agorepaired homing position setting.
Bernhard [Wed, 7 Dec 2011 19:54:34 +0000 (20:54 +0100)]
repaired homing position setting.

13 years agoMerge branch 'Marlin_v1' of https://github.com/dob71/Marlin into Marlin_v1
Erik van der Zalm [Wed, 7 Dec 2011 18:57:39 +0000 (19:57 +0100)]
Merge branch 'Marlin_v1' of https://github.com/dob71/Marlin into Marlin_v1

13 years agoMerge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm [Wed, 7 Dec 2011 18:55:17 +0000 (19:55 +0100)]
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

13 years agoWorking version of multiple extruders (up to 3)
Denis B [Tue, 6 Dec 2011 04:33:33 +0000 (23:33 -0500)]
Working version of multiple extruders (up to 3)
- The temperature control is pretty much complete
  (not sure what to do w/ autotemp though)
  Changed the pins assignment to clearly separate bed and extruder heaters
  and temp sensors, changed a bit how termistor tables are handled.
- The steppers control is rudimentary
  (only chanages what pins it uses depending on the active_extruder var,
   but that's enough for switching extruder in the start.gcode in the
   the profiles)
- Tested only w/ RAMPS 1.4

13 years agoMerge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Bernhard [Sun, 4 Dec 2011 21:27:37 +0000 (22:27 +0100)]
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

13 years agoadded M503 to display eeprom storage, and renamed eeprom routings. This version is...
Bernhard [Sun, 4 Dec 2011 21:26:42 +0000 (22:26 +0100)]
added M503 to display eeprom storage, and renamed eeprom routings. This version is compatible with the qtmarlin eeprom-tab.

13 years agoUpdate endstops only for homing. (use less resources when not used)
Erik van der Zalm [Sun, 4 Dec 2011 20:03:02 +0000 (21:03 +0100)]
Update endstops only for homing. (use less resources when not used)

13 years agoAdd option to only check endstop when homing
Erik van der Zalm [Sun, 4 Dec 2011 19:17:21 +0000 (20:17 +0100)]
Add option to only check endstop when homing

13 years agoMerge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Erik van der Zalm [Sun, 4 Dec 2011 18:54:43 +0000 (19:54 +0100)]
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

13 years agoSome advance modifications
Erik van der Zalm [Sun, 4 Dec 2011 18:54:07 +0000 (19:54 +0100)]
Some advance modifications

13 years agosolved some compiler warnings that are now visible in arduino 1.0.
Bernhard [Sun, 4 Dec 2011 11:40:18 +0000 (12:40 +0100)]
solved some compiler warnings that are now visible in arduino 1.0.
Found a couple of unused variables, that I commented.
Tried to solve the program memory warning message, and failed.

13 years agooverworked autotemp, removed one layer of nesting from the ultralcd.
Bernhard [Sun, 4 Dec 2011 08:48:53 +0000 (09:48 +0100)]
overworked autotemp, removed one layer of nesting from the ultralcd.

13 years agomake QUICKHOME configureable
Bernhard [Sun, 4 Dec 2011 08:02:09 +0000 (09:02 +0100)]
make QUICKHOME configureable

13 years agoMore 2nd extruder implementation. (Not usable)
Erik van der Zalm [Fri, 2 Dec 2011 16:45:05 +0000 (17:45 +0100)]
More 2nd extruder implementation. (Not usable)
Advance (not tested)

13 years agomake it compile with arduino 1.0 ; function is still untested.
Bernhard [Thu, 1 Dec 2011 15:38:01 +0000 (16:38 +0100)]
make it compile with arduino 1.0 ; function is still untested.

13 years agomore fixing of the sanguino math round problem
Bernhard [Wed, 30 Nov 2011 08:07:56 +0000 (09:07 +0100)]
more fixing of the sanguino math round problem

13 years agoremoved stream.h referenece from marlinserial.
Bernhard [Wed, 30 Nov 2011 07:57:30 +0000 (08:57 +0100)]
removed stream.h referenece from marlinserial.

13 years agopreliminiary implementation for the early heating finish.
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.

13 years agomade it compile if arduino decides to include files in a differnt order. DEC HEX...
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

13 years agofirst homing move diagonal towards home switches.
Bernhard [Tue, 29 Nov 2011 21:06:31 +0000 (22:06 +0100)]
first homing move diagonal towards home switches.

13 years agorepaired compiliation in windows
Bernhard [Mon, 28 Nov 2011 21:45:40 +0000 (22:45 +0100)]
repaired compiliation in windows

13 years agomore inlines
Bernhard [Mon, 28 Nov 2011 21:11:17 +0000 (22:11 +0100)]
more inlines

13 years agopossible stepper release after sd printing
Bernhard [Mon, 28 Nov 2011 21:09:17 +0000 (22:09 +0100)]
possible stepper release after sd printing

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

13 years agoforce inline
Bernhard [Mon, 28 Nov 2011 20:51:44 +0000 (21:51 +0100)]
force inline

13 years agoMoved M88 into M84. (M84 E)
Erik van der Zalm [Mon, 28 Nov 2011 20:49:54 +0000 (21:49 +0100)]
Moved M88 into M84. (M84 E)

13 years agoMerge branch 'smallopt' into Marlin_v1
Bernhard [Mon, 28 Nov 2011 20:36:01 +0000 (21:36 +0100)]
Merge branch 'smallopt' into Marlin_v1

Conflicts:
Marlin/temperature.h