Erik van der Zalm
21e2bae063
Changed (corrected?) SD_card comment handling.
2012-03-03 21:28:33 +01:00
Erik van der Zalm
cb0c84e075
Merge remote-tracking branch 'justblair/master' into Marlin_v1
2012-03-03 20:20:55 +01:00
Erik van der Zalm
ed951b1977
Fixed RAMPS 1.2 support (Found and fixed by rrhb)
2012-03-03 20:15:41 +01:00
Blair Thompson
046a8e0039
Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task.
2012-03-03 15:51:47 +00:00
Christian Thalhammer
5f3a422e68
added M31 - delete file from sd card
2012-03-02 21:49:05 +01:00
Christian Thalhammer
cb02914687
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
2012-02-29 14:51:35 +01:00
Christian Thalhammer
10bf2bb8e1
-
2012-02-29 14:51:15 +01:00
Erik van der Zalm
b4833d55c2
Fixed HOME_POS in combination with G28 X0 or G28 Y0
2012-02-28 18:20:03 +01:00
Erik van der Zalm
c6f2ec3c82
remove stop_heating_wait
2012-02-27 18:45:45 +01:00
Erik van der Zalm
b48d67ce10
Fixed homing
2012-02-27 18:31:40 +01:00
Phil Hord
09469add55
Add board reset reporting (from Repetier-Firmware)
2012-02-26 18:26:56 -05:00
Erik van der Zalm
27f595a444
Changed version => RC2
2012-02-26 16:26:40 +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
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
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
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
Bernhard
4f909963e4
make QUICKHOME configureable
2011-12-04 09:02:09 +01:00
Bernhard
b0c3871750
more fixing of the sanguino math round problem
2011-11-30 09:07:56 +01:00
Bernhard
716e89b87c
first homing move diagonal towards home switches.
2011-11-29 22:11:45 +01:00
Bernhard
e4ab0e5982
more inlines
2011-11-28 22:11:17 +01:00
Bernhard
8cb29921a0
possible stepper release after sd printing
2011-11-28 22:09:17 +01:00
Bernhard
044886b4a0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-28 21:52:16 +01:00
Erik van der Zalm
6d95644c0d
Moved M88 into M84. (M84 E)
2011-11-28 21:49:54 +01:00
Bernhard
311627141b
Merge branch 'smallopt' into Marlin_v1
...
Conflicts:
Marlin/temperature.h
2011-11-28 21:36:01 +01:00
Erik van der Zalm
7216a12856
Disabled M88 for boards that don't have seperate enable pins.
2011-11-28 21:17:06 +01:00
Erik van der Zalm
98805c9228
Added M88 command. (Request from Action68)
2011-11-28 20:51:01 +01:00
Erik van der Zalm
f75f426dfa
Removed interrupt nesting in the stepper ISR.
...
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
2011-11-27 21:12:55 +01:00
Bernhard
2d9a715655
first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops.
2011-11-27 17:27:17 +01:00
Bernhard
d2f034ba84
lcd message from gcode, m117
2011-11-27 16:53:11 +01:00
Erik van der Zalm
aad4b75b94
First parts 2nd extruder
2011-11-26 17:33:25 +01:00
Bernhard
a0dc66f7bf
Home retract distance configureable per axis.
2011-11-26 12:04:06 +01:00
Bernhard
4d6a5c29df
disable steppers as routine in stepper.cpp
2011-11-26 11:50:23 +01:00
Bernhard
74d0032e25
cooldown blocking selectable by #define.
2011-11-26 09:03:12 +01:00
Bernhard
57e163e989
typo
2011-11-25 22:34:12 +01:00
Bernhard
b58787a367
now velocities are also set in mm/sec in gcode.
2011-11-25 22:32:26 +01:00
Erik van der Zalm
6ac9b2e761
Fixed residency time bug. (Thanks to Sound :-) )
2011-11-25 19:34:36 +01:00
Erik van der Zalm
0e0e4945d8
Removed ISR overtaken message from ISR routine
2011-11-25 13:59:58 +01:00
Erik van der Zalm
c0f8c9fd72
Seperate ENDSTOP_INVERTING for X Y and Z
...
Added simple endstop filter.
Corrected M114 count display.
2011-11-25 13:43:06 +01:00
Bernhard Kubicek
5535e51bf6
Yes, thats the beta.
2011-11-20 17:04:57 +01:00
Erik van der Zalm
4e5becfc51
Added endstop reporting
2011-11-20 14:50:08 +01:00
Erik van der Zalm
0e7fee9a9b
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
2011-11-19 21:33:15 +01:00
Erik van der Zalm
915ef2d4a1
Added software endstops
2011-11-19 21:32:47 +01:00
Bernhard Kubicek
e87df99e22
update mcode documentation
2011-11-19 21:01:07 +01:00
Bernhard Kubicek
7a2d1f5aeb
add M17, so the enable stepper button works in repg.
2011-11-19 18:22:22 +01:00
Bernhard Kubicek
2a6afee832
make it compile without autotemp
2011-11-19 17:09:33 +01:00
Bernhard Kubicek
8a08b8e07e
trying to get autotemp to work.
2011-11-19 15:37:10 +01:00
Bernhard Kubicek
70abca195a
overworked cardreader for folder support; not finished yet.
2011-11-19 13:13:34 +01:00
Bernhard Kubicek
1e5e141ac9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
2011-11-18 22:22:23 +01:00
Bernhard Kubicek
5df5727e93
removed some debugging comments
2011-11-18 22:20:53 +01:00
Bernhard Kubicek
64f2121ab1
updated to sdfatlib2010902
2011-11-18 22:17:37 +01:00
