1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-30 15:26:18 +00:00
Commit Graph

280 Commits

Author SHA1 Message Date
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
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
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
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
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
Guillaume Seguin
adc108d79e Correctly build the produced applet/Marlin.cpp source 2012-02-24 21:21:19 +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
00690f7ffd Fix cast warning in Gen7 2012-02-23 18:50:05 +01:00
Erik van der Zalm
01d28c18ab Fixed casting warning in sanguino 2012-02-23 18:45:37 +01:00
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!
2012-02-22 23:05:52 +00:00
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
2012-02-22 22:51:04 +00: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
8816ef1c64 Small fixes after merge 2012-02-21 20:36: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
Christian Thalhammer
8a8ea50f33 fixed manual axis movement lcd option 2012-02-21 09:31:28 +01:00
Blair Thompson
b976692d0f Removed VS project files for tidyness stakes 2012-02-20 22:39:39 +00: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
b3fb09a20c change preheat to ABS values of nozzle 227 and be 105 °C
next try for manual axis movement
2012-02-20 16:07:27 +01:00
Blair Thompson
a05a261b72 Added a workaround. Ramps SD card does not have sdcarddetect. My temporary solution is to add a momentary swtich
that pulls down the SDCARDDETECT pin and mimicking the pull and reinsert ofa a SD card
2012-02-18 23:56:31 +00:00
Blair Thompson
1b6765ed12 Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface 2012-02-18 18:25:04 +00:00
Christian Thalhammer
1ff99ae25f ATMega1284P support for Arduino IDE
replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file
2012-02-17 11:41:47 +01:00
Christian Thalhammer
e661578c84 support for GEN7 1.1,1.2 and 1.3 2012-02-17 10:46:48 +01:00
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
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
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