Commit Graph

10612 Commits

Author SHA1 Message Date
ea669cb504 Fix some extra and some missing tabs, to make the file consistent. 2014-02-20 14:28:29 +00:00
b46a1b6360 Update the menu plan document with the current menu as per ultralcd.cpp. 2014-02-20 14:20:27 +00:00
3cc7626d1f Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan 2014-02-20 14:12:10 +00:00
174b8d99d5 Simplify 3-point probing using new code only 2014-02-19 21:48:05 -08:00
3b718b816c better documentation 2014-02-19 14:04:37 -08:00
34fd59c370 ABL at any points 2014-02-19 13:18:21 -08:00
541155ea87 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-19 15:52:18 +00:00
9fa328e5c8 Merge pull request #793 from MissionSt/use_axis_enums
Use constants instead of numeric literals
2014-02-19 10:15:57 -03:00
73f0ee9345 Merge pull request #794 from MissionSt/g29_requires_home
Prevent G29 without first homing in X and Y
2014-02-19 10:14:34 -03:00
f308a8af91 update comment 2014-02-19 01:06:24 -08:00
357e31270a Prevent G29 without first homing in X and Y
If position is unknown, then G29 can be dangerous.
2014-02-19 00:51:43 -08:00
d2d7d186b5 Use descriptive constants, more 2014-02-19 00:10:17 -08:00
2ccdf4f36d Use descriptive constants instead of numeric literals 2014-02-19 00:02:59 -08:00
c00383f286 Fixed typo. 2014-02-18 18:50:12 +01:00
60f72a78a9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-18 17:31:58 +00:00
abba7a0003 Merge pull request #782 from marcovannoord/Marlin_v1
Added dutch to language.h
2014-02-18 16:19:50 +00:00
b868d668fa Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-18 12:11:01 +00:00
8212d8d543 Revert "Fixed small typo that would prevent compiling"
This reverts commit 51ae4881ab.
2014-02-18 10:40:25 +01:00
46bae30573 Merge pull request #776 from whosawhatsis/fwretract
Fwretract fixes, cleanup
2014-02-18 10:39:28 +01:00
51ae4881ab Fixed small typo that would prevent compiling 2014-02-18 09:47:36 +01:00
498d76fd79 Fixed some messages where the text shown on the screen was more than 17 characters 2014-02-18 09:40:10 +01:00
af9395ac2e Add M605 to dynamically set delta configuration
Save above configs in eeprom
fix docs in createTemperatureLookupMarlin.py
add missing azteegX3pro digipot settings in delta example config
2014-02-17 20:50:59 -08:00
fd42f0d226 Merge pull request #783 from MissionSt/fix/syntax-error
Fix compile error
2014-02-17 20:59:43 +00:00
96217bf36a Merge pull request #777 from PxT/M114
Add whitespace to M114 output
2014-02-17 18:07:47 +00:00
cf5c3b6610 Added dutch to language.h 2014-02-17 17:00:50 +01:00
d1c64b9dc4 Fix syntax error introduced in 477b6fa1d 2014-02-17 07:56:19 -08:00
5d50819791 Various typo fixes - only in comments, no code changes. 2014-02-17 13:04:44 +00:00
3f455889d0 Merge pull request #769 from Cylindric3D/typofixes_1
Various typo fixes - only in comments, no code changes.
2014-02-17 11:30:01 +00:00
4ddedb3b27 Merge pull request #780 from Cylindric3D/typofixes_2
Various typo fixes #2 - only in comments, no code changes.
2014-02-17 11:29:18 +00:00
d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1
Marlin v1
2014-02-17 11:27:05 +00:00
bbb424bd2f Merge pull request #779 from MissionSt/makefile-fix-abl
Makefile fixes
2014-02-17 11:22:34 +00:00
8f0cee2a14 Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00
08263ae66e Merge branch 'Marlin_v1' into typofixes_1 2014-02-17 10:28:20 +00:00
3b193d1b5f Merge pull request #775 from MissionSt/lang-fix/bed
Use language.h for "bed"
2014-02-17 10:26:23 +00:00
5bd09d26e2 Makefile works with auto bed leveling 2014-02-16 23:23:29 -08:00
b45beeffd6 typo fix in Makefile 2014-02-16 23:23:29 -08:00
306588925d Add whitespace to M114 output 2014-02-16 21:01:19 -08:00
c43838bb1e disable auto retract by default
This should make it safe to enable FWRETRACT by default, with
autoretract (which should now be fixed) only enabled by M209. FWRETRACT
should probably now default to enabled (to make G10/G11 and M207-209
available, without changing functionality when they are not used), but
I’ll save that for another pull request/discussion.
2014-02-16 19:04:54 -08:00
99f0e44864 Move FWRETRACT defaults to configuration_adv.h 2014-02-16 19:00:28 -08:00
66e3869138 Fix autoretract
This takes the (now working) G10/G11 code and moves it to a function,
which is called by G10 and G11, and also called by G1 if autoretract is
enabled and a retract/recover move is detected.
2014-02-16 18:59:04 -08:00
2f2459c0db Fix G10/G11 Z-lift 2014-02-16 18:15:34 -08:00
8c5675c290 Use language.h instead of English literals for "bed" 2014-02-16 17:16:00 -08:00
a466c8ef68 Merge pull request #774 from MissionSt/cleanup/probe_pt
Refactor of z probing for auto bed leveling
2014-02-17 01:08:58 +00:00
0f7393a13e Refactor 'accurate' auto bed leveling to use probe_pt() 2014-02-16 10:44:15 -08:00
c4fbb44d6d Refactor 3-point auto bed leveling to use probe_pt() 2014-02-16 10:44:08 -08:00
ad2c6488c7 Add probe_pt(), useful for auto bed leveling 2014-02-16 10:38:29 -08:00
c9c83a4560 Updated gen3+ board pins names to current convention 2014-02-16 00:47:06 +13:00
ab0d3c4fb3 Various typo fixes - only in comments, no code changes. 2014-02-14 11:48:24 +00:00
477b6fa1df move engaged from lcd console refreshes power off timeout 2014-02-14 12:37:21 +01:00
831fc2a952 Pt100 and Pt1000 temperature sensors handling 2014-02-14 12:26:27 +01:00