SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1437 commits 1 branch 0 tags 119 MiB
Commit graph

1240 commits

Author SHA1 Message Date
nothinman
3ffc9651b1 Merge pull request #845 from DerSchultze/Sanguinololu-servo 
Added servo pin assignments to Sanguinololu
 2014-04-13 00:37:28 +01:00
nothinman
357b87b498 Merge pull request #826 from paciotti/patch-1 
Configuration_adv.h
 2014-04-13 00:22:25 +01:00
Gabe Rosenhouse
27a7cf9fcf use existing strings 2014-04-07 05:01:48 -05:00
Gabe Rosenhouse
d3f305332a Allowable range now includes default value 2014-04-06 19:45:56 -05:00
Gabe Rosenhouse
b0aeac117f Adjustable Z probe offset, via custom M-code 2014-04-06 19:45:56 -05:00
nothinman
c23376f2e7 Merge pull request #837 from whosawhatsis/fwretract 
FWRETRACT in mm/s
 2014-04-04 11:47:58 +01:00
nothinman
dfb98101e4 Change CONTROLLERFAN_PIN for board 35 to -1, as it would conflict with board's 33 extruder pin, causing burnout (it's the same board, just different number of fans/extruders, therefore should be pin-compatible) 2014-04-03 18:05:48 +01:00
nothinman
f1501317ca Merge pull request #860 from drf5n/therm3950 
thermistortables.h: Add comments that table 60 uses beta=3950.
 2014-04-02 18:29:57 +01:00
nothinman
9a5d23d96f Merge pull request #866 from sakunamary/Marlin_v1 
fix bug for dual extruders not working
 2014-04-02 18:27:42 +01:00
nothinman
303ee67896 Merge pull request #864 from whosawhatsis/M200 
fix bug in M200 with multiple extruders
 2014-04-02 18:26:15 +01:00
Tim
8759508319 fix bug for dual extruders not working 
some guy find that marlin not working good for dual extruders delta .
when type T0 or T1 to active extruder and  E0 or E1  move causing XYZ
motion . so i locales the bugs and fix it , I have dry run the fix.
 2014-04-01 09:26:19 +08:00
whosawhatsis
a65564eef6 fix bug in M200 with multiple extruders 2014-03-30 11:42:22 -07:00
whosawhatsis
aeaf9b9312 fix bug in M200 with multiple extruders 2014-03-30 11:41:57 -07:00
David Forrest
b0093a1513 thermistortables.h: Add comments that table 60 uses beta=3950. 2014-03-26 23:41:10 -04:00
pixatintes
a3530d1141 Update language.h 
Updated to latest version.
 2014-03-23 18:06:48 +01:00
pixatintes
990e770e15 Update language.h 
Added catalan language
 2014-03-23 10:30:08 +01:00
Dan Nixon
f643f4d674 Test and refactor 2014-03-21 20:42:00 +00:00
Dim3nsioneer
c8cdd1fc6f Bugfixes for language option 6 (russian) 2014-03-19 14:27:38 +01:00
Dim3nsioneer
7395dafc1e semantic changes in language.h 2014-03-19 12:30:50 +01:00
Dim3nsioneer
fad2a60ce6 Corrections for preheat extension in language.h 2014-03-19 12:23:35 +01:00
Ralf Schultz
eecda434fb Sanguinololu servo pins set default disabled 2014-03-18 08:25:20 +01:00
Dim3nsioneer
944ced87c5 Extended Preheat options 
Preheat LCD menus base on code by D-Base
 2014-03-17 18:37:46 +01:00
Ralf Schultz
06709ad60e Added servo pin assignments to Sanguinololu 2014-03-17 15:45:13 +01:00
Dim3nsioneer
3906f27c46 Individual extruder flow rate 
Extension of M221, Tune menu
 2014-03-15 18:09:46 +01:00
Dan Nixon
a38c90ee84 Added estop handling 2014-03-15 15:56:15 +00:00
ErikZalm
a00cec8b71 Merge pull request #833 from mattsch/optional_feedrate_multiplier 
Add support for disabling encoder control for feedrate multiplier
 2014-03-15 15:41:45 +01:00
Dan Nixon
272072fa20 Added M112 2014-03-14 23:19:43 +00:00
whosawhatsis
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.
 2014-03-14 15:17:28 -07:00
Matthew Schick
6cd85e6008 Add support for disabling encoder control for feedrate multiplier 
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
 2014-03-12 18:13:50 -04:00
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/
 2014-03-10 21:57:08 +01:00
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/
 2014-03-10 21:52:33 +01:00
