This website requires JavaScript.
cc5f1d475c
Merge pull request #772 from ellensp/Marlin_v1
ErikZalm
2014-02-24 22:22:15 +01:00
91759dede6
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
Cylindric
2014-02-24 17:29:37 +00:00
557217fc05
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
Cylindric
2014-02-24 17:29:24 +00:00
aee63afccd
Clarify which PID values to enter
RoyOnWheels
2014-02-23 14:36:50 -08:00
d3fcc28e64
Merge pull request #796 from MissionSt/any-pt-abl
alexborro
2014-02-22 13:18:57 -03:00
99f6326544
Remove unnecessary dependency on time.h from qr_solve.cpp
Gabe Rosenhouse
2014-02-20 16:43:37 -08:00
ea669cb504
Fix some extra and some missing tabs, to make the file consistent.
Cylindric
2014-02-20 14:28:29 +00:00
b46a1b6360
Update the menu plan document with the current menu as per ultralcd.cpp.
Cylindric
2014-02-20 14:20:27 +00:00
3cc7626d1f
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
Cylindric
2014-02-20 14:12:10 +00:00
174b8d99d5
Simplify 3-point probing using new code only
Gabe Rosenhouse
2014-02-19 21:12:39 -08:00
3b718b816c
better documentation
Gabe Rosenhouse
2014-02-19 14:04:37 -08:00
34fd59c370
ABL at any points
Gabe Rosenhouse
2014-02-15 18:06:51 -08:00
541155ea87
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
Cylindric
2014-02-19 15:52:18 +00:00
9fa328e5c8
Merge pull request #793 from MissionSt/use_axis_enums
alexborro
2014-02-19 10:15:57 -03:00
73f0ee9345
Merge pull request #794 from MissionSt/g29_requires_home
alexborro
2014-02-19 10:14:34 -03:00
f308a8af91
update comment
Gabe Rosenhouse
2014-02-19 01:06:24 -08:00
357e31270a
Prevent G29 without first homing in X and Y
Gabe Rosenhouse
2014-02-19 00:51:43 -08:00
d2d7d186b5
Use descriptive constants, more
Gabe Rosenhouse
2014-02-19 00:10:17 -08:00
2ccdf4f36d
Use descriptive constants instead of numeric literals
Gabe Rosenhouse
2014-02-19 00:02:59 -08:00
c00383f286
Fixed typo.
Christian Axelsson
2014-02-18 18:50:12 +01:00
60f72a78a9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
Cylindric
2014-02-18 17:31:58 +00:00
abba7a0003
Merge pull request #782 from marcovannoord/Marlin_v1
nothinman
2014-02-18 16:19:50 +00:00
b868d668fa
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
Cylindric
2014-02-18 12:11:01 +00:00
8212d8d543
Revert "Fixed small typo that would prevent compiling"
Marco
2014-02-18 10:40:25 +01:00
46bae30573
Merge pull request #776 from whosawhatsis/fwretract
daid
2014-02-18 10:39:28 +01:00
51ae4881ab
Fixed small typo that would prevent compiling
Marco
2014-02-18 09:47:36 +01:00
498d76fd79
Fixed some messages where the text shown on the screen was more than 17 characters
Marco
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
Jim Morris
2014-02-17 20:50:59 -08:00
fd42f0d226
Merge pull request #783 from MissionSt/fix/syntax-error
nothinman
2014-02-17 20:59:43 +00:00
96217bf36a
Merge pull request #777 from PxT/M114
nothinman
2014-02-17 18:07:47 +00:00
cf5c3b6610
Added dutch to language.h
Marco
2014-02-17 17:00:50 +01:00
d1c64b9dc4
Fix syntax error introduced in 477b6fa1d
Gabe Rosenhouse
2014-02-17 07:53:45 -08:00
5d50819791
Various typo fixes - only in comments, no code changes.
Cylindric
2014-02-17 13:04:44 +00:00
3f455889d0
Merge pull request #769 from Cylindric3D/typofixes_1
nothinman
2014-02-17 11:30:01 +00:00
4ddedb3b27
Merge pull request #780 from Cylindric3D/typofixes_2
nothinman
2014-02-17 11:29:18 +00:00
d4ba23bc28
Merge pull request #770 from josefpavlik/Marlin_v1
nothinman
2014-02-17 11:27:05 +00:00
bbb424bd2f
Merge pull request #779 from MissionSt/makefile-fix-abl
nothinman
2014-02-17 11:22:34 +00:00
8f0cee2a14
Various typo fixes - only in comments, no code changes.
Cylindric
2014-02-17 10:58:36 +00:00
08263ae66e
Merge branch 'Marlin_v1' into typofixes_1
Cylindric
2014-02-17 10:28:20 +00:00
3b193d1b5f
Merge pull request #775 from MissionSt/lang-fix/bed
nothinman
2014-02-17 10:26:23 +00:00
5bd09d26e2
Makefile works with auto bed leveling
Gabe Rosenhouse
2014-02-16 23:19:08 -08:00
b45beeffd6
typo fix in Makefile
Gabe Rosenhouse
2014-02-16 23:21:53 -08:00
306588925d
Add whitespace to M114 output
Paul Telford
2014-02-16 21:01:19 -08:00
c43838bb1e
disable auto retract by default
whosawhatsis
2014-02-16 19:04:54 -08:00
99f0e44864
Move FWRETRACT defaults to configuration_adv.h
whosawhatsis
2014-02-16 19:00:28 -08:00
66e3869138
Fix autoretract
whosawhatsis
2014-02-16 18:59:04 -08:00
2f2459c0db
Fix G10/G11 Z-lift
whosawhatsis
2014-02-16 15:53:01 -08:00
8c5675c290
Use language.h instead of English literals for "bed"
Gabe Rosenhouse
2014-02-16 17:16:00 -08:00
a466c8ef68
Merge pull request #774 from MissionSt/cleanup/probe_pt
nothinman
2014-02-17 01:08:58 +00:00
0f7393a13e
Refactor 'accurate' auto bed leveling to use probe_pt()
Gabe Rosenhouse
2014-02-16 10:42:29 -08:00
c4fbb44d6d
Refactor 3-point auto bed leveling to use probe_pt()
Gabe Rosenhouse
2014-02-16 10:40:36 -08:00
ad2c6488c7
Add probe_pt(), useful for auto bed leveling
Gabe Rosenhouse
2014-02-16 10:38:29 -08:00
c9c83a4560
Updated gen3+ board pins names to current convention
Peter
2014-02-16 00:47:06 +13:00
ab0d3c4fb3
Various typo fixes - only in comments, no code changes.
Mark Hanford
2014-02-14 11:48:24 +00:00
477b6fa1df
move engaged from lcd console refreshes power off timeout
Josef Pavlik
2014-02-03 11:30:12 +01:00
831fc2a952
Pt100 and Pt1000 temperature sensors handling
Josef Pavlik
2014-02-14 12:15:31 +01:00
7dcd350941
A few changes to Russian, changed LCD strings to be <=17 characters.
nothinman
2014-02-13 11:58:14 +00:00
c31bb2b7ad
Only show the ZProbe offset when auto-bed-leveling is enabled.
daid
2014-02-13 11:48:55 +01:00
46f5bea19f
Add configurable beep for UltiPanel.
daid
2014-02-13 11:17:33 +01:00
d16a770855
Ultimainboard 2.x does not has a PS_ON pin.
daid
2014-02-13 10:57:03 +01:00
71bb3a8133
Add comments for Ultimainboard 2.0 configuration.
daid
2014-02-13 10:53:46 +01:00
9b7d87e885
Remove duplicate contrast define.
daid
2014-02-13 10:50:17 +01:00
816f0a678a
Merge pull request #768 from whosawhatsis/Marlin_v1
daid
2014-02-13 09:14:57 +01:00
6e43398509
G10/G11 bugfixes
whosawhatsis
2014-02-12 13:01:19 -08:00
d6c5c503d4
correct feedrate units in comments for M207/M208
whosawhatsis
2014-02-12 12:59:50 -08:00
15d6116188
Merge pull request #689 from cajun-rat/tidy
nothinman
2014-02-12 16:38:11 +00:00
0b9ecf3824
Language cleanup, part 1.
Martin Lukasik
2014-02-12 13:21:26 +00:00
b5ba5c1465
Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1
whosawhatsis
2014-02-11 19:06:03 -08:00
78e7654601
Keep FWRETRACT values in terms of millimeters when using M200
whosawhatsis
2014-02-11 19:05:35 -08:00
3f6d44d40b
Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units
whosawhatsis
2014-02-11 18:50:11 -08:00
363dc2f0e8
Merge branch 'Marlin_v1' into update_menu_plan
Cylindric
2014-02-12 00:51:16 +00:00
5f797ca29f
Updated Polish, changed default firmware URL to Marlin.
nothinman
2014-02-11 22:38:01 +00:00
1a6d21bb60
Merge pull request #761 from Cylindric3D/localisation
nothinman
2014-02-11 15:39:18 +00:00
0778f5f028
Add missing entries to the new Aragonian language.
Mark Hanford
2014-02-11 14:40:53 +00:00
54bab3e0d0
Merge branch 'Marlin_v1' into localisation
Mark Hanford
2014-02-11 14:35:28 +00:00
b18b40feff
Merge pull request #760 from danielmartinez/aragonese_trans
nothinman
2014-02-11 14:28:03 +00:00
bdd0211aeb
Move strings in ultralcd.cpp into language.h.
Mark Hanford
2014-02-11 13:54:43 +00:00
c8e5a82d49
keep English as default lang.
Daniel Martinez
2014-02-09 18:24:24 +01:00
f64592e362
Add Aragonese translation
Daniel Martinez
2014-02-09 18:19:37 +01:00
ac74f45dc0
Merge pull request #752 from MatixYo/patch-3
ErikZalm
2014-02-09 17:52:26 +01:00
8ebcc9dc3a
Merge pull request #748 from wolfmanjm/add/azteegx3pro
ErikZalm
2014-02-09 17:50:15 +01:00
19530c9945
Revert "Merge pull request #756 from danielmartinez/aragones"
nothinman
2014-02-09 16:21:00 +00:00
6f76066ab3
Merge pull request #756 from danielmartinez/aragones
nothinman
2014-02-09 13:42:36 +00:00
8b67f6f3e8
Add Aragonese translation
Daniel Martinez
2014-02-09 12:54:05 +01:00
36086d3ca4
Update language.h
MatixYo
2014-02-07 19:15:51 +01:00
1781031f2d
Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h.
Cylindric
2014-02-07 01:52:44 +00:00
d485988bec
fix typo
Jim Morris
2014-02-05 14:39:45 -08:00
8a1fd25363
Default is to not define digipot_i2c
Jim Morris
2014-02-05 14:28:23 -08:00
5097c57d3a
Added pins for Azteeg X3 Pro under motherboard 68
Jim Morris
2014-02-05 14:25:42 -08:00
b819fc53ca
Add Azteeg X3 Pro as motherboard 68 Add digipot i2c control for MCP4451 Allow M907 to set i2c digipot currents in amps Fix Makefile to allow Azteeg motherboards Fix Makefile to allow Wire libraries only Add beeper pin for Azteeg X3 Pro
Jim Morris
2014-02-05 01:47:12 -08:00
e1ae7952eb
Merge pull request #743 from Opticalworm/Marlin_v1
ErikZalm
2014-02-03 12:33:10 -08:00
1cc9212c05
Merge pull request #744 from drf5n/watts
ErikZalm
2014-02-03 12:30:40 -08:00
a5f53f0cf3
Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS
David Forrest
2014-02-03 14:46:09 -05:00
c2b3e88787
Changed 1284p fuse setting for Arduino_1.x.x
Ronald
2014-02-03 15:35:23 +00:00
8d162e5bd7
Improved support for panelolu2 encoder and buzzer
Ronald
2014-02-03 07:45:03 +00:00
430dcb65a7
Merge pull request #740 from whosawhatsis/M200
ErikZalm
2014-02-02 12:22:01 -08:00
3ec0d110bd
Merge pull request #741 from Opticalworm/Marlin_v1
ErikZalm
2014-02-02 12:17:22 -08:00
f303129fb6
Changed 1284p fuse setting for 8, 16 and 20 Mhz
Ronald
2014-02-02 13:13:15 +00:00
b2c11ba980
Change diameter code to 'D'
whosawhatsis
2014-02-01 18:49:25 -08:00
a864d9d4ab
Merge pull request #738 from whosawhatsis/Marlin_v1
ErikZalm
2014-02-01 13:03:00 -08:00