526 Commits (3cbaad9288fd6fe6d010cc3b4039dbffa863e31b)

Author SHA1 Message Date
Enchiridion 50cde90324 Added support for dual Z axis stepper drivers 12 years ago
kobaan 603a5e25b3 Updated german translations in language.h and eliminated a few double lines. 13 years ago
Chris Palmer 538189cc19 Fixed soft limits when the origin is in the middle.
HOME_POS is now always where the endstop is and can be outside the limits.
The limits are now defined by MIN_POS and MAX_POS rather than HOME_POS and MAX_LENGTH.
The Z is axis now homed first if direction is away from the bed.

Saguinololu limit pins change from MIN to MAX according to the homing direction.
13 years ago
ErikZalm 686011a548 Fixed typo 13 years ago
Erik van der Zalm cd57bf305b Merge git://github.com/daid/Marlin into Marlin_v1
Added invert step pins to corexy code
13 years ago
Erik van der Zalm ea2c19f978 Added CoreXY support (Thanks Ilan Moyer) 13 years ago
Erik van der Zalm aa65fe22ed decoupled axes sucessfully at least on pure x or y jog 13 years ago
daid 12de8fff81 Support step motor controllers with active low step pins. 13 years ago
Erik van der Zalm b67dacdc8f Fixed AD595 define 13 years ago
Bernhard d3002ef741 corrected retract 13 years ago
Bernhard 0c123950e9 __ header file replace 13 years ago
Bernhard bf077125b9 added firmware retract. disabled by default 13 years ago
Bernhard 0e5e249ab5 added individual pullup setting option to have finer control in case there is a special z-min sensor, for example 13 years ago
Bernhard Kubicek 6b14f95b3e Merge pull request #170 from linagee/Marlin_v1
Marlin v1
13 years ago
Bernhard Kubicek c7ce99d495 Merge pull request #172 from daid/Marlin_v1
Add M401 - Wait for user to press button on LCD (with optional timeout) minor fix in M115.
13 years ago
Bernhard Kubicek b7fc14bc65 repaired thermistortable_6 by graphcial fitting of the off-slope values. see issue 179. Erik, I know you asked for no changes, but this file probably is not related and hopefully allright. 13 years ago
ErikZalm 9e1021efbe Fixed SL bug. 13 years ago
Daid e9bec9b6fe Fixed E1_ENABLE pin for Ultimaker. This was wrong for the 1.5.4 and 1.5.3 PCB (I cannot check the 1.5.6) 13 years ago
linagee fbd282b3ba Update Marlin/Configuration.h 13 years ago
linagee 2e8c5049c5 Update Marlin/thermistortables.h 13 years ago
linagee 2d0d8e5272 Small correction. 13 years ago
Daid 4d7fe7115f Changed M401 to M0/M1 as suggested, so they match normal CNC stop commands. 13 years ago
linagee 9e9db65c3f Update Marlin/thermistortables.h 13 years ago
linagee bd966ef389 Update Marlin/thermistortables.h 13 years ago
linagee 775da3f103 Added top ratings and extended to ADC=1 for table 3 and 5. 13 years ago
linagee 96a4baa0be Update Marlin/thermistortables.h 13 years ago
linagee 2aa9f7b131 Update Marlin/thermistortables.h 13 years ago
linagee c4490f5f3d Update Marlin/Configuration.h 13 years ago
linagee dd9144994e Tested May 19 - It works! Verified with separate thermocouple TM-902C also. 13 years ago
linagee 4c37d0d9f1 Extended range above 250C. (Operating range states up to 300C) 13 years ago
Daid b59724e42b Add strigification for extruder amount in M115 report. 13 years ago
Daid 16413bb8f2 Last M401 update, refresh the LCD during an M401 wait. 13 years ago
Daid b3941fce5c Update after testing 13 years ago
Daid d494688565 Do not initialize in the header file. 13 years ago
Daid 516ec90242 Add M401 - Wait for user on LCD button press 13 years ago
Daid 7244aa7eb7 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
linagee de2ca3b2e8 Grammar correction. 13 years ago
linagee c2fc466e1b Update Marlin/Configuration.h 13 years ago
linagee 241f5a4c0e Update Marlin/thermistortables.h 13 years ago
linagee 9f9f498491 Update Marlin/Configuration.h 13 years ago
Erik van der Zalm e31bef31ad Limit PID autotune PWM to PID_MAX 13 years ago
ErikZalm b2a9ccdb97 Merge pull request #159 from MaikStohn/Marlin_v1
Marlin v1 - BUG FIXES / CORRECTIONS
13 years ago
Erik van der Zalm d459fb41b7 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 13 years ago
ErikZalm 804e0d6117 Merge pull request #164 from guanix/Marlin_v1
Melzi support
13 years ago
Erik van der Zalm ba96059203 add additional dropsegments test 13 years ago
zittix fbd91ab0b5 Fixes #153 for bad call to abs() 13 years ago
MaikStohn b51c06e2b3 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 13 years ago
MaikStohn 159ae90874 bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only) 13 years ago
MaikStohn e48f5aa6a7 fixed typo 13 years ago
MaikStohn 1efe9ab497 changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu 13 years ago
Guan Yang 602c8ee02b Melzi support 13 years ago
Daid 279d00da9f Fixed #if for Ultimaker. 13 years ago
Bernhard Kubicek 451f9cc6d1 Residual in the comments: there are no more mm/minutes but only mm/sec in the planner buffer. 13 years ago
Erik de Bruijn e3fe1f0d00 Made a more granular configuration possible PREVENT_LENGTHY_EXTRUDE. You can now decide to allow/disallow large length of extrusions to be executed.
Turning off the protection might be beneficial to those who want to do fast and long reversals.
13 years ago
Erik de Bruijn d88205d89d Suggestion to improve (TODO), no actual code changed 13 years ago
Erik de Bruijn 5aa80e6c05 Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel" 13 years ago
MaikStohn b657a18449 Revert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings"
This reverts commit 3682d9bd5b.
13 years ago
MaikStohn d188ae4c9d added missing declaration of buttons_init()
This is required when moving the buttons_init() function to the
lcd_init() function
13 years ago
MaikStohn 3682d9bd5b magic PROGMEM defines to avoid hundreds of wrong GCC warnings 13 years ago
MaikStohn 032df0b2c6 Moved LCD initialization out of constructor
Since the class "MainMenu" was used within a static variable the
initialization of the object (constructor call) was done before Arduino
library startup. It always caused a crash when using AVRStudio with
JTAG debugger (caused from calling the LCD initialization / the lot of
I/O work / the stack used during this calls). By moving the LCD_INIT
out of the constructor and using an explicit call inside of Arduino
setup() implementation immediately fixed all problems and the JTAG
debugger runs fine.
13 years ago
MaikStohn bd1ad7c76a explicit includes to make it compile with AVRStudio/Eclipse 13 years ago
MaikStohn 060b38de5c delete obsolete and wrong code
"i" runs from 0 to 4 but "add_homeing" array size is 3 only. On the
other hand the calculated value gets overwritten by either one of the
if choice.
13 years ago
MaikStohn 789ba02d43 fixed typo in comment 13 years ago
Erik van der Zalm 1874cb71a6 Added option to increase the FAN PWM frequency. 13 years ago
Erik van der Zalm 6a5a34e0ff Small cleanup 13 years ago
Erik van der Zalm e3821bd86f Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 13 years ago
Erik van der Zalm 02af69911e Added temperature window to M109. This is needed for systems with no overshoot PID. 13 years ago
ErikZalm e203b8c754 Merge pull request #154 from daid/Marlin_v1
Added 2nd extruder temperature LCD readout and setting.
13 years ago
ErikZalm 362ddc4efc Merge pull request #155 from Atntias/patch-1
adding M120 and 121 for turning on and off the endstops only for homing
13 years ago
sefi c27081aa4a Fix to allow M120/M121 13 years ago
sefi e11e072eca adding M120 and 121 for turning on and off the endstops only for homing function 13 years ago
Daid 8e68c6cf89 Show proper temperature for extruder 2 13 years ago
Daid 8503b78876 Added support for 2nd extruder temperature to UltraLCD 13 years ago
Logan Bowers 3eacb4c16d Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater 13 years ago
Bernhard e4d2138dbd reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time.
Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt.
actually, it solves a problem with the UltiControlle
13 years ago
Bernhard 464b755918 added support for the UltiController 13 years ago
Bernhard 44fd8d46d2 fixed quickhome 13 years ago
Bernhard 33bb044d7c fixed catsting to (int)e in serial error messages.
see https://github.com/ErikZalm/Marlin/issues/148
13 years ago
ErikZalm c2557abc03 Merge pull request #138 from triffid/fix-makefile
make should rebuild if configuration or Makefile is changed
13 years ago
Erik van der Zalm 67cf105bc6 Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
13 years ago
Erik van der Zalm 8aee9d51b6 Disabled disable_heater in PID_autotune. 13 years ago
Daid 414408b2d0 Fix for wrong systax in #ifdef. 13 years ago
Michael Moon 77d503fa13 Fix Makefile 13 years ago
Erik van der Zalm cf7c8c458f Fixed MAX6675 13 years ago
grrf 03b0850e63 This breaks temperature readout for pronterface! 13 years ago
tgiphil ad8bc71d3e - Fixed a typo 13 years ago
Erik van der Zalm 46feae79c6 Fixed typo in arc 13 years ago
Erik van der Zalm 4ca2f336f0 Changed default MINIMUM_PLANNER_SPEED -> 0.05
Fixed small bug in arcs
M105 prints now actual_temp/target_temp
13 years ago
Erik van der Zalm ae0bf8068b Fixed arc offset. 13 years ago
Erik van der Zalm 0c1b863755 Ignore ":" in comments. 13 years ago
Erik van der Zalm 63aec3c56e Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
13 years ago
ErikZalm 8b785f75a6 Merge pull request #123 from buserror-uk/for-upstream
For upstream
13 years ago
Tommy Cheng 520f1a54a8 Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined. 13 years ago
Michel Pollet 5550e893d5 New board variant, Open Motion Controller
Open Hardware board currently used by the group build of http://tvrrug.org.uk
The board can be found at http://solderpad.com/folknology/open-motion-controller/

Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
Michel Pollet aa6e6e914e Makefile: Redone
+ Removed most explicit pathnames, use the standard make "VPATH" to let
make find the files for itself.

