zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
1353 commits 1 branch 0 tags 156 MiB
Commit graph

1171 commits

Author SHA1 Message Date
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 aeaf9b9312 fix bug in M200 with multiple extruders 2014-03-30 11:41:57 -07: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
Dim3nsioneer 944ced87c5 Extended Preheat options 
Preheat LCD menus base on code by D-Base
 2014-03-17 18:37:46 +01:00
Dim3nsioneer 3906f27c46 Individual extruder flow rate 
Extension of M221, Tune menu
 2014-03-15 18:09:46 +01: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
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
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