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.
10 years ago
b0093a1513
thermistortables.h: Add comments that table 60 uses beta=3950.
10 years ago
a3530d1141
Update language.h
Updated to latest version.
10 years ago
990e770e15
Update language.h
Added catalan language
10 years ago
f643f4d674
Test and refactor
10 years ago
bbe8fbe13d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
51c6bd6b72
Merge pull request #846 from Dim3nsioneer/Marlin_v1
Extended Preheat options
10 years ago
c8cdd1fc6f
Bugfixes for language option 6 (russian)
10 years ago
7395dafc1e
semantic changes in language.h
10 years ago
fad2a60ce6
Corrections for preheat extension in language.h
10 years ago
eecda434fb
Sanguinololu servo pins set default disabled
10 years ago
944ced87c5
Extended Preheat options
Preheat LCD menus base on code by D-Base
10 years ago
06709ad60e
Added servo pin assignments to Sanguinololu
10 years ago
084134d3c7
Merge pull request #841 from Dim3nsioneer/Marlin_v1
Set flow rate (extrude-mutliplier) for each extruder individually
10 years ago
3906f27c46
Individual extruder flow rate
Extension of M221, Tune menu
10 years ago
8613a74443
Merge pull request #1 from ErikZalm/Marlin_v1
Update on 140315
10 years ago
a38c90ee84
Added estop handling
10 years ago
a00cec8b71
Merge pull request #833 from mattsch/optional_feedrate_multiplier
Add support for disabling encoder control for feedrate multiplier
10 years ago
1f895844ac
Merge pull request #829 from blddk/Marlin_v1
Added CHDK support
10 years ago
af8be9013b
Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1
10 years ago
0ddee3c7db
Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection
10 years ago
272072fa20
Added M112
10 years ago
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.
10 years ago
6cd85e6008
Add support for disabling encoder control for feedrate multiplier
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
10 years ago
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/
10 years ago
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/
10 years ago
881e348eed
Update Configuration_adv.h
Increase Z_HOME_RETRACT_MM to 2mm default to avoid end stop not switching during retract.
10 years ago
5a332df47e
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
040357fd1b
Merge pull request #822 from tommil/Marlin_v1
Fixed Finnish translation
10 years ago
15d1b8d719
Fixed finnish translation
- Fixed Few finnish transalations
- Removed duplicate contrast define
10 years ago
7325d7102e
Activate LiquidTWI2 device detection and space-pad LCD status line.
10 years ago
7f76a0e064
Merge pull request #813 from drf5n/PID_DEBUG
temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
4f3eb6bec8
Merge pull request #811 from anfroholic/patch-1
Update README.md with Autotemp typo fix
11 years ago
fcd8524b6e
Only increase EEPROM version for DELTA printers.
11 years ago
8c98690e1d
Merge pull request #786 from wolfmanjm/add/M665-set-delta-configuration
Add M665 to dynamically set delta configuration
11 years ago
8ea5665ee2
Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
Conflicts:
Marlin/Marlin_main.cpp
11 years ago
8c4377dd63
temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
661e378ce9
Update README.md
11 years ago
fde8c2c310
Merge pull request #807 from Cylindric3D/typofixes_upstream5
Various typo fixes #5 - only in comments, no code changes.
11 years ago
1aa10a5f18
Merge pull request #806 from Cylindric3D/typofixes_upstream
Various typo fixes #4 - only in comments, no code changes.
11 years ago
fdce91192e
Various typo fixes - only in comments, no code changes.
11 years ago
d819c55395
Various typo fixes - only in comments, no code changes.
11 years ago
fd4542f33a
Merge pull request #805 from whosawhatsis/M200
autretract fix
11 years ago
e8291ed728
Merge pull request #802 from Makers-Tool-Works/Marlin_v1
Clarify which PID values to enter
11 years ago
465b654d24
Merge pull request #797 from Cylindric3D/update_menu_plan
Update menu plan
11 years ago
88506a80c3
Merge pull request #789 from smiler/Marlin_v1
Fixed typo.
11 years ago
b514d3c87f
Merge pull request #781 from Cylindric3D/typofixes_upstream
Various typo fixes #3 - only in comments, no code changes.
11 years ago
77df0d689a
autretract fix
I made these changes previously, but I can’t find the commit now. This
reapplies the changes to get auto retract working again.
Conflicts:
Marlin/Configuration_adv.h
Marlin/Marlin_main.cpp
11 years ago
cc5f1d475c
Merge pull request #772 from ellensp/Marlin_v1
Updated gen3+ board pins names to current convention
11 years ago
91759dede6
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
Neil Darlow
David Forrest
pixatintes
pixatintes
Dan Nixon
nothinman
Dim3nsioneer
Dim3nsioneer
Ralf Schultz
ErikZalm
Dim3nsioneer
whosawhatsis
Matthew Schick
blddk
paciotti
Tommi Lamberg
Jim Morris
anfroholic
Cylindric