chiark / gitweb /
marlin.git
13 years agoMakefile: generic pde=>cpp rule
Phil Hord [Thu, 16 Feb 2012 17:17:33 +0000 (12:17 -0500)]
Makefile: generic pde=>cpp rule

This adds flexibility to the makefile by allowing different pde
targets to be specified for different needs.

13 years agoChanged version => RC2
Erik van der Zalm [Sun, 26 Feb 2012 15:26:40 +0000 (16:26 +0100)]
Changed version => RC2

13 years agoMoved SLOWDOWN function. (jetty840)
Erik van der Zalm [Sun, 26 Feb 2012 15:23:47 +0000 (16:23 +0100)]
Moved SLOWDOWN function. (jetty840)
Included AD595 calibration options. (daid)

13 years agoMerge remote-tracking branch 'daid/Marlin_v1' into Test
Erik van der Zalm [Sun, 26 Feb 2012 15:10:59 +0000 (16:10 +0100)]
Merge remote-tracking branch 'daid/Marlin_v1' into Test

13 years agoFixes in pins.h
Erik van der Zalm [Sat, 25 Feb 2012 21:55:17 +0000 (22:55 +0100)]
Fixes in pins.h

13 years agoAdded gen6 deluxe.
Erik van der Zalm [Sat, 25 Feb 2012 16:44:45 +0000 (17:44 +0100)]
Added gen6 deluxe.

13 years agoMoved gen7 boards to motherboard type 10, 11 and 12.
Erik van der Zalm [Fri, 24 Feb 2012 22:34:41 +0000 (23:34 +0100)]
Moved gen7 boards to motherboard type 10, 11 and 12.
Split ramps1.3 in Sprinter like config and multiextruder config.

13 years agoChanged comment mode for detection.
Erik van der Zalm [Fri, 24 Feb 2012 19:42:07 +0000 (20:42 +0100)]
Changed comment mode for detection.
Added M221 extuder multiply factor.

13 years agoFix cast warning in Gen7
Erik van der Zalm [Thu, 23 Feb 2012 17:50:05 +0000 (18:50 +0100)]
Fix cast warning in Gen7

13 years agoFixed casting warning in sanguino
Erik van der Zalm [Thu, 23 Feb 2012 17:45:37 +0000 (18:45 +0100)]
Fixed casting warning in sanguino

13 years agoAdded Fan control to the pre-heat settings.
Blair Thompson [Wed, 22 Feb 2012 23:05:52 +0000 (23:05 +0000)]
Added Fan control to the pre-heat settings.

I find that the PID routine works better when the cooling fan is switched on
at the beginning of a warm up routine.  Otherwise when you enable the fan
just before a print, you have a delay as the PIDre-adjusts.

This should also be safer as most cooling fans are directed at the hot -ends
thermal barrier!

13 years agoAdded new menu items under the prepare submenu.
Blair Thompson [Wed, 22 Feb 2012 22:51:04 +0000 (22:51 +0000)]
Added new menu items under the prepare submenu.
Instead of a single pre-heat, now there is pre-heat ABS and PLA options
Added defines to the configuration file to adjust preheat temperatures for both

13 years agoAdded HOME_POS. This adds the posibility to make the center 0
Erik van der Zalm [Wed, 22 Feb 2012 17:07:56 +0000 (18:07 +0100)]
Added HOME_POS. This adds the posibility to make the center 0
Updated the Xsteps ... settings via the LCD menu

13 years agoChanged display format for some numbers.
Erik van der Zalm [Tue, 21 Feb 2012 22:05:43 +0000 (23:05 +0100)]
Changed display format for some numbers.

13 years agoSmall fixes after merge
Erik van der Zalm [Tue, 21 Feb 2012 19:36:43 +0000 (20:36 +0100)]
Small fixes after merge

13 years agomerged SBUBA82 and Justblair
Erik van der Zalm [Tue, 21 Feb 2012 19:26:59 +0000 (20:26 +0100)]
merged SBUBA82 and Justblair

13 years agoMerge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1
Erik van der Zalm [Tue, 21 Feb 2012 19:17:35 +0000 (20:17 +0100)]
Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1

13 years agovarious changes
Erik van der Zalm [Tue, 21 Feb 2012 19:17:28 +0000 (20:17 +0100)]
various changes

13 years agofixed manual axis movement lcd option
Christian Thalhammer [Tue, 21 Feb 2012 08:31:28 +0000 (09:31 +0100)]
fixed manual axis movement lcd option

13 years agoRemoved VS project files for tidyness stakes
Blair Thompson [Mon, 20 Feb 2012 22:39:39 +0000 (22:39 +0000)]
Removed VS project files for tidyness stakes

13 years agoAdded a structure that will allow easy translations/modifications to the LCD menu.
Blair Thompson [Mon, 20 Feb 2012 22:22:46 +0000 (22:22 +0000)]
Added a structure that will allow easy translations/modifications to the LCD menu.

Signed-off-by: Blair Thompson <mail@justblair.co.uk>
13 years agochange preheat to ABS values of nozzle 227 and be 105 °C
Christian Thalhammer [Mon, 20 Feb 2012 15:07:27 +0000 (16:07 +0100)]
change preheat to ABS values of nozzle 227 and be 105 °C
next try for manual axis movement

