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
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
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
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
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
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
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
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
b5fae1104b
fixed sUICIDE_PIN disable
2012-02-07 08:50:26 +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
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
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
Bernhard
157aa7f2fd
m115 eol fix
2012-01-15 20:51:49 +01:00
Bernhard
7aeb45303d
small mistake
2012-01-15 18:31:21 +01:00
Bernhard
cee5f9020a
added suicide pin for a power supply to the arduino that is only active if the arduino is holding high for an output.
2012-01-15 17:06:10 +01:00
Bernhard
57f9359a41
simplified the includes, makefile now works with arduino23
2011-12-22 14:55:45 +01:00
Bernhard
3c1a4aac2b
header file simplification
2011-12-22 12:38:50 +01:00
Bernhard
212515148e
added m240 photography support. default off
2011-12-22 12:11:39 +01:00
Erik van der Zalm
554cc1718d
Fiexed E_ENABLE_PIN errors
2011-12-15 11:59:07 +01:00
Erik van der Zalm
617968ab76
G92 fix
2011-12-12 20:43:47 +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
06411d5c9e
ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints.
2011-12-11 22:18:50 +01:00
Bernhard
01001b89d2
repaired nozzle runout prevention to not collide with automatic stepper disabeling.
2011-12-11 15:42:56 +01:00
Bernhard Kubicek
f6fe7143e4
Merge pull request #29 from k-eex/Marlin_v1
...
Fix M201 not saving settings in all places, so the changes did not get written into EEPROM
2011-12-09 06:37:42 -08:00
Bernhard
dde4b40fa9
disable steppers in runout prevention
2011-12-09 15:37:24 +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
Keegi
bae1e422f6
Fix M201 not saving settings in all places, so the changes did not get written into EEPROM
2011-12-08 12:25:32 +02:00
Bernhard
986f0ba76c
moved <stdio.h> to more dominant location.
2011-12-07 20:56:47 +01:00
Bernhard
460b788d78
repaired homing position setting.
2011-12-07 20:54:34 +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
Bernhard
12e8edcac3
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-12-04 22:27:37 +01:00
Bernhard
cf50ba140f
added M503 to display eeprom storage, and renamed eeprom routings. This version is compatible with the qtmarlin eeprom-tab.
2011-12-04 22:26:42 +01:00
Erik van der Zalm
b99c49ec3b
Add option to only check endstop when homing
2011-12-04 20:17:21 +01:00
Bernhard
7714b98da7
solved some compiler warnings that are now visible in arduino 1.0.
...
Found a couple of unused variables, that I commented.
Tried to solve the program memory warning message, and failed.
2011-12-04 12:40:18 +01:00
Bernhard
dfd240b260
overworked autotemp, removed one layer of nesting from the ultralcd.
2011-12-04 09:48:53 +01:00