paciotti
881e348eed Update Configuration_adv.h 
Increase Z_HOME_RETRACT_MM to 2mm default to avoid end stop not switching during retract.
 2014-03-08 22:35:05 +01:00
Tommi Lamberg
15d1b8d719 Fixed finnish translation 
- Fixed Few finnish transalations
- Removed duplicate contrast define
 2014-03-05 14:02:52 +02:00
ErikZalm
7f76a0e064 Merge pull request #813 from drf5n/PID_DEBUG 
temperature.cpp: Fix PID_DEBUG compile error.
 2014-02-26 17:31:48 +01:00
Erik van der Zalm
fcd8524b6e Only increase EEPROM version for DELTA printers. 2014-02-26 17:29:27 +01:00
Jim Morris
8ea5665ee2 Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration 
Conflicts:
	Marlin/Marlin_main.cpp
 2014-02-26 00:19:28 -08:00
David Forrest
8c4377dd63 temperature.cpp: Fix PID_DEBUG compile error. 2014-02-26 00:44:22 -05:00
ErikZalm
fde8c2c310 Merge pull request #807 from Cylindric3D/typofixes_upstream5 
Various typo fixes #5 - only in comments, no code changes.
 2014-02-25 18:49:41 +01:00
Cylindric
fdce91192e Various typo fixes - only in comments, no code changes. 2014-02-25 10:01:15 +00:00
Cylindric
d819c55395 Various typo fixes - only in comments, no code changes. 2014-02-25 09:52:58 +00:00
ErikZalm
fd4542f33a Merge pull request #805 from whosawhatsis/M200 
autretract fix
 2014-02-24 22:35:08 +01:00
ErikZalm
e8291ed728 Merge pull request #802 from Makers-Tool-Works/Marlin_v1 
Clarify which PID values to enter
 2014-02-24 22:31:13 +01:00
ErikZalm
465b654d24 Merge pull request #797 from Cylindric3D/update_menu_plan 
Update menu plan
 2014-02-24 22:30:19 +01:00
ErikZalm
88506a80c3 Merge pull request #789 from smiler/Marlin_v1 
Fixed typo.
 2014-02-24 22:26:31 +01:00
ErikZalm
b514d3c87f Merge pull request #781 from Cylindric3D/typofixes_upstream 
Various typo fixes #3 - only in comments, no code changes.
 2014-02-24 22:25:38 +01:00
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
 2014-02-24 13:24:38 -08:00
ErikZalm
cc5f1d475c Merge pull request #772 from ellensp/Marlin_v1 
Updated gen3+ board pins names to current convention
 2014-02-24 22:22:15 +01:00
Cylindric
91759dede6 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-24 17:29:37 +00:00
Cylindric
557217fc05 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan 2014-02-24 17:29:24 +00:00
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"
 2014-02-23 14:36:50 -08:00
Gabe Rosenhouse
99f6326544 Remove unnecessary dependency on time.h from qr_solve.cpp 
Fixed compiler errors on Ubuntu using arduino-core
 2014-02-20 16:43:37 -08:00
Cylindric
ea669cb504 Fix some extra and some missing tabs, to make the file consistent. 2014-02-20 14:28:29 +00:00
Cylindric
b46a1b6360 Update the menu plan document with the current menu as per ultralcd.cpp. 2014-02-20 14:20:27 +00:00
Cylindric
3cc7626d1f Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan 2014-02-20 14:12:10 +00:00
Gabe Rosenhouse
174b8d99d5 Simplify 3-point probing using new code only 2014-02-19 21:48:05 -08:00
Gabe Rosenhouse
3b718b816c better documentation 2014-02-19 14:04:37 -08:00
Gabe Rosenhouse
34fd59c370 ABL at any points 2014-02-19 13:18:21 -08:00
Cylindric
541155ea87 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-19 15:52:18 +00:00
alexborro
9fa328e5c8 Merge pull request #793 from MissionSt/use_axis_enums 
Use constants instead of numeric literals
 2014-02-19 10:15:57 -03:00
Gabe Rosenhouse
f308a8af91 update comment 2014-02-19 01:06:24 -08:00
Gabe Rosenhouse
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
Gabe Rosenhouse
d2d7d186b5 Use descriptive constants, more 2014-02-19 00:10:17 -08:00
Gabe Rosenhouse
2ccdf4f36d Use descriptive constants instead of numeric literals 2014-02-19 00:02:59 -08:00
Christian Axelsson
c00383f286 Fixed typo. 2014-02-18 18:50:12 +01:00
Cylindric
60f72a78a9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-18 17:31:58 +00:00
nothinman
abba7a0003 Merge pull request #782 from marcovannoord/Marlin_v1 
Added dutch to language.h
 2014-02-18 16:19:50 +00:00
