raphael.breiting/Marlin
1
1
Fork 0
forked from Mirrors/Marlin
Code Pull Requests Activity

Commit Graph

  • e4dc80d3d3 Update Configuration_adv.h MyMakibox 2014-04-23 17:30:07 +08:00
  • 6adbdf42e0 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-04-21 15:10:57 +01:00
  • 5107018414 Merge pull request #888 from whosawhatsis/quick_home nothinman 2014-04-20 03:13:36 +01:00
  • 27d544ac25 Speed up QUICK_HOME feedrate for diagonal move whosawhatsis 2014-04-19 17:26:43 -07:00
  • 013793bbe9 Merge pull request #878 from koldoartola/Marlin_v1 nothinman 2014-04-13 22:37:39 +01:00
  • a23a5395f9 Merge pull request #877 from Nutz95/Marlin_v1 nothinman 2014-04-13 22:33:58 +01:00
  • e5b70237c7 Added new language (Basque-Euskera) koldo artola 2014-04-13 22:19:38 +02:00
  • ed6f4a71c5 fix wrong temptable index Nutz95 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 : Nutz95 2014-04-13 17:03:20 +02:00
  • 086ff1644f Merge pull request #852 from pixatintes/patch-1 nothinman 2014-04-13 00:46:17 +01:00
  • 3ffc9651b1 Merge pull request #845 from DerSchultze/Sanguinololu-servo nothinman 2014-04-13 00:37:28 +01:00
  • 357b87b498 Merge pull request #826 from paciotti/patch-1 nothinman 2014-04-13 00:22:25 +01:00
  • 95ad6ec9a1 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 neildarlow 2014-04-12 22:20:45 +01:00
  • 2fa51f8920 Merge pull request #804 from MissionSt/adjustable-z-probe-offset nothinman 2014-04-07 11:42:45 +01:00
  • 27a7cf9fcf use existing strings Gabe Rosenhouse 2014-04-06 19:43:46 -05:00
  • d3f305332a Allowable range now includes default value Gabe Rosenhouse 2014-02-24 10:06:12 -08:00
  • b0aeac117f Adjustable Z probe offset, via custom M-code Gabe Rosenhouse 2014-02-19 14:59:10 -08:00
  • 73b380d8d2 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-04-06 19:15:29 +01:00
  • fe4930212c Merge pull request #871 from whosawhatsis/fwretract nothinman 2014-04-04 20:59:21 +01:00
  • dca9790f42 Update Readme descriptions for M200, M207 and M208 whosawhatsis 2014-04-04 10:13:44 -07:00
  • c23376f2e7 Merge pull request #837 from whosawhatsis/fwretract nothinman 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) nothinman 2014-04-03 18:05:48 +01:00
  • f1501317ca Merge pull request #860 from drf5n/therm3950 nothinman 2014-04-02 18:29:57 +01:00
  • 9a5d23d96f Merge pull request #866 from sakunamary/Marlin_v1 nothinman 2014-04-02 18:27:42 +01:00
  • 303ee67896 Merge pull request #864 from whosawhatsis/M200 nothinman 2014-04-02 18:26:15 +01:00
  • 8759508319 fix bug for dual extruders not working Tim 2014-04-01 09:26:19 +08:00
  • a65564eef6 fix bug in M200 with multiple extruders whosawhatsis 2014-03-30 11:34:36 -07:00
  • aeaf9b9312 fix bug in M200 with multiple extruders whosawhatsis 2014-03-30 11:34:36 -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. Neil Darlow 2014-03-27 17:02:17 +00:00
  • b0093a1513 thermistortables.h: Add comments that table 60 uses beta=3950. David Forrest 2014-03-26 23:41:10 -04:00
  • a3530d1141 Update language.h pixatintes 2014-03-23 18:06:48 +01:00
  • 990e770e15 Update language.h pixatintes 2014-03-23 10:30:08 +01:00
  • f643f4d674 Test and refactor Dan Nixon 2014-03-21 20:42:00 +00:00
  • bbe8fbe13d Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 neildarlow 2014-03-21 18:27:14 +00:00
  • 51c6bd6b72 Merge pull request #846 from Dim3nsioneer/Marlin_v1 nothinman 2014-03-19 13:47:20 +00:00
  • c8cdd1fc6f Bugfixes for language option 6 (russian) Dim3nsioneer 2014-03-19 14:27:38 +01:00
  • 7395dafc1e semantic changes in language.h Dim3nsioneer 2014-03-19 12:30:50 +01:00
  • fad2a60ce6 Corrections for preheat extension in language.h Dim3nsioneer 2014-03-19 12:23:35 +01:00
  • eecda434fb Sanguinololu servo pins set default disabled Ralf Schultz 2014-03-18 08:25:20 +01:00
  • 944ced87c5 Extended Preheat options Dim3nsioneer 2014-03-17 18:37:46 +01:00
  • 06709ad60e Added servo pin assignments to Sanguinololu Ralf Schultz 2014-03-17 15:45:13 +01:00
  • 084134d3c7 Merge pull request #841 from Dim3nsioneer/Marlin_v1 ErikZalm 2014-03-15 20:21:48 +01:00
  • 3906f27c46 Individual extruder flow rate Dim3nsioneer 2014-03-15 18:09:46 +01:00
  • 8613a74443 Merge pull request #1 from ErikZalm/Marlin_v1 Dim3nsioneer 2014-03-15 17:49:30 +01:00
  • a38c90ee84 Added estop handling Dan Nixon 2014-03-15 15:56:15 +00:00
  • a00cec8b71 Merge pull request #833 from mattsch/optional_feedrate_multiplier ErikZalm 2014-03-15 15:41:45 +01:00
  • 1f895844ac Merge pull request #829 from blddk/Marlin_v1 ErikZalm 2014-03-15 15:34:04 +01:00
  • af8be9013b Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1 neildarlow 2014-03-15 07:24:47 +00:00
  • 0ddee3c7db Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection whosawhatsis 2014-03-14 18:27:11 -07:00
  • 272072fa20 Added M112 Dan Nixon 2014-03-14 23:19:43 +00:00
  • aab61e63c3 FWRETRACT in mm/s whosawhatsis 2014-03-14 14:52:48 -07:00
  • 6cd85e6008 Add support for disabling encoder control for feedrate multiplier Matthew Schick 2014-03-12 18:13:50 -04:00
  • 09af1b90b8 Added CHDK support blddk 2014-03-10 21:57:08 +01:00
  • 765b2da3d4 Added CHDK support blddk 2014-03-10 21:52:33 +01:00
  • 881e348eed Update Configuration_adv.h paciotti 2014-03-08 22:35:05 +01:00
  • 5a332df47e Merge https://github.com/ErikZalm/Marlin into Marlin_v1 neildarlow 2014-03-06 20:56:44 +00:00
  • 040357fd1b Merge pull request #822 from tommil/Marlin_v1 nothinman 2014-03-05 16:34:47 +00:00
  • 15d1b8d719 Fixed finnish translation Tommi Lamberg 2014-03-05 14:02:52 +02:00
  • 7325d7102e Activate LiquidTWI2 device detection and space-pad LCD status line. neildarlow 2014-03-03 21:01:27 +00:00
  • 7f76a0e064 Merge pull request #813 from drf5n/PID_DEBUG ErikZalm 2014-02-26 17:31:48 +01:00
  • 4f3eb6bec8 Merge pull request #811 from anfroholic/patch-1 ErikZalm 2014-02-26 17:30:49 +01:00
  • fcd8524b6e Only increase EEPROM version for DELTA printers. Erik van der Zalm 2014-02-26 17:29:27 +01:00
  • 8c98690e1d Merge pull request #786 from wolfmanjm/add/M665-set-delta-configuration ErikZalm 2014-02-26 17:26:19 +01:00
  • 8ea5665ee2 Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration Jim Morris 2014-02-26 00:19:28 -08:00
  • 8c4377dd63 temperature.cpp: Fix PID_DEBUG compile error. David Forrest 2014-02-26 00:44:22 -05:00
  • 661e378ce9 Update README.md anfroholic 2014-02-25 17:46:23 -06:00
  • fde8c2c310 Merge pull request #807 from Cylindric3D/typofixes_upstream5 ErikZalm 2014-02-25 18:49:41 +01:00
  • 1aa10a5f18 Merge pull request #806 from Cylindric3D/typofixes_upstream ErikZalm 2014-02-25 18:48:52 +01:00
  • fdce91192e Various typo fixes - only in comments, no code changes. Cylindric 2014-02-25 10:01:15 +00:00
  • d819c55395 Various typo fixes - only in comments, no code changes. Cylindric 2014-02-25 09:52:58 +00:00
  • fd4542f33a Merge pull request #805 from whosawhatsis/M200 ErikZalm 2014-02-24 22:35:08 +01:00
  • e8291ed728 Merge pull request #802 from Makers-Tool-Works/Marlin_v1 ErikZalm 2014-02-24 22:31:13 +01:00
  • 465b654d24 Merge pull request #797 from Cylindric3D/update_menu_plan ErikZalm 2014-02-24 22:30:19 +01:00
  • 88506a80c3 Merge pull request #789 from smiler/Marlin_v1 ErikZalm 2014-02-24 22:26:31 +01:00
  • b514d3c87f Merge pull request #781 from Cylindric3D/typofixes_upstream ErikZalm 2014-02-24 22:25:38 +01:00
  • 77df0d689a autretract fix whosawhatsis 2014-02-24 13:15:36 -08:00
  • cc5f1d475c Merge pull request #772 from ellensp/Marlin_v1 ErikZalm 2014-02-24 22:22:15 +01:00
  • 91759dede6 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream Cylindric 2014-02-24 17:29:37 +00:00
  • 557217fc05 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan Cylindric 2014-02-24 17:29:24 +00:00
  • aee63afccd Clarify which PID values to enter RoyOnWheels 2014-02-23 14:36:50 -08:00
  • d3fcc28e64 Merge pull request #796 from MissionSt/any-pt-abl alexborro 2014-02-22 13:18:57 -03:00
  • 99f6326544 Remove unnecessary dependency on time.h from qr_solve.cpp Gabe Rosenhouse 2014-02-20 16:43:37 -08:00
  • ea669cb504 Fix some extra and some missing tabs, to make the file consistent. Cylindric 2014-02-20 14:28:29 +00:00
  • b46a1b6360 Update the menu plan document with the current menu as per ultralcd.cpp. Cylindric 2014-02-20 14:20:27 +00:00
  • 3cc7626d1f Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan Cylindric 2014-02-20 14:12:10 +00:00
  • 174b8d99d5 Simplify 3-point probing using new code only Gabe Rosenhouse 2014-02-19 21:12:39 -08:00
  • 3b718b816c better documentation Gabe Rosenhouse 2014-02-19 14:04:37 -08:00
  • 34fd59c370 ABL at any points Gabe Rosenhouse 2014-02-15 18:06:51 -08:00
  • 541155ea87 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream Cylindric 2014-02-19 15:52:18 +00:00
  • 9fa328e5c8 Merge pull request #793 from MissionSt/use_axis_enums alexborro 2014-02-19 10:15:57 -03:00
  • 73f0ee9345 Merge pull request #794 from MissionSt/g29_requires_home alexborro 2014-02-19 10:14:34 -03:00
  • f308a8af91 update comment Gabe Rosenhouse 2014-02-19 01:06:24 -08:00
  • 357e31270a Prevent G29 without first homing in X and Y Gabe Rosenhouse 2014-02-19 00:51:43 -08:00
  • d2d7d186b5 Use descriptive constants, more Gabe Rosenhouse 2014-02-19 00:10:17 -08:00
  • 2ccdf4f36d Use descriptive constants instead of numeric literals Gabe Rosenhouse 2014-02-19 00:02:59 -08:00
  • c00383f286 Fixed typo. Christian Axelsson 2014-02-18 18:50:12 +01:00
  • 60f72a78a9 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream Cylindric 2014-02-18 17:31:58 +00:00
  • abba7a0003 Merge pull request #782 from marcovannoord/Marlin_v1 nothinman 2014-02-18 16:19:50 +00:00
  • b868d668fa Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream Cylindric 2014-02-18 12:11:01 +00:00
  • 8212d8d543 Revert "Fixed small typo that would prevent compiling" Marco 2014-02-18 10:40:25 +01:00