Commit Graph

19125 Commits

Author SHA1 Message Date
2cc9a89830 Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1 2012-02-21 20:17:35 +01:00
a0a1f81913 various changes 2012-02-21 20:17:28 +01:00
8a8ea50f33 fixed manual axis movement lcd option 2012-02-21 09:31:28 +01:00
b976692d0f Removed VS project files for tidyness stakes 2012-02-20 22:39:39 +00:00
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
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
6a3f8cf23f Infos about fuses to use; correct fuses in boards.txt 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
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 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
2012-02-17 11:41:47 +01:00
234fe8ea67 added infos for this fork 2012-02-17 11:07:24 +01:00
e661578c84 support for GEN7 1.1,1.2 and 1.3 2012-02-17 10:46:48 +01:00
73344e69c1 Added temperature offset/gain settings for AD595. 2012-02-16 11:05:08 +01:00
d309565b56 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Configuration.h
2012-02-13 13:07:55 +01:00
3f20f37c78 Merge remote branch 'upstream/Marlin_v1' into Marlin_v1 2012-02-13 12:39:00 +01:00
0e3631ff4b smaller changes 2012-02-13 12:31:53 +01:00
fa2e1be0ca changed default EXTRUDE_MINTEMP to 170. 2012-02-12 17:38:54 +01:00
7699f250e3 Fixed small merge bug 2012-02-12 14:06:08 +01:00
11518a987f merged with triffid fork 2012-02-12 13:58:36 +01:00
b447815de5 removed unused HEATING_EARLY_FINISH_DEG_OFFSET
Simplified stepper inactive time
2012-02-12 18:02:12 +08:00
bde30b2b48 Corrected e-length calculation in planner 2012-02-12 18:02:12 +08:00
13e185d330 removed unused HEATING_EARLY_FINISH_DEG_OFFSET
Simplified stepper inactive time
2012-02-11 23:22:16 +01:00
b58eae7657 Corrected e-length calculation in planner 2012-02-11 18:36:42 +01:00
3e7fcb813e Merge pull request #61 from daid/Marlin_v1
Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.
2012-02-11 07:36:24 -08:00
2a77c84c8f Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0. 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)
2012-02-09 21:02:01 +01:00
f87c80889f Fixed M109 timer overflow (reported by triffid) 2012-02-09 20:54:49 +01:00
154de69c02 Print configuration.h version during startup (thanks hairykiwi) 2012-02-09 20:26:17 +01:00
6ef8459494 Corrected distance calculation. (thanks jv4779) 2012-02-09 19:53:06 +01:00
598eb1d4f1 Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid) 2012-02-09 19:38:53 +01:00
9173a5713b Teensylu support. 2012-02-09 19:27:45 +01:00
da040fd393 Fixed ultimaker heater 1 pins. (Thanks daid) 2012-02-09 17:19:45 +01:00
bdb70c0509 Warning for 10k thermistor 2012-02-08 18:38:45 +01:00
5113513cb2 RC 1 2012-02-08 18:28:54 +01:00
d8a0c6450f Split the configuration file in two parts.
One for common settings.
One for advanced settings.
2012-02-07 20:23:43 +01:00
4cc8e37bf1 lcd menue "move_axis" added 2012-02-07 12:58:05 +01:00
b5fae1104b fixed sUICIDE_PIN disable 2012-02-07 08:50:26 +01:00
f9c5333f97 Made "stop heating wait" optional.
Default off.
2012-02-06 20:13:44 +01:00
292ddd2edb Fix Z_LATE_ENABLE 2012-02-06 17:38:16 +01:00
25cd8af536 added arduino ide GEN7 support Files 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.
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
2012-02-06 12:22:44 +01:00
3183a14755 -added Configuration for GEN7 which worked for me 2012-02-06 12:12:18 +01:00
5edef148fe -disalbe beeper if BEEPER_PIN = -1 2012-02-06 12:10:32 +01:00
13e2ad2831 - added info for using GEN7 configuration 2012-02-06 11:58:52 +01:00
59cc5f889e - added support for ATMega1284P 2012-02-06 11:55:56 +01:00
a11f3b2d2f - Pins for modified GEN7 assigned
- Added support for ATMega1284
2012-02-06 11:49:23 +01:00
b0070a244a Merge remote-tracking branch 'upstream/master' into Marlin_v1
Conflicts:
	README
2012-02-06 11:37:07 +01:00
abb7e63906 fixed z-disable bug. 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.
2012-02-05 13:05:07 +01:00