Cylindric
b868d668fa Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream 2014-02-18 12:11:01 +00:00
Marco
8212d8d543 Revert "Fixed small typo that would prevent compiling" 
This reverts commit 51ae4881ab.
 2014-02-18 10:40:25 +01:00
daid
46bae30573 Merge pull request #776 from whosawhatsis/fwretract 
Fwretract fixes, cleanup
 2014-02-18 10:39:28 +01:00
Marco
51ae4881ab Fixed small typo that would prevent compiling 2014-02-18 09:47:36 +01:00
Marco
498d76fd79 Fixed some messages where the text shown on the screen was more than 17 characters 2014-02-18 09:40:10 +01:00
Jim Morris
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
nothinman
fd42f0d226 Merge pull request #783 from MissionSt/fix/syntax-error 
Fix compile error
 2014-02-17 20:59:43 +00:00
nothinman
96217bf36a Merge pull request #777 from PxT/M114 
Add whitespace to M114 output
 2014-02-17 18:07:47 +00:00
Marco
cf5c3b6610 Added dutch to language.h 2014-02-17 17:00:50 +01:00
Gabe Rosenhouse
d1c64b9dc4 Fix syntax error introduced in 477b6fa1d 2014-02-17 07:56:19 -08:00
Cylindric
5d50819791 Various typo fixes - only in comments, no code changes. 2014-02-17 13:04:44 +00:00
nothinman
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
nothinman
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
nothinman
d4ba23bc28 Merge pull request #770 from josefpavlik/Marlin_v1 
Marlin v1
 2014-02-17 11:27:05 +00:00
nothinman
bbb424bd2f Merge pull request #779 from MissionSt/makefile-fix-abl 
Makefile fixes
 2014-02-17 11:22:34 +00:00
Cylindric
8f0cee2a14 Various typo fixes - only in comments, no code changes. 2014-02-17 10:58:36 +00:00
Cylindric
08263ae66e Merge branch 'Marlin_v1' into typofixes_1 2014-02-17 10:28:20 +00:00
Gabe Rosenhouse
5bd09d26e2 Makefile works with auto bed leveling 2014-02-16 23:23:29 -08:00
Gabe Rosenhouse
b45beeffd6 typo fix in Makefile 2014-02-16 23:23:29 -08:00
Paul Telford
306588925d Add whitespace to M114 output 2014-02-16 21:01:19 -08:00
whosawhatsis
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
whosawhatsis
99f0e44864 Move FWRETRACT defaults to configuration_adv.h 2014-02-16 19:00:28 -08:00
whosawhatsis
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
whosawhatsis
2f2459c0db Fix G10/G11 Z-lift 2014-02-16 18:15:34 -08:00
Gabe Rosenhouse
8c5675c290 Use language.h instead of English literals for "bed" 2014-02-16 17:16:00 -08:00
Gabe Rosenhouse
0f7393a13e Refactor 'accurate' auto bed leveling to use probe_pt() 2014-02-16 10:44:15 -08:00
Gabe Rosenhouse
c4fbb44d6d Refactor 3-point auto bed leveling to use probe_pt() 2014-02-16 10:44:08 -08:00
Gabe Rosenhouse
ad2c6488c7 Add probe_pt(), useful for auto bed leveling 2014-02-16 10:38:29 -08:00
Peter
c9c83a4560 Updated gen3+ board pins names to current convention 2014-02-16 00:47:06 +13:00
Mark Hanford
ab0d3c4fb3 Various typo fixes - only in comments, no code changes. 2014-02-14 11:48:24 +00:00
Josef Pavlik
477b6fa1df move engaged from lcd console refreshes power off timeout 2014-02-14 12:37:21 +01:00
Josef Pavlik
831fc2a952 Pt100 and Pt1000 temperature sensors handling 2014-02-14 12:26:27 +01:00
nothinman
7dcd350941 A few changes to Russian, changed LCD strings to be <=17 characters. 2014-02-13 11:58:14 +00:00
daid
c31bb2b7ad Only show the ZProbe offset when auto-bed-leveling is enabled. 2014-02-13 11:48:55 +01:00