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
daid
3f20f37c78
Merge remote branch 'upstream/Marlin_v1' into Marlin_v1
2012-02-13 12:39:00 +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
b447815de5
removed unused HEATING_EARLY_FINISH_DEG_OFFSET
...
Simplified stepper inactive time
2012-02-12 18:02:12 +08:00
Erik van der Zalm
bde30b2b48
Corrected e-length calculation in planner
2012-02-12 18:02:12 +08: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
ErikZalm
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
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
Christian Thalhammer
13e2ad2831
- added info for using GEN7 configuration
2012-02-06 11:58:52 +01:00
Christian Thalhammer
59cc5f889e
- added support for ATMega1284P
2012-02-06 11:55:56 +01:00
Christian Thalhammer
a11f3b2d2f
- Pins for modified GEN7 assigned
...
- Added support for ATMega1284
2012-02-06 11:49:23 +01:00
Christian Thalhammer
b0070a244a
Merge remote-tracking branch 'upstream/master' into Marlin_v1
...
Conflicts:
README
2012-02-06 11:37:07 +01:00
Erik van der Zalm
abb7e63906
fixed z-disable bug.
2012-02-05 21:14:55 +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
ErikZalm
7c6141ebc4
Merge pull request #54 from haxar/patch-1
...
M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (p...
2012-02-05 02:19:35 -08:00
Michael Moon
9c918a497b
more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output
2012-01-25 20:46:27 +11:00
Michael Moon
ab01658fd2
local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes
2012-01-24 17:02:45 +11:00
Michael Moon
42bedb3f60
PROGMEM elements must be const
2012-01-24 15:57:42 +11:00
Michael Moon
a991bde523
enable auto-reset before programming, disable afterwards
2012-01-24 14:25:28 +11:00
Michael Moon
3e575533c5
get M81 working
2012-01-24 14:24:41 +11:00
Michael Moon
2ae2ead97b
help residency not overflow
2012-01-24 14:24:24 +11:00
Michael Moon
71dc82e0b4
my local configuration
2012-01-24 13:19:37 +11:00
Michael Moon
5aadc2f5ca
cardreader needs to include some other files
2012-01-24 13:19:24 +11:00
Michael Moon
8d0916af13
allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications
2012-01-24 13:18:54 +11:00
haxar
6cc6029d7a
M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface) could not see target extruder heater temperature to continue print
2012-01-22 03:25:56 -08:00
