Erik van der Zalm
e056bf8081
Added E-Jerk
2012-03-04 16:34:58 +01:00
Erik van der Zalm
4deeffbc88
Added missing defines to the german section.
...
Translation still needed.
2012-03-04 14:08:20 +01:00
Erik van der Zalm
632528aa95
merging with SCUBA82
2012-03-04 13:41:47 +01:00
Erik van der Zalm
aac7aa3bf0
Queued fan control. Issue #90
2012-03-04 13:05:26 +01:00
Christian Thalhammer
fde51084f3
set SD file delete to M30; switch printime output to M31
2012-03-03 21:58:12 +01:00
Erik van der Zalm
21e2bae063
Changed (corrected?) SD_card comment handling.
2012-03-03 21:28:33 +01:00
Erik van der Zalm
e509bbf636
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
2012-03-03 20:41:22 +01:00
Erik van der Zalm
072011a3ef
Added current_block = NULL to quickStop()
2012-03-03 20:40:46 +01:00
ErikZalm
2422a857a1
Merge pull request #96 from haxar/Marlin_v1
...
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, ...
2012-03-03 11:24:58 -08:00
Erik van der Zalm
f598077af3
Removed vc files
2012-03-03 20:22:42 +01:00
Erik van der Zalm
cb0c84e075
Merge remote-tracking branch 'justblair/master' into Marlin_v1
2012-03-03 20:20:55 +01:00
ErikZalm
1d5809d458
Merge pull request #88 from daid/Marlin_v1
...
Made plan_buffer_line arguments const...
2012-03-03 11:18:14 -08: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
4879de08e8
The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);".
...
The percent complete now lines up with the temperatures and Z-axis position figures, nicer to read and nicer to look at IMHO.
2012-03-03 16:47:27 +00:00
Blair Thompson
f278e1c00f
This is in my opinion a much better way of dealing with SD cards than my previous fix.
...
Instead of adding a momentary switch to fake the insertion of the card I have modified the ultralcd menu item:
Card Menu -> Refresh
to reinitialise the card providing that the SDCARDDETECT pin has been set to -1 in the pins.h file. This requires one less switch on the front panel and the refresh menu item is in the most relevent place for a user who wishes to inert a card and then print from it.
It also means that the "Card inserted" messages do not bother the users of these card readers (they dont make sense for users without SCCARDDETECT)
2012-03-03 16:30:31 +00: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
haxar
79a466ca26
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e
2012-03-02 17:15:21 -08:00
Christian Thalhammer
5f3a422e68
added M31 - delete file from sd card
2012-03-02 21:49:05 +01:00
Christian Thalhammer
fa2e3a40e9
fixed LCD manual z axis move Feedrate to 70 (was 1700)
2012-03-01 14:38:50 +01:00
Christian Thalhammer
a92b3afe64
added german translation;Menue should be in english.. sounds better
2012-03-01 14:24:20 +01:00
Christian Thalhammer
9fa586bbed
fixed languages; Preheat_PLA and Preheat_ABS was not defined for non
...
english
2012-03-01 14:05:40 +01:00
Daid
00d33e6b82
Typo fix
2012-02-29 19:01:21 +01:00
Daid
7d124478fa
Only protect the heater pins for the defined extruders.
...
Changed the way the extruder pins are defined so it doesn't create extra -1 entries in the list.
2012-02-29 15:49:02 +01:00
Daid
3d83109028
Fixed general 16x2 LCD build without SD support.
2012-02-29 15:33:23 +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
Daid
d47b666630
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
2012-02-29 12:19:20 +01:00
Daid
88d289caa1
Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature.
2012-02-29 11:38:12 +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
ErikZalm
071eec7aa7
Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd
...
Clean up and add some trace info
2012-02-27 08:38:36 -08:00
ErikZalm
1ebe7d1ab6
Merge pull request #83 from phord/tempfix
...
Add explicit #define for bogus temp override
2012-02-27 08:36:45 -08:00
ErikZalm
de37b2264a
Merge pull request #82 from phord/fix-gen7-build
...
pins.h: Define Z_MAX_PIN for Gen7 board
2012-02-27 08:36:06 -08:00
Phil Hord
b65ef8d66c
Add support for upcoming Gen7 v1.4
...
V1.4 moves thermistor power to the always-on 5v line.
The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer
needed on this board. Add a new motherboard type to
support this feature.
2012-02-26 20:39:49 -05:00
Phil Hord
740f0c7690
Add explicit #define for bogus temp override
...
The code to ignore the "bad thermistor reading failsafe"
suicide function depends on the existing of the PS_ON pin
feature. But in some boards this shouldn't be the case
Fix this by adding an explicit definition to make our
intentions more clear and separable.
2012-02-26 20:26:16 -05:00
Phil Hord
ba8500a236
pins.h: Define Z_MAX_PIN for Gen7 board
...
The Z_MAX_PIN value was defined as no-value, but this causes
the compile to fail. Fix this by setting the Z_MAX_PIN to the
correct value (which happens to be 0 for pin PB0/DIO0/0).
2012-02-26 20:18:39 -05:00
Phil Hord
09469add55
Add board reset reporting (from Repetier-Firmware)
2012-02-26 18:26:56 -05:00
Phil Hord
f3101e96d9
Add suitable .gitignore to avoid build noise
2012-02-26 18:26:56 -05:00
Phil Hord
245dca4bee
Makefile: generic pde=>cpp rule
...
This adds flexibility to the makefile by allowing different pde
targets to be specified for different needs.
2012-02-26 18:26:55 -05:00
Erik van der Zalm
97d42ca2b2
SDSUPPORT default disabled
2012-02-26 22:05:38 +01:00
ErikZalm
2faa0852b9
Merge pull request #79 from changwoo/Marlin_v1
...
Fix build on Sanguino based boards with ATmega1284P
2012-02-26 13:03:15 -08:00
Changwoo Ryu
7b14953c99
Fix build on Sanguino based boards with ATmega1284P
2012-02-27 04:12:55 +09:00
Daid
286d5003fa
Fixed compiler warning for Sanguino compile
2012-02-26 17:35:01 +01:00
ErikZalm
66d50562b6
Merge pull request #76 from iXce/Marlin_v1
...
Fix Makefile
2012-02-26 07:30:51 -08:00
Erik van der Zalm
27f595a444
Changed version => RC2
2012-02-26 16:26:40 +01:00
Erik van der Zalm
018c567abf
Moved SLOWDOWN function. (jetty840)
...
Included AD595 calibration options. (daid)
2012-02-26 16:23:47 +01:00
Erik van der Zalm
4fbda5c3f5
Merge remote-tracking branch 'daid/Marlin_v1' into Test
2012-02-26 16:10:59 +01:00
Erik van der Zalm
ce714fe306
Fixes in pins.h
2012-02-25 22:55:17 +01:00
Erik van der Zalm
35e57bf149
Added gen6 deluxe.
2012-02-25 17:44:45 +01:00