13 years agoInfos about fuses to use; correct fuses in boards.txt
Christian Thalhammer [Mon, 20 Feb 2012 09:25:51 +0000 (10:25 +0100)]
Infos about fuses to use; correct fuses in boards.txt

13 years agoAdded a workaround. Ramps SD card does not have sdcarddetect. My temporary solution...
Blair Thompson [Sat, 18 Feb 2012 23:56:31 +0000 (23:56 +0000)]
Added a workaround.  Ramps SD card does not have sdcarddetect.  My temporary solution is to add a momentary swtich
that pulls down the SDCARDDETECT pin and mimicking the pull and reinsert ofa a SD card

13 years agoUpdated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encode...
Blair Thompson [Sat, 18 Feb 2012 18:25:04 +0000 (18:25 +0000)]
Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface

13 years agoATMega1284P support for Arduino IDE
Christian Thalhammer [Fri, 17 Feb 2012 10:41:47 +0000 (11:41 +0100)]
ATMega1284P support for Arduino IDE
replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file

13 years agoadded infos for this fork
Christian Thalhammer [Fri, 17 Feb 2012 10:07:24 +0000 (11:07 +0100)]
added infos for this fork

13 years agosupport for GEN7 1.1,1.2 and 1.3
Christian Thalhammer [Fri, 17 Feb 2012 09:46:48 +0000 (10:46 +0100)]
support for GEN7 1.1,1.2 and 1.3

13 years agoAdded temperature offset/gain settings for AD595.
Daid [Thu, 16 Feb 2012 10:03:41 +0000 (11:03 +0100)]
Added temperature offset/gain settings for AD595.

13 years agoMerge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Christian Thalhammer [Mon, 13 Feb 2012 12:07:55 +0000 (13:07 +0100)]
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1

Conflicts:
Marlin/Configuration.h

13 years agoMerge remote branch 'upstream/Marlin_v1' into Marlin_v1
daid [Mon, 13 Feb 2012 11:39:00 +0000 (12:39 +0100)]
Merge remote branch 'upstream/Marlin_v1' into Marlin_v1

13 years agosmaller changes
Christian Thalhammer [Mon, 13 Feb 2012 11:31:53 +0000 (12:31 +0100)]
smaller changes

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 (06:22 +0800)]
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 (01:36 +0800)]
Corrected e-length calculation in planner

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 agolcd menue "move_axis" added
Christian Thalhammer [Tue, 7 Feb 2012 11:58:05 +0000 (12:58 +0100)]
lcd menue "move_axis" added

13 years agofixed sUICIDE_PIN disable
Christian Thalhammer [Tue, 7 Feb 2012 07:50:26 +0000 (08:50 +0100)]
fixed sUICIDE_PIN disable

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 agoadded arduino ide GEN7 support Files
Christian Thalhammer [Mon, 6 Feb 2012 13:11:25 +0000 (14:11 +0100)]
added arduino ide GEN7 support Files

13 years ago-disable TEMP Min MAX Kill while using PS_ON Pin
Christian Thalhammer [Mon, 6 Feb 2012 11:28:33 +0000 (12:28 +0100)]
-disable TEMP Min MAX Kill while using PS_ON Pin
ON GEN7 there is no temperature reading when power is off.. so Marlin
would kill itself. There seems to be an update from "Traumflug" on GEN7
using standby VCC for thermistors.

13 years ago-disabled CARDDETECT if PIN is set to -1
Christian Thalhammer [Mon, 6 Feb 2012 11:22:44 +0000 (12:22 +0100)]
-disabled CARDDETECT if PIN is set to -1
- redo disable Beeper if PIN is set to -1

13 years ago-added Configuration for GEN7 which worked for me
Christian Thalhammer [Mon, 6 Feb 2012 11:12:18 +0000 (12:12 +0100)]
-added Configuration for GEN7 which worked for me

13 years ago-disalbe beeper if BEEPER_PIN = -1
Christian Thalhammer [Mon, 6 Feb 2012 11:10:32 +0000 (12:10 +0100)]
-disalbe beeper if BEEPER_PIN = -1

13 years ago- added info for using GEN7 configuration
Christian Thalhammer [Mon, 6 Feb 2012 10:58:52 +0000 (11:58 +0100)]
- added info for using GEN7 configuration

13 years ago- added support for ATMega1284P
Christian Thalhammer [Mon, 6 Feb 2012 10:55:56 +0000 (11:55 +0100)]
- added support for ATMega1284P

13 years ago- Pins for modified GEN7 assigned
Christian Thalhammer [Mon, 6 Feb 2012 10:49:23 +0000 (11:49 +0100)]
- Pins for modified GEN7 assigned
- Added support for ATMega1284

13 years agoMerge remote-tracking branch 'upstream/master' into Marlin_v1
Christian Thalhammer [Mon, 6 Feb 2012 10:37:07 +0000 (11:37 +0100)]
Merge remote-tracking branch 'upstream/master' into Marlin_v1

Conflicts:
README

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