Commit Graph

699 Commits

Author SHA1 Message Date
Erik van der Zalm
408169aef4 Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/language.h
	Marlin/pins.h
2013-06-09 22:57:40 +02:00
Erik van der Zalm
bd96d22bfb Merge branch 'Marlin_v1' into thinkyhead
Conflicts:
	Marlin/Configuration.h
	Marlin/Configuration_adv.h
	Marlin/Marlin.h
	Marlin/Marlin_main.cpp
	Marlin/Servo.cpp
	Marlin/language.h
	Marlin/pins.h
	Marlin/planner.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
	README.md
2013-06-09 22:26:47 +02:00
Erik van der Zalm
6f4a6e531c Merge branch 'deltabot' into Marlin_v1 2013-06-09 13:55:18 +02:00
Erik van der Zalm
ff6fa09ecf Moved corexy implementation from stepper to planner
(Thanks iquizzle)
2013-06-09 13:10:06 +02:00
Erik van der Zalm
c8dcc7c208 Allow increasing the software PWM frequency. 2013-06-09 12:52:49 +02:00
Erik van der Zalm
373f3ecab3 Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/pins.h
2013-06-09 00:51:58 +02:00
kiyoshigawa
6a81291c57 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
This should fix issues with pull request 467, I hope.

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
	Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-06-08 08:48:18 -06:00
