melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,964 Commits 2 Branches 0 Tags
Commit Graph

3160 Commits

Author SHA1 Message Date
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
Guillaume Seguin
adc108d79e Correctly build the produced applet/Marlin.cpp source 2012-02-24 21:21:19 +01:00
Erik van der Zalm
5aa9c41ab1 Changed comment mode for detection. 
Added M221 extuder multiply factor.
 2012-02-24 20:42:07 +01:00
Erik van der Zalm
00690f7ffd Fix cast warning in Gen7 2012-02-23 18:50:05 +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
df1437bd86 Changed display format for some numbers. 2012-02-21 23:05:43 +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
Erik van der Zalm
2cc9a89830 Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1 2012-02-21 20:17:35 +01:00
Erik van der Zalm
a0a1f81913 various changes 2012-02-21 20:17:28 +01:00
Christian Thalhammer
8a8ea50f33 fixed manual axis movement lcd option 2012-02-21 09:31:28 +01:00
Blair Thompson
b976692d0f Removed VS project files for tidyness stakes 2012-02-20 22:39:39 +00:00
Blair Thompson
fe940a142d Added a structure that will allow easy translations/modifications to the LCD menu. 
Signed-off-by: Blair Thompson <mail@justblair.co.uk>
 2012-02-20 22:22:46 +00:00
Christian Thalhammer
b3fb09a20c change preheat to ABS values of nozzle 227 and be 105 C 
next try for manual axis movement
 2012-02-20 16:07:27 +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
1ff99ae25f ATMega1284P support for Arduino IDE 
replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file
 2012-02-17 11:41:47 +01: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
7699f250e3 Fixed small merge bug 2012-02-12 14:06:08 +01:00
Erik van der Zalm
11518a987f merged with triffid fork 2012-02-12 13:58:36 +01:00
Erik van der Zalm
13e185d330 removed unused HEATING_EARLY_FINISH_DEG_OFFSET 
Simplified stepper inactive time
 2012-02-11 23:22:16 +01:00
Erik van der Zalm
b58eae7657 Corrected e-length calculation in planner 2012-02-11 18:36:42 +01:00
daid
2a77c84c8f Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 2012-02-11 16:02:47 +01:00
Erik van der Zalm
d47a3e5950 Changed check i mtion_conrol 
if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001)
(thanks mooselake)
 2012-02-09 21:02:01 +01:00
Erik van der Zalm
f87c80889f Fixed M109 timer overflow (reported by triffid) 2012-02-09 20:54:49 +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
6ef8459494 Corrected distance calculation. (thanks jv4779) 2012-02-09 19:53:06 +01:00
Erik van der Zalm
598eb1d4f1 Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid) 2012-02-09 19:38:53 +01:00
Erik van der Zalm
9173a5713b Teensylu support. 2012-02-09 19:27:45 +01:00
Erik van der Zalm
da040fd393 Fixed ultimaker heater 1 pins. (Thanks daid) 2012-02-09 17:19:45 +01:00
Erik van der Zalm
bdb70c0509 Warning for 10k thermistor 2012-02-08 18:38:45 +01:00
Erik van der Zalm
5113513cb2 RC 1 2012-02-08 18:28:54 +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
Christian Thalhammer
4cc8e37bf1 lcd menue "move_axis" added 2012-02-07 12:58:05 +01:00
Christian Thalhammer
b5fae1104b fixed sUICIDE_PIN disable 2012-02-07 08:50:26 +01:00
Erik van der Zalm
f9c5333f97 Made "stop heating wait" optional. 
Default off.
 2012-02-06 20:13:44 +01:00
Erik van der Zalm
292ddd2edb Fix Z_LATE_ENABLE 2012-02-06 17:38:16 +01:00
Christian Thalhammer
25cd8af536 added arduino ide GEN7 support Files 2012-02-06 14:11:25 +01:00
Christian Thalhammer
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.
 2012-02-06 12:28:33 +01:00
Christian Thalhammer
b51e8bf7e5 -disabled CARDDETECT if PIN is set to -1 
- redo disable Beeper if PIN is set to -1
 2012-02-06 12:22:44 +01:00
Christian Thalhammer
3183a14755 -added Configuration for GEN7 which worked for me 2012-02-06 12:12:18 +01:00
Christian Thalhammer
5edef148fe -disalbe beeper if BEEPER_PIN = -1 2012-02-06 12:10:32 +01:00