6544 Commits (24e3f7abe7487e9d24c418b322fc902df9eb22b3)
 

Author SHA1 Message Date
MyMakibox e4dc80d3d3 Update Configuration_adv.h
Corrected error in AUTOTEMP instructions
11 years ago
Neil Darlow 6adbdf42e0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
nothinman 5107018414 Merge pull request #888 from whosawhatsis/quick_home
Speed up QUICK_HOME feedrate for diagonal move
11 years ago
whosawhatsis 27d544ac25 Speed up QUICK_HOME feedrate for diagonal move
Speed up the diagonal move while still keeping each individual axis at
or below its homing feedrate.
11 years ago
nothinman 013793bbe9 Merge pull request #878 from koldoartola/Marlin_v1
Added new language (Basque-Euskera)
11 years ago
nothinman a23a5395f9 Merge pull request #877 from Nutz95/Marlin_v1
pull Request to Add beta 3950 1% thermistor table into marlin firmware
11 years ago
koldo artola e5b70237c7 Added new language (Basque-Euskera)
Added:
* new language (Basque-Euskera)
* some minor corrections for Spanish
* added 2 new constants for every language (required for a minor change
I am preparing to ultralcd.cpp)
11 years ago
Nutz95 ed6f4a71c5 fix wrong temptable index 11 years ago
Nutz95 3161740df9 This table is made for thermistor 3950 (can be found on ebay for cheap)
it's caracteristics are :

R25℃ ;100KΩ±1%

B Value(R25/50℃):3990K 1%
Dissipation Factor(mW/℃):1.1~1.6 In still Air
Thermal Time Constant(S):10~17 In Still Air
Operating temperature range:  (-50~+260°C)
Dimension:  1.8mm Dia X4.1mm
Lead Length  :30mm

This table was found on the following blogs:
http://cae2100.wordpress.com/2014/03/08/beta3950-thermistor-table-for-marlin/

and

http://microfabricator.com/articles/view/id/531ad7e59aad9d3131000000/beta-3950-thermistor-table-for-marlin
11 years ago
nothinman 086ff1644f Merge pull request #852 from pixatintes/patch-1
Update language.h
11 years ago
nothinman 3ffc9651b1 Merge pull request #845 from DerSchultze/Sanguinololu-servo
Added servo pin assignments to Sanguinololu
11 years ago
nothinman 357b87b498 Merge pull request #826 from paciotti/patch-1
Configuration_adv.h
11 years ago
neildarlow 95ad6ec9a1 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 11 years ago
nothinman 2fa51f8920 Merge pull request #804 from MissionSt/adjustable-z-probe-offset
Adjustable Z probe offset via custom M-code
11 years ago
Gabe Rosenhouse 27a7cf9fcf use existing strings 11 years ago
Gabe Rosenhouse d3f305332a Allowable range now includes default value 11 years ago
Gabe Rosenhouse b0aeac117f Adjustable Z probe offset, via custom M-code 11 years ago
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