melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,877 Commits
2 Branches
0 Tags
2.0 GiB
x301
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd295f984e3'
${ noResults }
Commit Graph

8877 Commits (d295f984e32e71ab4b9a82fb24813261455e5060)
 

Author SHA1 Message Date
Neil Darlow 73b380d8d2 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
nothinman fe4930212c Merge pull request #871 from whosawhatsis/fwretract 
Update Readme descriptions for M200, M207 and M208
 11 years ago
whosawhatsis dca9790f42 Update Readme descriptions for M200, M207 and M208 11 years ago
nothinman c23376f2e7 Merge pull request #837 from whosawhatsis/fwretract 
FWRETRACT in mm/s
 11 years ago
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) 11 years ago
nothinman f1501317ca Merge pull request #860 from drf5n/therm3950 
thermistortables.h: Add comments that table 60 uses beta=3950.
 11 years ago
nothinman 9a5d23d96f Merge pull request #866 from sakunamary/Marlin_v1 
fix bug for dual extruders not working
 11 years ago
nothinman 303ee67896 Merge pull request #864 from whosawhatsis/M200 
fix bug in M200 with multiple extruders
 11 years ago
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.
 11 years ago
whosawhatsis a65564eef6 fix bug in M200 with multiple extruders 11 years ago
whosawhatsis aeaf9b9312 fix bug in M200 with multiple extruders 11 years ago
Neil Darlow 89f78b0b80 Allow use of either SD Card slot when LCD Panel is configured. 
Preference is for Controller SD slot before LCD Panel slot when both are occupied.
 11 years ago
David Forrest b0093a1513 thermistortables.h: Add comments that table 60 uses beta=3950. 11 years ago
pixatintes a3530d1141 Update language.h 
Updated to latest version.
 11 years ago
pixatintes 990e770e15 Update language.h 
Added catalan language
 11 years ago
Dan Nixon f643f4d674 Test and refactor 11 years ago
neildarlow bbe8fbe13d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
nothinman 51c6bd6b72 Merge pull request #846 from Dim3nsioneer/Marlin_v1 
Extended Preheat options
 11 years ago
Dim3nsioneer c8cdd1fc6f Bugfixes for language option 6 (russian) 11 years ago
Dim3nsioneer 7395dafc1e semantic changes in language.h 11 years ago
Dim3nsioneer fad2a60ce6 Corrections for preheat extension in language.h 11 years ago
Ralf Schultz eecda434fb Sanguinololu servo pins set default disabled 11 years ago
Dim3nsioneer 944ced87c5 Extended Preheat options 
Preheat LCD menus base on code by D-Base
 11 years ago
Ralf Schultz 06709ad60e Added servo pin assignments to Sanguinololu 11 years ago
ErikZalm 084134d3c7 Merge pull request #841 from Dim3nsioneer/Marlin_v1 
Set flow rate (extrude-mutliplier) for each extruder individually
 11 years ago
Dim3nsioneer 3906f27c46 Individual extruder flow rate 
Extension of M221, Tune menu
 11 years ago
Dim3nsioneer 8613a74443 Merge pull request #1 from ErikZalm/Marlin_v1 
Update on 140315
 11 years ago
Dan Nixon a38c90ee84 Added estop handling 11 years ago
ErikZalm a00cec8b71 Merge pull request #833 from mattsch/optional_feedrate_multiplier 
Add support for disabling encoder control for feedrate multiplier
 11 years ago
ErikZalm 1f895844ac Merge pull request #829 from blddk/Marlin_v1 
Added CHDK support
 11 years ago
neildarlow af8be9013b Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1 11 years ago
whosawhatsis 0ddee3c7db Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection 11 years ago
Dan Nixon 272072fa20 Added M112 11 years ago
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.
 11 years ago
Matthew Schick 6cd85e6008 Add support for disabling encoder control for feedrate multiplier 
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
 11 years ago
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/
 11 years ago
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/
 11 years ago
paciotti 881e348eed Update Configuration_adv.h 
Increase Z_HOME_RETRACT_MM to 2mm default to avoid end stop not switching during retract.
 11 years ago
neildarlow 5a332df47e Merge https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
nothinman 040357fd1b Merge pull request #822 from tommil/Marlin_v1 
Fixed Finnish translation
 11 years ago
Tommi Lamberg 15d1b8d719 Fixed finnish translation 
- Fixed Few finnish transalations
- Removed duplicate contrast define
 11 years ago
neildarlow 7325d7102e Activate LiquidTWI2 device detection and space-pad LCD status line. 11 years ago
ErikZalm 7f76a0e064 Merge pull request #813 from drf5n/PID_DEBUG 
temperature.cpp: Fix PID_DEBUG compile error.
 11 years ago
ErikZalm 4f3eb6bec8 Merge pull request #811 from anfroholic/patch-1 
Update README.md with Autotemp typo fix
 11 years ago
Erik van der Zalm fcd8524b6e Only increase EEPROM version for DELTA printers. 11 years ago
ErikZalm 8c98690e1d Merge pull request #786 from wolfmanjm/add/M665-set-delta-configuration 
Add M665 to dynamically set delta configuration
 11 years ago
Jim Morris 8ea5665ee2 Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration 
Conflicts:
	Marlin/Marlin_main.cpp
 11 years ago
David Forrest 8c4377dd63 temperature.cpp: Fix PID_DEBUG compile error. 11 years ago
anfroholic 661e378ce9 Update README.md 11 years ago
ErikZalm fde8c2c310 Merge pull request #807 from Cylindric3D/typofixes_upstream5 
Various typo fixes #5 - only in comments, no code changes.
 11 years ago