+ Added a "hardware variant" variable that allows compiging Sanguino and
Gen7 as well as "generic" arduino.

+ Allows overriding the MOTHERBOARD define from the Makefile

+ Removed the 'preprocessor' bit that wasn't needed, now just "include" the
files that are needed, since it allows gcc to show the right file/line
when displaying error/warnings.

+ Uses gcc's own dependency generator to generate the .d files, and
and include these instead of self-patching the makefile

Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
Bernhard 0183e6332a made prepare->autostart independent of current folder. 13 years ago
Bernhard 1532200435 found error in filenames.
One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely
13 years ago
Erik van der Zalm b985e4a134 Fixed compile errors in ultralcd when no ultra_lcd is selected. 13 years ago
Erik van der Zalm 2e749d60c3 Added DISABLE_MAX_ENDSTOPS 13 years ago
Erik van der Zalm 33f5697888 PPID tune exports more constants. 13 years ago
Erik van der Zalm b44055cc51 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 13 years ago
Erik van der Zalm f5eae52098 Added more manage_inactivity checks 13 years ago
ErikZalm 19a47dae4a Merge pull request #99 from Justblair/master
Better pin configuration for rotary encoder in RAMPS boards
13 years ago
Erik van der Zalm 910f4e77a2 Added 20MHz support. 13 years ago
ErikZalm 7cefad3744 Merge pull request #106 from bgamari/Marlin_v1
Make F_CPU dependence of stepper.cpp more explicit
13 years ago
Erik van der Zalm 87ff2f8867 Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers) 13 years ago
Erik van der Zalm 387fe51a56 Do not disable steppers when there are moves in the queue. 13 years ago
Erik van der Zalm 421264e58a Fixed typo 13 years ago
Erik van der Zalm 15ad923310 Removed !!!. Stupid arduino bootloader can't handle this. 13 years ago
Erik van der Zalm 61e09e6be2 Added FAN_PIN -1 checks 13 years ago
Erik van der Zalm 87c4e06c24 Corrected active_extruder when autotemp is used. 13 years ago
Erik van der Zalm 7b1e295f34 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 13 years ago
Erik van der Zalm c077316b2b Added PID autotune. (experimental)
M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed.
Put these values in Configuration.h
13 years ago
Ben Gamari 49b228c4b3 Add instructions to regenerate speed_lookuptable when changing F_CPU 13 years ago
Ben Gamari 96509494f0 stepper: Clarify comment on timer-counter configuration 13 years ago
Ben Gamari 6d7e6a11fc Add create_speed_lookup 13 years ago
Tommy Cheng ce07c9186d While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached. 13 years ago
Erik van der Zalm 116dc86b8a Fixed type in e-jerk 13 years ago
Blair Thompson 02ee9e3d30 Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4
This simplifies wiring for those with RAMPS 1.3 and 1.4 boards.
13 years ago
Erik van der Zalm e056bf8081 Added E-Jerk 13 years ago
Erik van der Zalm 4deeffbc88 Added missing defines to the german section.
Translation still needed.
13 years ago
Erik van der Zalm 632528aa95 merging with SCUBA82 13 years ago
Erik van der Zalm aac7aa3bf0 Queued fan control. Issue #90 13 years ago
Christian Thalhammer fde51084f3 set SD file delete to M30; switch printime output to M31 13 years ago
Erik van der Zalm 21e2bae063 Changed (corrected?) SD_card comment handling. 13 years ago
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
Christian Thalhammer 5f3a422e68 added M31 - delete file from sd card 13 years ago
Christian Thalhammer fa2e3a40e9 fixed LCD manual z axis move Feedrate to 70 (was 1700) 13 years ago
Christian Thalhammer a92b3afe64 added german translation;Menue should be in english.. sounds better 13 years ago
Christian Thalhammer 9fa586bbed fixed languages; Preheat_PLA and Preheat_ABS was not defined for non
english
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
Christian Thalhammer cb02914687 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 13 years ago
Christian Thalhammer 10bf2bb8e1 - 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