neildarlow
bbe8fbe13d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
nothinman
51c6bd6b72
Merge pull request #846 from Dim3nsioneer/Marlin_v1
...
Extended Preheat options
11 years ago
Dim3nsioneer
c8cdd1fc6f
Bugfixes for language option 6 (russian)
11 years ago
Dim3nsioneer
7395dafc1e
semantic changes in language.h
11 years ago
Dim3nsioneer
fad2a60ce6
Corrections for preheat extension in language.h
11 years ago
Dim3nsioneer
944ced87c5
Extended Preheat options
...
Preheat LCD menus base on code by D-Base
11 years ago
ErikZalm
084134d3c7
Merge pull request #841 from Dim3nsioneer/Marlin_v1
...
Set flow rate (extrude-mutliplier) for each extruder individually
11 years ago
Dim3nsioneer
3906f27c46
Individual extruder flow rate
...
Extension of M221, Tune menu
11 years ago
Dim3nsioneer
8613a74443
Merge pull request #1 from ErikZalm/Marlin_v1
...
Update on 140315
11 years ago
ErikZalm
a00cec8b71
Merge pull request #833 from mattsch/optional_feedrate_multiplier
...
Add support for disabling encoder control for feedrate multiplier
11 years ago
ErikZalm
1f895844ac
Merge pull request #829 from blddk/Marlin_v1
...
Added CHDK support
11 years ago
neildarlow
af8be9013b
Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1
11 years ago
whosawhatsis
0ddee3c7db
Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection
11 years ago
Matthew Schick
6cd85e6008
Add support for disabling encoder control for feedrate multiplier
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
11 years ago
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/
11 years ago
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/
11 years ago
neildarlow
5a332df47e
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
nothinman
040357fd1b
Merge pull request #822 from tommil/Marlin_v1
...
Fixed Finnish translation
11 years ago
Tommi Lamberg
15d1b8d719
Fixed finnish translation
...
- Fixed Few finnish transalations
- Removed duplicate contrast define
11 years ago
neildarlow
7325d7102e
Activate LiquidTWI2 device detection and space-pad LCD status line.
11 years ago
ErikZalm
7f76a0e064
Merge pull request #813 from drf5n/PID_DEBUG
...
temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
ErikZalm
4f3eb6bec8
Merge pull request #811 from anfroholic/patch-1
...
Update README.md with Autotemp typo fix
11 years ago
Erik van der Zalm
fcd8524b6e
Only increase EEPROM version for DELTA printers.
11 years ago
ErikZalm
8c98690e1d
Merge pull request #786 from wolfmanjm/add/M665-set-delta-configuration
...
Add M665 to dynamically set delta configuration
11 years ago
Jim Morris
8ea5665ee2
Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
11 years ago
David Forrest
8c4377dd63
temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
anfroholic
661e378ce9
Update README.md
11 years ago
ErikZalm
fde8c2c310
Merge pull request #807 from Cylindric3D/typofixes_upstream5
...
Various typo fixes #5 - only in comments, no code changes.
11 years ago
ErikZalm
1aa10a5f18
Merge pull request #806 from Cylindric3D/typofixes_upstream
...
Various typo fixes #4 - only in comments, no code changes.
11 years ago
Cylindric
fdce91192e
Various typo fixes - only in comments, no code changes.
11 years ago
Cylindric
d819c55395
Various typo fixes - only in comments, no code changes.
11 years ago
ErikZalm
fd4542f33a
Merge pull request #805 from whosawhatsis/M200
...
autretract fix
11 years ago
ErikZalm
e8291ed728
Merge pull request #802 from Makers-Tool-Works/Marlin_v1
...
Clarify which PID values to enter
11 years ago
ErikZalm
465b654d24
Merge pull request #797 from Cylindric3D/update_menu_plan
...
Update menu plan
11 years ago
ErikZalm
88506a80c3
Merge pull request #789 from smiler/Marlin_v1
...
Fixed typo.
11 years ago
ErikZalm
b514d3c87f
Merge pull request #781 from Cylindric3D/typofixes_upstream
...
Various typo fixes #3 - only in comments, no code changes.
11 years ago
whosawhatsis
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
ErikZalm
cc5f1d475c
Merge pull request #772 from ellensp/Marlin_v1
...
Updated gen3+ board pins names to current convention
11 years ago
Cylindric
91759dede6
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
Cylindric
557217fc05
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
11 years ago
RoyOnWheels
aee63afccd
Clarify which PID values to enter
...
Users can be confused as to which values to enter after a PID tune. Updating the message to help clarity it.
New message: "PID Autotune finished! Put the last Kp, Ki and Kd constants from above into Configuration.h"
Old message: "PID Autotune finished! Put the Kp, Ki and Kd constants into Configuration.h"
11 years ago
alexborro
d3fcc28e64
Merge pull request #796 from MissionSt/any-pt-abl
...
Auto bed leveling at arbitrary points
11 years ago
Gabe Rosenhouse
99f6326544
Remove unnecessary dependency on time.h from qr_solve.cpp
...
Fixed compiler errors on Ubuntu using arduino-core
11 years ago
Cylindric
ea669cb504
Fix some extra and some missing tabs, to make the file consistent.
11 years ago
Cylindric
b46a1b6360
Update the menu plan document with the current menu as per ultralcd.cpp.
11 years ago
Cylindric
3cc7626d1f
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
11 years ago
Gabe Rosenhouse
174b8d99d5
Simplify 3-point probing using new code only
11 years ago
Gabe Rosenhouse
3b718b816c
better documentation
11 years ago
Gabe Rosenhouse
34fd59c370
ABL at any points
11 years ago
Cylindric
541155ea87
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago