Commit Graph

8770 Commits (c45514f811375239b8c5cf4ae1d80f518cb4c49e)
 

Author SHA1 Message Date
nothinman 303ee67896 Merge pull request from whosawhatsis/M200
fix bug in M200 with multiple extruders
Tim 8759508319 fix bug for dual extruders not working
some guy find that marlin not working good for dual extruders delta .
when type T0 or T1 to active extruder and  E0 or E1  move causing XYZ
motion . so i locales the bugs and fix it , I have dry run the fix.
whosawhatsis a65564eef6 fix bug in M200 with multiple extruders
whosawhatsis aeaf9b9312 fix bug in M200 with multiple extruders
Neil Darlow 89f78b0b80 Allow use of either SD Card slot when LCD Panel is configured.
Preference is for Controller SD slot before LCD Panel slot when both are occupied.
David Forrest b0093a1513 thermistortables.h: Add comments that table 60 uses beta=3950.
pixatintes a3530d1141 Update language.h
Updated to latest version.
pixatintes 990e770e15 Update language.h
Added catalan language
Dan Nixon f643f4d674 Test and refactor
neildarlow bbe8fbe13d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
nothinman 51c6bd6b72 Merge pull request from Dim3nsioneer/Marlin_v1
Extended Preheat options
Dim3nsioneer c8cdd1fc6f Bugfixes for language option 6 (russian)
Dim3nsioneer 7395dafc1e semantic changes in language.h
Dim3nsioneer fad2a60ce6 Corrections for preheat extension in language.h
Ralf Schultz eecda434fb Sanguinololu servo pins set default disabled
Dim3nsioneer 944ced87c5 Extended Preheat options
Preheat LCD menus base on code by D-Base
Ralf Schultz 06709ad60e Added servo pin assignments to Sanguinololu
ErikZalm 084134d3c7 Merge pull request from Dim3nsioneer/Marlin_v1
Set flow rate (extrude-mutliplier) for each extruder individually
Dim3nsioneer 3906f27c46 Individual extruder flow rate
Extension of M221, Tune menu
Dim3nsioneer 8613a74443 Merge pull request from ErikZalm/Marlin_v1
Update on 140315
Dan Nixon a38c90ee84 Added estop handling
ErikZalm a00cec8b71 Merge pull request from mattsch/optional_feedrate_multiplier
Add support for disabling encoder control for feedrate multiplier
ErikZalm 1f895844ac Merge pull request from blddk/Marlin_v1
Added CHDK support
neildarlow af8be9013b Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1
whosawhatsis 0ddee3c7db Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection
Dan Nixon 272072fa20 Added M112
whosawhatsis aab61e63c3 FWRETRACT in mm/s
Firmware retraction now stores the retract and recover speeds in mm/s
instead of mm/min. This makes it match the units of the maximum
feedrate, and fixes problems with modifying the value via LCD control
panel. From gcode, the values are still taken in mm/min to match the
units of G1 and similar, and they are converted to mm/s before they are
stored.

I also lowered the default retract feedrate to make it less likely to
cause problems for geared extruders when the user hasn’t bothered to
set a reasonable maximum feedrate, though users should be setting both
of these values to suit their hardware.
Matthew Schick 6cd85e6008 Add support for disabling encoder control for feedrate multiplier
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
blddk 09af1b90b8 Added CHDK support
Added CHDK support to take pictures instead of doing an IR command, see more about how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
blddk 765b2da3d4 Added CHDK support
Added so M240 can be used to trigger CHDK instead of sending an IR signal, see more about CHDK here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
paciotti 881e348eed Update Configuration_adv.h
Increase Z_HOME_RETRACT_MM to 2mm default to avoid end stop not switching during retract.
neildarlow 5a332df47e Merge https://github.com/ErikZalm/Marlin into Marlin_v1
nothinman 040357fd1b Merge pull request from tommil/Marlin_v1
Fixed Finnish translation
Tommi Lamberg 15d1b8d719 Fixed finnish translation
- Fixed Few finnish transalations
- Removed duplicate contrast define
neildarlow 7325d7102e Activate LiquidTWI2 device detection and space-pad LCD status line.
ErikZalm 7f76a0e064 Merge pull request from drf5n/PID_DEBUG
temperature.cpp: Fix PID_DEBUG compile error.
ErikZalm 4f3eb6bec8 Merge pull request from anfroholic/patch-1
Update README.md with Autotemp typo fix
Erik van der Zalm fcd8524b6e Only increase EEPROM version for DELTA printers.
ErikZalm 8c98690e1d Merge pull request from wolfmanjm/add/M665-set-delta-configuration
Add M665 to dynamically set delta configuration
Jim Morris 8ea5665ee2 Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
Conflicts:
	Marlin/Marlin_main.cpp
David Forrest 8c4377dd63 temperature.cpp: Fix PID_DEBUG compile error.
anfroholic 661e378ce9 Update README.md
ErikZalm fde8c2c310 Merge pull request from Cylindric3D/typofixes_upstream5
Various typo fixes  - only in comments, no code changes.
ErikZalm 1aa10a5f18 Merge pull request from Cylindric3D/typofixes_upstream
Various typo fixes  - only in comments, no code changes.
Cylindric fdce91192e Various typo fixes - only in comments, no code changes.
Cylindric d819c55395 Various typo fixes - only in comments, no code changes.
ErikZalm fd4542f33a Merge pull request from whosawhatsis/M200
autretract fix
ErikZalm e8291ed728 Merge pull request from Makers-Tool-Works/Marlin_v1
Clarify which PID values to enter
ErikZalm 465b654d24 Merge pull request from Cylindric3D/update_menu_plan
Update menu plan
ErikZalm 88506a80c3 Merge pull request from smiler/Marlin_v1
Fixed typo.