018c567abf
Moved SLOWDOWN function. (jetty840) Included AD595 calibration options. (daid)
Erik van der Zalm
2012-02-26 16:23:47 +01:00
4fbda5c3f5
Merge remote-tracking branch 'daid/Marlin_v1' into Test
Erik van der Zalm
2012-02-26 16:10:59 +01:00
ce714fe306
Fixes in pins.h
Erik van der Zalm
2012-02-25 22:55:17 +01:00
35e57bf149
Added gen6 deluxe.
Erik van der Zalm
2012-02-25 17:44:45 +01:00
84ea2d61e8
Moved gen7 boards to motherboard type 10, 11 and 12. Split ramps1.3 in Sprinter like config and multiextruder config.
Erik van der Zalm
2012-02-24 23:34:41 +01:00
adc108d79e
Correctly build the produced applet/Marlin.cpp source
Guillaume Seguin
2012-02-24 21:21:19 +01:00
5aa9c41ab1
Changed comment mode for detection. Added M221 extuder multiply factor.
Erik van der Zalm
2012-02-24 20:42:07 +01:00
00690f7ffd
Fix cast warning in Gen7
Erik van der Zalm
2012-02-23 18:50:05 +01:00
01d28c18ab
Fixed casting warning in sanguino
Erik van der Zalm
2012-02-23 18:45:37 +01:00
2fd8c248fe
Added Fan control to the pre-heat settings.
Blair Thompson
2012-02-22 23:05:52 +00:00
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
Blair Thompson
2012-02-22 22:51:04 +00:00
ae3e7586c6
Added HOME_POS. This adds the posibility to make the center 0 Updated the Xsteps ... settings via the LCD menu
Erik van der Zalm
2012-02-22 18:07:56 +01:00
df1437bd86
Changed display format for some numbers.
Erik van der Zalm
2012-02-21 23:05:43 +01:00
8816ef1c64
Small fixes after merge
Erik van der Zalm
2012-02-21 20:36:43 +01:00
d298dd121f
merged SBUBA82 and Justblair
Erik van der Zalm
2012-02-21 20:26:59 +01:00
2cc9a89830
Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1
Erik van der Zalm
2012-02-21 20:17:35 +01:00
a0a1f81913
various changes
Erik van der Zalm
2012-02-21 20:17:28 +01:00
8a8ea50f33
fixed manual axis movement lcd option
Christian Thalhammer
2012-02-21 09:31:28 +01:00
b976692d0f
Removed VS project files for tidyness stakes
Blair Thompson
2012-02-20 22:39:39 +00:00
fe940a142d
Added a structure that will allow easy translations/modifications to the LCD menu.
Blair Thompson
2012-02-20 22:22:46 +00:00
b3fb09a20c
change preheat to ABS values of nozzle 227 and be 105 C next try for manual axis movement
Christian Thalhammer
2012-02-20 16:07:27 +01:00
6a3f8cf23f
Infos about fuses to use; correct fuses in boards.txt
Christian Thalhammer
2012-02-20 10:25:51 +01:00
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
Blair Thompson
2012-02-18 23:56:31 +00:00
1b6765ed12
Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface
Blair Thompson
2012-02-18 18:25:04 +00:00
1ff99ae25f
ATMega1284P support for Arduino IDE replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file
Christian Thalhammer
2012-02-17 11:41:47 +01:00
234fe8ea67
added infos for this fork
Christian Thalhammer
2012-02-17 11:07:24 +01:00
e661578c84
support for GEN7 1.1,1.2 and 1.3
Christian Thalhammer
2012-02-17 10:46:48 +01:00
73344e69c1
Added temperature offset/gain settings for AD595.
Daid
2012-02-16 11:03:41 +01:00
d309565b56
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Christian Thalhammer
2012-02-13 13:07:55 +01:00
2a77c84c8f
Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.
daid
2012-02-11 16:02:47 +01:00
d47a3e5950
Changed check i mtion_conrol if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001) (thanks mooselake)
Erik van der Zalm
2012-02-09 21:02:01 +01:00
f87c80889f
Fixed M109 timer overflow (reported by triffid)
Erik van der Zalm
2012-02-09 20:54:49 +01:00
154de69c02
Print configuration.h version during startup (thanks hairykiwi)
Erik van der Zalm
2012-02-09 20:26:17 +01:00
6ef8459494
Corrected distance calculation. (thanks jv4779)
Erik van der Zalm
2012-02-09 19:53:06 +01:00
598eb1d4f1
Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid)
Erik van der Zalm
2012-02-09 19:38:53 +01:00
9173a5713b
Teensylu support.
Erik van der Zalm
2012-02-09 19:27:45 +01:00
da040fd393
Fixed ultimaker heater 1 pins. (Thanks daid)
Erik van der Zalm
2012-02-09 17:19:45 +01:00
bdb70c0509
Warning for 10k thermistor
Erik van der Zalm
2012-02-08 18:38:45 +01:00
5113513cb2
RC 1
Erik van der Zalm
2012-02-08 18:28:54 +01:00
d8a0c6450f
Split the configuration file in two parts. One for common settings. One for advanced settings.
Erik van der Zalm
2012-02-07 20:23:43 +01:00
4cc8e37bf1
lcd menue "move_axis" added
Christian Thalhammer
2012-02-07 12:58:05 +01:00
b5fae1104b
fixed sUICIDE_PIN disable
Christian Thalhammer
2012-02-07 08:50:26 +01:00
f9c5333f97
Made "stop heating wait" optional. Default off.
Erik van der Zalm
2012-02-06 20:13:44 +01:00
292ddd2edb
Fix Z_LATE_ENABLE
Erik van der Zalm
2012-02-06 17:38:16 +01:00
25cd8af536
added arduino ide GEN7 support Files
Christian Thalhammer
2012-02-06 14:11:25 +01:00
14702089ee
-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.
Christian Thalhammer
2012-02-06 12:28:33 +01:00
b51e8bf7e5
-disabled CARDDETECT if PIN is set to -1 - redo disable Beeper if PIN is set to -1
Christian Thalhammer
2012-02-06 12:22:44 +01:00
3183a14755
-added Configuration for GEN7 which worked for me
Christian Thalhammer
2012-02-06 12:12:18 +01:00
5edef148fe
-disalbe beeper if BEEPER_PIN = -1
Christian Thalhammer
2012-02-06 12:10:32 +01:00
13e2ad2831
- added info for using GEN7 configuration
Christian Thalhammer
2012-02-06 11:58:52 +01:00
59cc5f889e
- added support for ATMega1284P
Christian Thalhammer
2012-02-06 11:55:56 +01:00
a11f3b2d2f
- Pins for modified GEN7 assigned - Added support for ATMega1284
Christian Thalhammer
2012-02-06 11:49:23 +01:00
b0070a244a
Merge remote-tracking branch 'upstream/master' into Marlin_v1
Christian Thalhammer
2012-02-06 11:37:07 +01:00
abb7e63906
fixed z-disable bug.
Erik van der Zalm
2012-02-05 21:14:55 +01:00
9f139d6e0e
Added MAX6675 support. (Thanks to gregfrost) Needs some work to remove the blocking in read max6675.
Erik van der Zalm
2012-02-05 13:05:07 +01:00
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.
Erik van der Zalm
2012-02-05 12:42:15 +01:00
9c918a497b
more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output
Michael Moon
2012-01-25 20:46:27 +11:00
ab01658fd2
local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes
Michael Moon
2012-01-24 17:02:45 +11:00
42bedb3f60
PROGMEM elements must be const
Michael Moon
2012-01-24 15:57:42 +11:00
a991bde523
enable auto-reset before programming, disable afterwards
Michael Moon
2012-01-24 14:25:28 +11:00
3e575533c5
get M81 working
Michael Moon
2012-01-24 14:24:41 +11:00
2ae2ead97b
help residency not overflow
Michael Moon
2012-01-24 14:24:24 +11:00
71dc82e0b4
my local configuration
Michael Moon
2012-01-24 13:19:37 +11:00
5aadc2f5ca
cardreader needs to include some other files
Michael Moon
2012-01-24 13:19:24 +11:00
8d0916af13
allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications
Michael Moon
2012-01-24 13:18:54 +11:00
6cc6029d7a
M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface) could not see target extruder heater temperature to continue print
haxar
2012-01-22 03:25:56 -08:00
157aa7f2fd
m115 eol fix
Bernhard
2012-01-15 20:51:49 +01:00
7aeb45303d
small mistake
Bernhard
2012-01-15 18:31:21 +01:00
cee5f9020a
added suicide pin for a power supply to the arduino that is only active if the arduino is holding high for an output.
Bernhard
2012-01-15 17:06:10 +01:00
3814bbb529
made sd code only compile with SDSUPPORT defined. safes 10k of codespace
Bernhard
2011-12-26 09:28:51 +01:00
729cde4475
fix autostart failure if in wrong directory
Bernhard
2011-12-26 09:20:33 +01:00
396270a0de
fix duplicated definition of MOSI MISO pins in case motherboard==33
Bernhard
2011-12-26 09:20:21 +01:00
11f2dafc4e
one step closer to a functional makefile..
Bernhard
2011-12-22 16:43:28 +01:00
8463e39a4a
starting with sanguino arduino 1.0 compatibility
Bernhard
2011-12-22 16:11:15 +01:00
2bc160a978
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
Bernhard
2011-12-22 14:57:28 +01:00
57f9359a41
simplified the includes, makefile now works with arduino23
Bernhard
2011-12-22 14:55:45 +01:00
3c1a4aac2b
header file simplification
Bernhard
2011-12-22 12:38:50 +01:00
212515148e
added m240 photography support. default off
Bernhard
2011-12-22 12:11:39 +01:00
6735025428
cooldown
Bernhard
2011-12-22 12:02:33 +01:00
415aadf704
lcd panel bed support advance and ultipanel not any more in default config
Bernhard
2011-12-22 11:45:52 +01:00
f312216e97
Revert "untestest commit, so I don't loose code.. features runout prevention addons"
Bernhard
2011-12-22 09:22:22 +01:00
651cde8b98
untestest commit, so I don't loose code.. features runout prevention addons
Bernhard
2011-12-22 09:20:34 +01:00
554cc1718d
Fiexed E_ENABLE_PIN errors
Erik van der Zalm
2011-12-15 11:59:07 +01:00
617968ab76
G92 fix
Erik van der Zalm
2011-12-12 20:43:47 +01:00
84d9cf7339
merging
Erik van der Zalm
2011-12-12 20:35:46 +01:00
e017228569
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
Erik van der Zalm
2011-12-12 19:34:37 +01:00
3320a5b37d
make autotemp compatile for use without pid
Bernhard
2011-12-11 22:25:52 +01:00
06411d5c9e
ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints.
Bernhard
2011-12-11 22:18:50 +01:00
Erik van der Zalm
Guillaume Seguin
Blair Thompson
Christian Thalhammer
Daid
daid
Michael Moon
haxar
Bernhard