Erik van der Zalm
e509bbf636
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
Erik van der Zalm
072011a3ef
Added current_block = NULL to quickStop()
13 years ago
ErikZalm
2422a857a1
Merge pull request #96 from haxar/Marlin_v1
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, ...
13 years ago
Erik van der Zalm
f598077af3
Removed vc files
13 years ago
Erik van der Zalm
cb0c84e075
Merge remote-tracking branch 'justblair/master' into Marlin_v1
13 years ago
ErikZalm
1d5809d458
Merge pull request #88 from daid/Marlin_v1
Made plan_buffer_line arguments const...
13 years ago
Erik van der Zalm
ed951b1977
Fixed RAMPS 1.2 support (Found and fixed by rrhb)
13 years ago
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.
13 years ago
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)
13 years ago
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.
13 years ago
haxar
79a466ca26
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e
13 years ago
Daid
00d33e6b82
Typo fix
13 years ago
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.
13 years ago
Daid
3d83109028
Fixed general 16x2 LCD build without SD support.
13 years ago
Daid
d47b666630
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
Daid
88d289caa1
Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature.
13 years ago
Erik van der Zalm
b4833d55c2
Fixed HOME_POS in combination with G28 X0 or G28 Y0
13 years ago
Erik van der Zalm
c6f2ec3c82
remove stop_heating_wait
13 years ago
Erik van der Zalm
b48d67ce10
Fixed homing
13 years ago
ErikZalm
071eec7aa7
Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd
Clean up and add some trace info
13 years ago
ErikZalm
1ebe7d1ab6
Merge pull request #83 from phord/tempfix
Add explicit #define for bogus temp override
13 years ago
ErikZalm
de37b2264a
Merge pull request #82 from phord/fix-gen7-build
pins.h: Define Z_MAX_PIN for Gen7 board
13 years ago
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.
13 years ago
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.
13 years ago
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).
13 years ago
Phil Hord
09469add55
Add board reset reporting (from Repetier-Firmware)
13 years ago
Phil Hord
f3101e96d9
Add suitable .gitignore to avoid build noise
13 years ago
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.
13 years ago
Erik van der Zalm
97d42ca2b2
SDSUPPORT default disabled
13 years ago
ErikZalm
2faa0852b9
Merge pull request #79 from changwoo/Marlin_v1
Fix build on Sanguino based boards with ATmega1284P
13 years ago
Changwoo Ryu
7b14953c99
Fix build on Sanguino based boards with ATmega1284P
13 years ago
Daid
286d5003fa
Fixed compiler warning for Sanguino compile
13 years ago
ErikZalm
66d50562b6
Merge pull request #76 from iXce/Marlin_v1
Fix Makefile
13 years ago
Erik van der Zalm
27f595a444
Changed version => RC2
13 years ago
Erik van der Zalm
018c567abf
Moved SLOWDOWN function. (jetty840)
Included AD595 calibration options. (daid)
13 years ago
Erik van der Zalm
4fbda5c3f5
Merge remote-tracking branch 'daid/Marlin_v1' into Test
13 years ago
Erik van der Zalm
ce714fe306
Fixes in pins.h
13 years ago
Erik van der Zalm
35e57bf149
Added gen6 deluxe.
13 years ago
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.
13 years ago
Guillaume Seguin
adc108d79e
Correctly build the produced applet/Marlin.cpp source
13 years ago
Erik van der Zalm
5aa9c41ab1
Changed comment mode for detection.
Added M221 extuder multiply factor.
13 years ago
Erik van der Zalm
00690f7ffd
Fix cast warning in Gen7
13 years ago
Erik van der Zalm
01d28c18ab
Fixed casting warning in sanguino
13 years ago
Blair Thompson
2fd8c248fe
Added Fan control to the pre-heat settings.
I find that the PID routine works better when the cooling fan is switched on
at the beginning of a warm up routine. Otherwise when you enable the fan
just before a print, you have a delay as the PIDre-adjusts.
This should also be safer as most cooling fans are directed at the hot -ends
thermal barrier!
13 years ago
Blair Thompson
d9f2f509d5
Added new menu items under the prepare submenu.
Instead of a single pre-heat, now there is pre-heat ABS and PLA options
Added defines to the configuration file to adjust preheat temperatures for both
13 years ago
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
13 years ago
Erik van der Zalm
df1437bd86
Changed display format for some numbers.
13 years ago
Erik van der Zalm
8816ef1c64
Small fixes after merge
13 years ago
Erik van der Zalm
d298dd121f
merged SBUBA82 and Justblair
13 years ago
Erik van der Zalm
2cc9a89830
Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1
13 years ago