Commit Graph

11258 Commits

Author SHA1 Message Date
97ead2eccb Fix for microstepping pin mapping, not using Teensy pin mapping, but Arduino's default pin mapping so Arduino library can be used 2014-04-25 12:57:11 +08:00
d85411f13a Revert "Fix for stepper microstepping"
This reverts commit eea3ba5588.
2014-04-25 12:41:56 +08:00
7c7f2d094e Revert "Fix for reading microstepping resolution"
This reverts commit 2715f6ddbf.
2014-04-25 12:41:48 +08:00
e2d703377a Enable EEPROM by default for 5DPrint D8 Controller Board in example configuration 2014-04-24 19:15:35 +08:00
2715f6ddbf Fix for reading microstepping resolution 2014-04-24 17:48:33 +08:00
39e9b133f3 Add example configuration for Makibox printer, which uses the 5DPrint D8 Driver Board 2014-04-24 17:06:07 +08:00
da6b536182 Add 5DPrint D8 Driver Board info and temperature table for Makibox hot bed 2014-04-24 16:49:42 +08:00
3a8e36f19e Add Digipot config for 5DPrint D8 Driver Board 2014-04-24 12:56:46 +08:00
eea3ba5588 Fix for stepper microstepping 2014-04-24 12:56:06 +08:00
1cbcbb0971 Add makibox machine information 2014-04-24 12:55:21 +08:00
2fa514e88a Add port for 5DPrint D8 Driver board 2014-04-24 12:55:00 +08:00
b9126ab497 Merge pull request #894 from MyMakibox/Marlin_v1
Update Marlin_main.cpp
2014-04-23 16:23:56 +01:00
a33f099547 Merge pull request #893 from MyMakibox/patch-1
Update Configuration_adv.h
2014-04-23 16:23:40 +01:00
21ec6b88c3 Update Marlin_main.cpp
Added description of autotemp flags to M109
2014-04-23 17:33:26 +08:00
e4dc80d3d3 Update Configuration_adv.h
Corrected error in AUTOTEMP instructions
2014-04-23 17:30:07 +08:00
6adbdf42e0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-04-21 15:10:57 +01:00
5107018414 Merge pull request #888 from whosawhatsis/quick_home
Speed up QUICK_HOME feedrate for diagonal move
2014-04-20 03:13:36 +01:00
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.
2014-04-19 17:29:20 -07:00
013793bbe9 Merge pull request #878 from koldoartola/Marlin_v1
Added new language (Basque-Euskera)
2014-04-13 22:37:39 +01:00
a23a5395f9 Merge pull request #877 from Nutz95/Marlin_v1
pull Request to Add beta 3950 1% thermistor table into marlin firmware
2014-04-13 22:33:58 +01:00
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)
2014-04-13 22:19:38 +02:00
ed6f4a71c5 fix wrong temptable index 2014-04-13 18:00:55 +02:00
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
2014-04-13 17:03:20 +02:00
086ff1644f Merge pull request #852 from pixatintes/patch-1
Update language.h
2014-04-13 00:46:17 +01:00
3ffc9651b1 Merge pull request #845 from DerSchultze/Sanguinololu-servo
Added servo pin assignments to Sanguinololu
2014-04-13 00:37:28 +01:00
357b87b498 Merge pull request #826 from paciotti/patch-1
Configuration_adv.h
2014-04-13 00:22:25 +01:00
95ad6ec9a1 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-04-12 22:20:45 +01:00
2fa51f8920 Merge pull request #804 from MissionSt/adjustable-z-probe-offset
Adjustable Z probe offset via custom M-code
2014-04-07 11:42:45 +01:00
27a7cf9fcf use existing strings 2014-04-07 05:01:48 -05:00
d3f305332a Allowable range now includes default value 2014-04-06 19:45:56 -05:00
b0aeac117f Adjustable Z probe offset, via custom M-code 2014-04-06 19:45:56 -05:00
73b380d8d2 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-04-06 19:15:29 +01:00
fe4930212c Merge pull request #871 from whosawhatsis/fwretract
Update Readme descriptions for M200, M207 and M208
2014-04-04 20:59:21 +01:00
dca9790f42 Update Readme descriptions for M200, M207 and M208 2014-04-04 10:13:44 -07:00
c23376f2e7 Merge pull request #837 from whosawhatsis/fwretract
FWRETRACT in mm/s
2014-04-04 11:47:58 +01:00
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
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
9a5d23d96f Merge pull request #866 from sakunamary/Marlin_v1
fix bug for dual extruders not working
2014-04-02 18:27:42 +01:00
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
a65564eef6 fix bug in M200 with multiple extruders 2014-03-30 11:42:22 -07:00
aeaf9b9312 fix bug in M200 with multiple extruders 2014-03-30 11:41:57 -07:00
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.
2014-03-27 17:02:17 +00:00
b0093a1513 thermistortables.h: Add comments that table 60 uses beta=3950. 2014-03-26 23:41:10 -04:00
a3530d1141 Update language.h
Updated to latest version.
2014-03-23 18:06:48 +01:00
990e770e15 Update language.h
Added catalan language
2014-03-23 10:30:08 +01:00
f643f4d674 Test and refactor 2014-03-21 20:42:00 +00:00
bbe8fbe13d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 2014-03-21 18:27:14 +00:00
51c6bd6b72 Merge pull request #846 from Dim3nsioneer/Marlin_v1
Extended Preheat options
2014-03-19 13:47:20 +00:00
c8cdd1fc6f Bugfixes for language option 6 (russian) 2014-03-19 14:27:38 +01:00