SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Commit graph

  • 253cf0f427 Add Arduino additions for Arduino 1.5.x. Courtney Bane 2014-07-03 18:51:52 -05:00
  • 32a6451ad8 Add leapfrog and dual Y/Z bonm014 2014-07-03 21:15:03 +02:00
  • b5417be109 Update Configuration.h bonm014 2014-07-03 21:03:22 +02:00
  • f244045245 Update pins.h bonm014 2014-07-03 21:01:41 +02:00
  • ce517df702 Merge pull request #989 from bq/cancel_heatup alexborro 2014-07-01 13:21:53 -03:00
  • 2242a84218 Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965 Pablo Clemente 2014-07-01 16:45:03 +02:00
  • 6e3406d228 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-07-01 10:27:39 +01:00
  • 43c298a7a9 Add "Thermal Runaway Protection" feature alexborro 2014-06-30 15:22:37 -03:00
  • 4c823224b0 Merge pull request #965 from bq/forced_heating_stop daid 2014-06-30 18:50:26 +02:00
  • d86c3cf43c Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too. Pablo Clemente 2014-06-30 15:12:13 +02:00
  • f0cab611db optimised some math-code cocktailyogi 2014-06-24 18:43:36 +02:00
  • 269a068032 Fix lcd itostr3() to handle negative numbers Oskar Linde 2014-06-24 14:31:15 +02:00
  • fae7d08698 fixed wrong compiler-option cocktailyogi 2014-06-23 18:16:42 +02:00
  • 512f2a3136 restore Branch from Backup cocktailyogi 2014-06-23 17:09:57 +02:00
  • cd3220d055 Inverted state logic for forced_heating_stop variable Pablo Clemente 2014-06-13 08:39:58 +02:00
  • 86b4b805d2 Fixed stop print LCD function on M104 Pablo Clemente 2014-06-12 18:43:16 +02:00
  • 1875ab3bd7 Merge pull request #955 from gregington/pico-thermistor nothinman 2014-06-08 17:27:21 +01:00
  • 6e6e4e2143 Added thermistor table for the 500C thermistor shipped with the Pico hot end. Greg Tan 2014-06-08 09:35:04 +08:00
  • 9d11b70436 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-06-07 20:48:25 +01:00
  • ea9bffdc48 Merge pull request #949 from foosel/fix/M30_clearToSend_bug nothinman 2014-06-02 18:02:36 +01:00
  • 0de826160e M30 response is missing linefeed, "ok" therefore not on own line Gina Häußge 2014-06-02 17:11:32 +02:00
  • 3c927901a4 Implementation of FW extruder change retract Dim3nsioneer 2014-06-02 17:02:10 +02:00
  • c8d0ca9337 Merge pull request #947 from Dim3nsioneer/Marlin_v1 nothinman 2014-06-02 14:10:25 +01:00
  • 8a32c5395b renaming the disable inactive extruder feature Dim3nsioneer 2014-06-02 14:07:02 +02:00
  • 29e7639933 Add switch unused feeder(s) off Dim3nsioneer 2014-06-02 08:13:09 +02:00
  • 5a18324030 Merge pull request #946 from Jnesselr/jnesselr/plannerdoc nothinman 2014-06-02 01:33:23 +01:00
  • 07c0eeee99 Fixed a comment in the planner Justin Nesselrotte 2014-06-01 19:04:41 -05:00
  • b7aac49995 Merge pull request #941 from drf5n/teensypp2 nothinman 2014-05-30 12:29:25 +01:00
  • 09b84faa00 Configuration.h, pins.h: Add MOTHERBOARD 84 for Teensy++2.0 David Forrest 2014-01-10 15:23:30 -05:00
  • efb6d61413 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 neildarlow 2014-05-24 13:08:58 +01:00
  • 38192cb5f3 Add M112 description to Marlin_main nothinman 2014-05-20 15:20:19 +01:00
  • aed5ec008a Merge pull request #851 from DanNixon/estop nothinman 2014-05-19 17:55:34 +01:00
  • cfb98ef682 More coverity fixes Erik van der Zalm 2014-05-15 22:09:50 +02:00
  • 88b494678f Merge pull request #919 from zaubara/Marlin_v1 nothinman 2014-05-15 15:51:14 +01:00
  • 92e14298b0 Fixes typo for lcd backlighting on I2C PCF8575 zaubara 2014-05-15 01:37:23 +02:00
  • 9db9842aea Fixed error found by the free coverity tool (https://scan.coverity.com/) Erik van der Zalm 2014-05-14 21:59:48 +02:00
  • e541323741 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-05-09 15:02:50 +01:00
  • 1c9a70cee9 Support for Gen3 Monolithic electronics Alejandro Romero 2014-05-06 19:24:20 -05:00
  • 2acd3792fc Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid 2014-05-01 12:03:47 +02:00
  • 8b4c4aa5c3 Add feature to check&retry CRC read errors on SD. daid 2014-05-01 12:03:41 +02:00
  • ce76843dc3 Merge pull request #897 from Makible/5DPrint_D8_Board_Support nothinman 2014-04-28 22:11:28 +01:00
  • ad5c8cbba9 Add safety limit for hot bed power in example configuration Cameron Lai 2014-04-25 17:04:24 +08:00
  • 6460709d92 Fix bug in PID Autotune report Cameron Lai 2014-04-25 16:05:05 +08:00
  • 105bebb466 Fix for pin mapping for SDSS pin and Fan pin, so Arduino library can be used Cameron Lai 2014-04-25 12:57:47 +08:00
  • 97ead2eccb Fix for microstepping pin mapping, not using Teensy pin mapping, but Arduino's default pin mapping so Arduino library can be used Cameron Lai 2014-04-25 12:57:11 +08:00
  • d85411f13a Revert "Fix for stepper microstepping" Cameron Lai 2014-04-25 12:41:56 +08:00
  • 7c7f2d094e Revert "Fix for reading microstepping resolution" Cameron Lai 2014-04-25 12:41:48 +08:00
  • e2d703377a Enable EEPROM by default for 5DPrint D8 Controller Board in example configuration Cameron Lai 2014-04-24 19:15:35 +08:00
  • 2715f6ddbf Fix for reading microstepping resolution Cameron Lai 2014-04-24 17:48:33 +08:00
  • 39e9b133f3 Add example configuration for Makibox printer, which uses the 5DPrint D8 Driver Board Cameron Lai 2014-04-24 17:06:07 +08:00
  • da6b536182 Add 5DPrint D8 Driver Board info and temperature table for Makibox hot bed Cameron Lai 2014-04-24 16:49:42 +08:00
  • 3a8e36f19e Add Digipot config for 5DPrint D8 Driver Board Cameron Lai 2014-04-24 12:56:46 +08:00
  • eea3ba5588 Fix for stepper microstepping Cameron Lai 2014-04-24 12:56:06 +08:00
  • 1cbcbb0971 Add makibox machine information Cameron Lai 2014-04-24 12:55:21 +08:00
  • 2fa514e88a Add port for 5DPrint D8 Driver board Cameron Lai 2014-04-24 12:55:00 +08:00
  • b9126ab497 Merge pull request #894 from MyMakibox/Marlin_v1 nothinman 2014-04-23 16:23:56 +01:00
  • a33f099547 Merge pull request #893 from MyMakibox/patch-1 nothinman 2014-04-23 16:23:40 +01:00
  • 21ec6b88c3 Update Marlin_main.cpp MyMakibox 2014-04-23 17:33:26 +08:00
  • 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