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
7dcd350941
A few changes to Russian, changed LCD strings to be <=17 characters.
2014-02-13 11:58:14 +00:00
c31bb2b7ad
Only show the ZProbe offset when auto-bed-leveling is enabled.
2014-02-13 11:48:55 +01:00
46f5bea19f
Add configurable beep for UltiPanel.
2014-02-13 11:17:33 +01:00
d16a770855
Ultimainboard 2.x does not has a PS_ON pin.
2014-02-13 10:57:03 +01:00
71bb3a8133
Add comments for Ultimainboard 2.0 configuration.
2014-02-13 10:53:46 +01:00
9b7d87e885
Remove duplicate contrast define.
2014-02-13 10:50:17 +01:00
816f0a678a
Merge pull request #768 from whosawhatsis/Marlin_v1
...
multiple FWretract fixes
2014-02-13 09:14:57 +01:00
6e43398509
G10/G11 bugfixes
...
Previous version was broken by using G92 E0 between retract and recover.
2014-02-12 13:03:00 -08:00
d6c5c503d4
correct feedrate units in comments for M207/M208
2014-02-12 13:02:47 -08:00
15d6116188
Merge pull request #689 from cajun-rat/tidy
...
Use C++ initialization list
2014-02-12 16:38:11 +00:00
0b9ecf3824
Language cleanup, part 1.
2014-02-12 13:21:26 +00:00
b5ba5c1465
Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1
2014-02-11 19:06:03 -08:00
78e7654601
Keep FWRETRACT values in terms of millimeters when using M200
...
for volumetric E units
2014-02-11 19:05:35 -08:00