BorisLandoni
c1cb5977ee Update Configuration.h 2013-06-08 14:37:39 +02:00
BorisLandoni
8a5bd8a808 Update Configuration.h 2013-06-08 14:37:17 +02:00
BorisLandoni
6588933c04 Update Configuration.h 2013-06-07 18:36:16 +03:00
Scott Lahteine
5dabc95409 Apply all changes from latest Marlin_V1
Diffed and merged, preserving my updates
2013-06-06 15:49:25 -07:00
Gord Christmas
f4f30c9d64 Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles. 2013-06-06 07:36:52 -07:00
Erik van der Zalm
79374f0b93 Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1 2013-06-05 17:44:48 +02:00
kiyoshigawa
4b19c8552e Fixing changed Configuration.h settings to be default values per ErikZalm Request. 2013-06-04 12:01:55 -06:00
Erik van der Zalm
5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) 2013-05-29 19:29:30 +02:00
Gatulibu
b78fa6bb70 Added support for Megatronics v2.0 and Minitronics v1.0
merged from code downloaded from reprapworld.com
2013-05-28 14:03:31 +02:00
Erik van der Zalm
9be61cdc02 Added redundant temp sensor 2013-05-26 17:57:49 +02:00
Alexander Kasimir
e2ff536b03 Fixed typo in Comment 2013-05-22 16:02:03 +03:00
Robert F-C
0d4a9444c4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-19 08:50:58 +10:00
Gord Christmas
28ada096e2 Adding servo documentation 2013-05-18 06:01:58 -07:00
Robert F-C
dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-18 21:59:39 +10:00
Gord Christmas
dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. 2013-05-16 07:03:01 -07:00
Erik van der Zalm
bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes 2013-05-14 23:56:32 +02:00
gregor
2739c26c4f changes:
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
2013-05-10 22:20:02 +02:00
gregor
6fb9573157 added support for the reprapworld keypad 2013-05-10 21:57:17 +02:00
Tim Anderson
1fa61c297e Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion. 2013-05-06 23:23:54 -06:00
kiyoshigawa
b27a59f41e Added support for Elefu RA Board and Elefu Control Panel 2013-05-06 08:44:38 -06:00
Scott Lahteine
0ef54f2f85 Make M303 silent when "S0" is sent
If S is left out perhaps it should be silent, but check the spec for
this M code.
2013-05-02 09:55:15 -07:00
Scott Lahteine
a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
Also cosmetic comment changes and spelling corrections in printed
messages
2013-05-02 09:22:58 -07:00
Martin Renold
1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error 2013-05-01 08:30:24 +02:00
Robert F-C
c3cdaceab3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-04-29 22:13:55 +10:00
Robert F-C
788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-04-29 21:13:46 +10:00
Lukasz Stefanowicz
d71f1e9bf6 Add (as an option) slower SD transfer mode 2013-04-24 10:50:57 +02:00
MaikStohn
13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller 2013-04-16 14:21:39 +02:00
daid303
c80a78bb70 Lower the default max E feedrate a bit. With the stepper fix this is much to high. 2013-04-12 13:54:38 +02:00
ErikZalm
7a5c474d91 Update Configuration.h 2013-03-28 21:27:50 +01:00
ErikZalm
9fb8bd5685 Merge pull request #433 from whosawhatsis/bang-mode
Separate PID_MAX from BANG_MAX
2013-03-25 13:11:34 -07:00
Robert F-C
9322c408c6 Updated for LiquidTWI2 library version 1.2.3
The new version of the library means that PANELOLU no longer needs to be
defined in LiquidTWI.h (the library file can be used as is) and the new
version of the library also enables the buzzer on the Panucatt VIKI
panel.
2013-03-24 18:19:58 +11:00
whosawhatsis
fd5b7e0cec Separate PID_MAX from BANG_MAX
This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher
than PID_MAX. This is useful for powerful heaters to heat quickly in
bang-bang mode, but use a lower duty cycle that is easier to stabilize
in PID mode.
2013-03-22 18:16:26 -07:00
blddk
72419f69a9 Added rumba 2013-03-22 18:41:54 +01:00
Nicolas Rossi
aba67e2449 No bed config for RAMPS
The motherboard 35 is a config without bed with this pins setting :
D8 Extruder
D9 Fan
D10 Controller Fan
2013-03-05 15:51:24 +01:00
Robert F-C
7bad72359c Support encoder click on PANELOLU2 being read through I2C
This change also handles the case where the pause/stop/restart button on
the VIKI is not used. Make LCD I2C buzz sound the same as the normal
buzz (300ms is too long for quick feedback).
2013-03-03 18:47:50 +11:00
Robert F-C
1daf2f3256 Number of extruders is not an advanced configuration - it is a basic property. 2013-03-02 16:14:19 +11:00
Dirk Eichel
b2c1c64fb1 Add Motherboard variant 64 - STB V1.1
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
2013-03-01 17:39:54 +01:00
Robert F-C
6beb42cdf6 Attempt to address Bernhard's comments
Refactor configuration to try to make items clearer (what defines a
panel vs what is user changeable).
2013-03-01 01:17:07 +11:00
Robert F-C
839bef6d5d Fix Configuration.h file to not define LCDs be default.
Also fix compile time check in Marlin.pde
2013-02-28 02:32:20 +11:00
Robert F-C
1292d735ba Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
2013-02-28 02:04:51 +11:00
MendelMax
67710df9f3 Made i2c mode wok with the hardware I am able to test (ywrobot / sainsmart i2c LCD 2004)
Removed incorrect LiquidCrystal_I2C Library
2013-02-26 22:22:12 +00:00
Bob Clough
2b567d1df5 Added I2C port expander support to HD44780 2013-02-25 14:22:14 +00:00
Bob Clough
06272f463d Added Config variables for activating I2C LCDs and setting type and address 2013-02-25 14:14:46 +00:00
Denis B
70871715e4 Added support for extruder offset handling
The extruder offset can be specified in the configuration
file or adjusted on the fly using the "M218 T# X# Y#" command.
The EEPROM support is not yet merged in.
The "T#" command can take option "F#" that specifies the feedrate
at which the printing head should be re-positioned. If not
specified the re-positioning move is not preformed immediately,
but the coordinates are adjusted for the printer to properly
position the head when the next movement happens.
2013-02-04 23:05:45 -05:00
Daniele Sdei
9ecb267b63 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-01-14 15:47:40 +01:00
Daniele Sdei
3cf59f6f9a add RepRapPro Huxley thermistor tables 2013-01-14 15:36:08 +01:00
daid303
bbe7d3d0fe Fixed #312 2013-01-08 17:09:57 +01:00
daid303
8b88e3b386 Fixed #345, Fixed #267. 2013-01-08 12:14:55 +01:00
Nicolas Rossi
f3c1fc70a9 Power signal control definitions for ATX and others 2013-01-07 14:33:30 +01:00
Erik vd Zalm
6752cb2d9c PID now per extruder. Fixed typo 2013-01-06 14:26:23 +01:00
Erik vd Zalm
0ac452e252 Disable is now multi extruder compatible. M84 got a T option. 2013-01-06 13:37:01 +01:00
Johann Rocholl
9e7b5056a0 {X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates. 2012-12-28 16:20:10 -08:00
Johann Rocholl
1c2ecddae4 Fix typo (# missing before define). 2012-12-16 12:33:44 -08:00
Johann Rocholl
3b2e5027e5 Merged updates from Marlin_v1. 2012-12-16 12:19:24 -08:00
daid303
55ba90ac19 Add PID functional range setting. With high powered heaters the current functional range of 10 degrees causes high overshoots as the PID needs to kick in before the temperature hits 10 degrees below target. 2012-12-12 09:08:37 +01:00
daid303
5ff5cee8ce Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition) 2012-12-11 14:53:53 +01:00
Johann Rocholl
1f45cb0a51 Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments. 2012-12-11 01:54:40 -08:00
Johann Rocholl
c430906d3b Deltabot settings and configuration adjustments. 2012-12-10 00:10:56 -08:00
Johann Rocholl
42e21bb06e Add support for Printrboard (from https://github.com/lincomatic/Marlin) and Brainwave (from https://github.com/metrix/Sprinter). 2012-12-08 10:49:01 -08:00
Erik vd Zalm
f934d0ef5b Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
2012-11-21 20:36:30 +01:00
Martin Lukasik
2f771b3979 Added automatic build numbering. 2012-11-12 21:06:59 +00:00
daid303
a27fef8750 Store the pre-heat constants outside of the ULTIPANEL define, so we can use them when storing EEPROM in a build without the ULTIPANEL. 2012-11-11 11:06:58 +01:00
daid303
ffc69537aa Update on some comments, make the MOTHERBOARD list complete again. 2012-11-09 09:10:51 +01:00
Jonathan Bastien-Filiatrault
46b9988e26 Search and replace failure. 2012-11-07 16:09:30 -05:00
Jonathan Bastien-Filiatrault
36b452c7ac Remove abbrs. 2012-11-07 15:42:18 -05:00
Jonathan Bastien-Filiatrault
3cbaad9288 RepRapDiscount Smart Controller pin definitions. 2012-11-06 20:32:13 -05:00
Robert F-C
65c9a0728f Set default serial port back to 0. 2012-11-05 22:15:07 +11:00
Robert F-C
ab9d183024 Make serial port configurable.
This change makes the choice of serial port configurable so that
wireless capability can be easily added by connecting Bluetooth modules
(such as BlueSmirf or JY-MCU) to the expansion port pins.
2012-11-05 21:34:27 +11:00
brupje
326423719f Add support for Megatronics 2012-10-14 14:05:57 +03:00
ErikZalm
36a746d7d5 Merge pull request #244 from markfinn/pidbed
PID for heated bed
2012-10-08 11:15:16 -07:00
Mark Finn
04631d2250 cleanup for pull 2012-09-17 14:17:24 -05:00
ZetaPhoenix
c6caa45ae2 Limit Switch locations based on MIN/MAX limits and homing direction
fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
Relocated code based on feedback.
2012-09-15 15:25:49 -07:00
ZetaPhoenix
dc566d654f fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
2012-09-14 21:48:49 -07:00
Mark Finn
9698f4ea64 bed pid
Conflicts:

	Marlin/Configuration.h
2012-09-12 21:18:59 -05:00
Erik vd Zalm
e358a2d7af Added fix for SF Arc Point fillet procedure 2012-09-02 01:12:49 +02:00
tonokip
1c1fddc7ac Added support for the Rambo reprap electronics board. Added Mcodes to set
motor current and microstepping pins.
2012-08-30 00:16:57 -07:00
Erik vd Zalm
5406c533db Disable FAST_PWM by default. On some systems it does not work ok. 2012-08-11 15:51:04 +02:00
Dabble63
6b45e9f167 Add Duty Cycling to the Heater Bed 2012-08-11 09:17:47 +03:00
Chris Palmer
538189cc19 Fixed soft limits when the origin is in the middle.
HOME_POS is now always where the endstop is and can be outside the limits.
The limits are now defined by MIN_POS and MAX_POS rather than HOME_POS and MAX_LENGTH.
The Z is axis now homed first if direction is away from the bed.

Saguinololu limit pins change from MIN to MAX according to the homing direction.
2012-07-14 22:24:26 +02:00
Erik van der Zalm
ea2c19f978 Added CoreXY support (Thanks Ilan Moyer) 2012-07-14 14:21:53 +02:00
Erik van der Zalm
aa65fe22ed decoupled axes sucessfully at least on pure x or y jog 2012-07-14 13:43:19 +02:00
Bernhard
0c123950e9 __ header file replace 2012-06-02 20:44:17 +02:00
Bernhard
0e5e249ab5 added individual pullup setting option to have finer control in case there is a special z-min sensor, for example 2012-06-02 13:47:50 +02:00
Bernhard Kubicek
6b14f95b3e Merge pull request #170 from linagee/Marlin_v1
Marlin v1
2012-06-02 03:46:56 -07:00
linagee
fbd282b3ba Update Marlin/Configuration.h 2012-05-20 13:19:28 -06:00
linagee
c4490f5f3d Update Marlin/Configuration.h 2012-05-20 04:27:52 -06:00
Daid
7244aa7eb7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2012-05-19 17:38:46 +02:00
linagee
de2ca3b2e8 Grammar correction. 2012-05-19 07:40:35 -06:00
linagee
c2fc466e1b Update Marlin/Configuration.h 2012-05-19 05:56:17 -06:00
linagee
9f9f498491 Update Marlin/Configuration.h 2012-05-19 05:47:30 -06:00
Guan Yang
602c8ee02b Melzi support 2012-05-09 18:37:07 -04:00
Erik de Bruijn
e3fe1f0d00 Made a more granular configuration possible PREVENT_LENGTHY_EXTRUDE. You can now decide to allow/disallow large length of extrusions to be executed.
Turning off the protection might be beneficial to those who want to do fast and long reversals.
2012-05-08 17:44:08 +02:00
Erik van der Zalm
1874cb71a6 Added option to increase the FAN PWM frequency. 2012-05-02 19:26:14 +02:00
Erik van der Zalm
e3821bd86f Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2012-04-30 13:36:27 +02:00
Erik van der Zalm
02af69911e Added temperature window to M109. This is needed for systems with no overshoot PID. 2012-04-30 13:36:19 +02:00
Bernhard
464b755918 added support for the UltiController 2012-04-22 20:55:56 +02:00
Erik van der Zalm
67cf105bc6 Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
2012-04-15 19:17:33 +02:00
Erik van der Zalm
63aec3c56e Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
2012-03-25 14:36:51 +02:00
Michel Pollet
aa6e6e914e Makefile: Redone
+ Removed most explicit pathnames, use the standard make "VPATH" to let
make find the files for itself.

+ Added a "hardware variant" variable that allows compiging Sanguino and
Gen7 as well as "generic" arduino.

+ Allows overriding the MOTHERBOARD define from the Makefile

+ Removed the 'preprocessor' bit that wasn't needed, now just "include" the
files that are needed, since it allows gcc to show the right file/line
when displaying error/warnings.

+ Uses gcc's own dependency generator to generate the .d files, and
and include these instead of self-patching the makefile

Signed-off-by: Michel Pollet <buserror@gmail.com>
2012-03-22 13:48:10 +00:00
Erik van der Zalm
2e749d60c3 Added DISABLE_MAX_ENDSTOPS 2012-03-12 20:32:14 +01:00
Erik van der Zalm
910f4e77a2 Added 20MHz support. 2012-03-11 12:25:04 +01:00
Erik van der Zalm
e056bf8081 Added E-Jerk 2012-03-04 16:34:58 +01:00
Phil Hord
b65ef8d66c Add support for upcoming Gen7 v1.4
V1.4 moves thermistor power to the always-on 5v line.
The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer
needed on this board.  Add a new motherboard type to
support this feature.
2012-02-26 20:39:49 -05:00
Erik van der Zalm
97d42ca2b2 SDSUPPORT default disabled 2012-02-26 22:05:38 +01:00
Erik van der Zalm
018c567abf Moved SLOWDOWN function. (jetty840)
Included AD595 calibration options. (daid)
2012-02-26 16:23:47 +01:00
Erik van der Zalm
4fbda5c3f5 Merge remote-tracking branch 'daid/Marlin_v1' into Test 2012-02-26 16:10:59 +01:00
Erik van der Zalm
35e57bf149 Added gen6 deluxe. 2012-02-25 17:44:45 +01:00
Erik van der Zalm
84ea2d61e8 Moved gen7 boards to motherboard type 10, 11 and 12.
Split ramps1.3 in Sprinter like config and multiextruder config.
2012-02-24 23:34:41 +01:00
Erik van der Zalm
01d28c18ab Fixed casting warning in sanguino 2012-02-23 18:45:37 +01:00
Blair Thompson
2fd8c248fe 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!
2012-02-22 23:05:52 +00:00
Blair Thompson
d9f2f509d5 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
2012-02-22 22:51:04 +00:00
Erik van der Zalm
ae3e7586c6 Added HOME_POS. This adds the posibility to make the center 0
Updated the Xsteps ... settings via the LCD menu
2012-02-22 18:07:56 +01:00
Erik van der Zalm
8816ef1c64 Small fixes after merge 2012-02-21 20:36:43 +01:00
Erik van der Zalm
d298dd121f merged SBUBA82 and Justblair 2012-02-21 20:26:59 +01:00
Blair Thompson
a05a261b72 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
2012-02-18 23:56:31 +00:00
Blair Thompson
1b6765ed12 Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface 2012-02-18 18:25:04 +00:00
Christian Thalhammer
e661578c84 support for GEN7 1.1,1.2 and 1.3 2012-02-17 10:46:48 +01:00
Daid
73344e69c1 Added temperature offset/gain settings for AD595. 2012-02-16 11:05:08 +01:00
Christian Thalhammer
d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
2012-02-13 13:07:55 +01:00
Christian Thalhammer
0e3631ff4b smaller changes 2012-02-13 12:31:53 +01:00
Erik van der Zalm
fa2e1be0ca changed default EXTRUDE_MINTEMP to 170. 2012-02-12 17:38:54 +01:00
Erik van der Zalm
154de69c02 Print configuration.h version during startup (thanks hairykiwi) 2012-02-09 20:26:17 +01:00
Erik van der Zalm
9173a5713b Teensylu support. 2012-02-09 19:27:45 +01:00
Erik van der Zalm
bdb70c0509 Warning for 10k thermistor 2012-02-08 18:38:45 +01:00
Erik van der Zalm
d8a0c6450f Split the configuration file in two parts.
One for common settings.
One for advanced settings.
2012-02-07 20:23:43 +01:00
Erik van der Zalm
f9c5333f97 Made "stop heating wait" optional.
Default off.
2012-02-06 20:13:44 +01:00
Christian Thalhammer
13e2ad2831 - added info for using GEN7 configuration 2012-02-06 11:58:52 +01:00
Erik van der Zalm
9f139d6e0e Added MAX6675 support. (Thanks to gregfrost)
Needs some work to remove the blocking in read max6675.
2012-02-05 13:05:07 +01:00
Erik van der Zalm
e45e5c68bb 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>
2012-02-05 12:42:15 +01:00
Bernhard
212515148e added m240 photography support. default off 2011-12-22 12:11:39 +01:00
Bernhard
415aadf704 lcd panel bed support
advance and ultipanel not any more in default config
2011-12-22 11:45:52 +01:00
Erik van der Zalm
84d9cf7339 merging 2011-12-12 20:35:46 +01:00
Erik van der Zalm
e017228569 Merged multiple extruder support.
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
2011-12-12 19:34:37 +01:00
Bernhard
01001b89d2 repaired nozzle runout prevention to not collide with automatic stepper disabeling. 2011-12-11 15:42:56 +01:00
Bernhard
88ee053af0 heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now. 2011-12-09 17:07:44 +01:00
Bernhard
2bc5e7ec9e prevent too long extrudes, or too cold extrudes 2011-12-09 15:09:52 +01:00
Bernhard
aa4f9a6474 better values. 2011-12-09 14:09:34 +01:00
Bernhard
87fd249c43 made runout prevention independent of tempeorarily set esteps 2011-12-09 13:56:28 +01:00
Bernhard
1ec0c3b68a extruder runout prevention. 2011-12-09 13:39:00 +01:00
Bernhard
5b4625f79c 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. 2011-12-09 12:51:08 +01:00
Denis B
4fd75dc813 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
2011-12-06 00:09:16 -05:00
Erik van der Zalm
b99c49ec3b Add option to only check endstop when homing 2011-12-04 20:17:21 +01:00
Erik van der Zalm
95a0b28acb Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-12-04 19:54:43 +01:00
Erik van der Zalm
af22e9cd38 Some advance modifications 2011-12-04 19:54:07 +01:00
Bernhard
4f909963e4 make QUICKHOME configureable 2011-12-04 09:02:09 +01:00
Erik van der Zalm
6b86f15686 More 2nd extruder implementation. (Not usable)
Advance (not tested)
2011-12-02 17:45:05 +01:00
Bernhard
59205ac5fc 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.
2011-11-30 08:51:46 +01:00
Erik van der Zalm
f75f426dfa Removed interrupt nesting in the stepper ISR.
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
2011-11-27 21:12:55 +01:00
Erik van der Zalm
aad4b75b94 First parts 2nd extruder 2011-11-26 17:33:25 +01:00
Bernhard
a0dc66f7bf Home retract distance configureable per axis. 2011-11-26 12:04:06 +01:00
Bernhard
6d6f323535 make an option if sd-card stop should release the steppers. 2011-11-26 11:51:38 +01:00
Bernhard
74d0032e25 cooldown blocking selectable by #define. 2011-11-26 09:03:12 +01:00
Erik van der Zalm
c0f8c9fd72 Seperate ENDSTOP_INVERTING for X Y and Z
Added simple endstop filter.
Corrected M114 count display.
2011-11-25 13:43:06 +01:00
Erik van der Zalm
2e43f9c809 Changed min max temperature code. 2011-11-20 13:14:58 +01:00
Bernhard Kubicek
8a1e719a3f overworked config file 2011-11-19 20:52:43 +01:00
Bernhard Kubicek
f52e1a9571 autotemp working, default=disabled. 2011-11-19 17:07:44 +01:00
Bernhard Kubicek
70650c331d corrected the ultimaker default values, the previous had a calculation error: see: http://groups.google.com/group/ultimaker/browse_thread/thread/91906788639703cf 2011-11-19 14:50:31 +01:00
Erik van der Zalm
b15902d3b5 Fixed bug in configuration.h 2011-11-18 19:46:16 +01:00
Erik van der Zalm
e63e224a33 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde
2011-11-18 19:04:09 +01:00
Erik van der Zalm
e7dca8614b Advance experiments. Not working yet. 2011-11-18 18:59:17 +01:00
Bernhard Kubicek
46f80e82d9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
	Marlin/ultralcd.h
2011-11-15 22:53:04 +01:00
Bernhard Kubicek
a9c7da06e3 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
2011-11-15 22:50:43 +01:00
Bernhard Kubicek
7919a40d06 watchdog,percent done, 2011-11-15 20:54:40 +01:00
Erik van der Zalm
805d37f77b Fixed some small planner bugs 2011-11-15 18:14:00 +01:00
Erik van der Zalm
5fd41ae872 Some fixes in planner 2011-11-14 23:57:34 +01:00
Erik van der Zalm
95126c09c0 Added slowdown 2011-11-14 20:04:29 +01:00
Erik van der Zalm
331e82dcd3 Buffer size > 16 2011-11-14 18:53:09 +01:00
Erik van der Zalm
c00eefb824 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-14 18:26:57 +01:00
Erik van der Zalm
1d0452f10c 250000 baud 2011-11-14 18:24:02 +01:00
Bernhard Kubicek
c57906b627 fixed bug with adjusting ki in realtime. 2011-11-13 21:43:26 +01:00
Erik van der Zalm
ac82411c73 Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1 2011-11-13 20:46:44 +01:00
Erik van der Zalm
65934eee9c A lot of changes in the planner code 2011-11-13 20:42:08 +01:00
Bernhard Kubicek
36958ee305 minor changes and first not-well working version of autotemp 2011-11-09 22:09:16 +01:00
Bernhard Kubicek
27361e7cd0 beautified the config. ordered it into thematic sections. 2011-11-09 20:28:40 +01:00
Erik van der Zalm
d3bfffcb6e Corrected thermistor naming 2011-11-06 22:37:43 +01:00
Bernhard Kubicek
163efdf1c7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2011-11-06 19:49:04 +01:00
Bernhard Kubicek
87aaf0f70a static'ified Marlin.pde. 2011-11-06 19:48:37 +01:00
Erik van der Zalm
76b3f805c0 Added teensylu pins 2011-11-06 19:30:04 +01:00
Bernhard Kubicek
1d171e9e52 reformating and some minor bugs/things found on the way. 2011-11-06 19:23:08 +01:00
Bernhard Kubicek
2afb7bd4cf refactured temperature.cpp so that there are now abstract functions to access temperatures. 2011-11-06 14:03:41 +01:00
Erik van der Zalm
0b82465168 First arcs version. (Arcs not working ok) 2011-11-06 12:39:00 +01:00
Erik van der Zalm
2e8e8878e5 Corrected temp variables. 2011-11-05 20:21:09 +01:00
Erik van der Zalm
04d3b5537f 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
2011-11-05 20:03:38 +01:00
Erik van der Zalm
d15f01e1b4 Temperature changes 2011-11-05 19:21:36 +01:00
Bernhard Kubicek
00674af3a8 merge from the branch bkubicek/Marlin/zalmmerge 2011-11-05 14:13:20 +01:00
Erik van der Zalm
95d3d9847c M109 now equal to sprinter 2011-11-04 23:38:25 +01:00
Erik van der Zalm
bf879ceaa9 Added thermistor tables 2011-11-04 22:51:14 +01:00
Erik van der Zalm
094afe7c10 Merged Marlin, Marlin non gen6 and Ultimaker changes 2011-11-04 18:02:56 +01:00
Erik van der Zalm
8e017b81ab Sync with non-gen6 version 2011-09-14 18:56:45 +02:00
Erik van der Zalm
b5f6482dce Fixed small feedrate bug.
Copied Camiels comments in the Configuration.h file
2011-08-21 18:29:47 +02:00
Erik van der Zalm
26bf57e22c first-commit 2011-08-13 10:09:54 +02:00
Erik van der Zalm
750f6c33e3 first commit 2011-08-12 22:28:35 +02:00