melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 26a441fc7d More 3Drag controller patches. Erik van der Zalm 2013-06-10 18:26:15 +02:00
  • ac975ed8c2 Merge branch 'deltabot' into Marlin_v1 Erik van der Zalm 2013-06-10 18:20:29 +02:00
  • 58d12aad73 Merge pull request #511 from wolfmanjm/ezdelta ErikZalm 2013-06-09 23:45:03 -07:00
  • caa848f943 fix homing for deltas Jim Morris 2013-06-09 21:10:00 -07:00
  • 7ad12be763 Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1 Erik van der Zalm 2013-06-09 23:10:41 +02:00
  • 408169aef4 Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1 Erik van der Zalm 2013-06-09 22:57:40 +02:00
  • bd96d22bfb Merge branch 'Marlin_v1' into thinkyhead Erik van der Zalm 2013-06-09 22:26:47 +02:00
  • 73f21cd5d6 Spanish updated so far. Erik van der Zalm 2013-06-09 21:40:35 +02:00
  • 6f4a6e531c Merge branch 'deltabot' into Marlin_v1 Erik van der Zalm 2013-06-09 13:55:18 +02:00
  • 01edf22a10 Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue. Erik van der Zalm 2013-06-09 13:54:19 +02:00
  • ff6fa09ecf Moved corexy implementation from stepper to planner (Thanks iquizzle) Erik van der Zalm 2013-06-09 13:10:06 +02:00
  • c8dcc7c208 Allow increasing the software PWM frequency. Erik van der Zalm 2013-06-09 12:52:49 +02:00
  • 8b0d82e9db Removed "awaiting translation" for french Erik van der Zalm 2013-06-09 12:24:06 +02:00
  • 1e05d192ab Make the beep tone less offensive Erik van der Zalm 2013-06-09 12:21:16 +02:00
  • 373f3ecab3 Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot Erik van der Zalm 2013-06-09 00:51:58 +02:00
  • e36d31a3b7 Merge pull request #467 from kiyoshigawa/Marlin_v1 ErikZalm 2013-06-08 10:01:53 -07:00
  • f295712008 Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h kiyoshigawa 2013-06-08 09:27:56 -06:00
  • 5c70c785f5 Fixed small error in lcd define statements. kiyoshigawa 2013-06-08 09:11:15 -06:00
  • 69b02031ca Fixed small error in lcd define statements. kiyoshigawa 2013-06-08 09:00:34 -06:00
  • 2ca6c5fbd7 Fixed small error in lcd define statements. kiyoshigawa 2013-06-08 09:00:34 -06:00
  • 6a81291c57 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 kiyoshigawa 2013-06-08 08:48:18 -06:00
  • 15b1b896e8 Update pins.h BorisLandoni 2013-06-08 14:45:11 +02:00
  • c1cb5977ee Update Configuration.h BorisLandoni 2013-06-08 14:37:39 +02:00
  • 8a5bd8a808 Update Configuration.h BorisLandoni 2013-06-08 14:37:17 +02:00
  • 3dea417c25 Merge pull request #506 from codexmas/ServoEndstops ErikZalm 2013-06-08 04:41:27 -07:00
  • c1d7cf939e Update language.h BorisLandoni 2013-06-07 17:38:17 +02:00
  • 4c7d1436e9 Update pins.h BorisLandoni 2013-06-07 18:37:44 +03:00
  • 6588933c04 Update Configuration.h BorisLandoni 2013-06-07 18:36:16 +03:00
  • 5dabc95409 Apply all changes from latest Marlin_V1 Scott Lahteine 2013-06-06 15:49:25 -07:00
  • a733537ddd Missed some variable declarations Integrated fixes from henrikbrixandersen pull request #504 Gord Christmas 2013-06-06 09:18:03 -07:00
  • f4f30c9d64 Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles. Gord Christmas 2013-06-06 07:36:52 -07:00
  • 79374f0b93 Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2013-06-05 17:44:48 +02:00
  • 1520de0093 Merge pull request #505 from MStohn/much-faster-glcd-st7920 ErikZalm 2013-06-05 08:40:59 -07:00
  • da05b3ba94 faster GLCD (ST7920 SW-SPI) implementation / fixes Maik Stohn 2013-06-05 16:27:44 +02:00
  • 4b19c8552e Fixing changed Configuration.h settings to be default values per ErikZalm Request. kiyoshigawa 2013-06-04 12:01:55 -06:00
  • 971ec35135 Expanded M302 to allow setting the temp Erik van der Zalm 2013-06-02 17:36:23 +02:00
  • 4de419e26e Updated README.md Erik van der Zalm 2013-06-02 16:26:42 +02:00
  • a0729f0c3a no message Erik van der Zalm 2013-06-02 15:42:59 +02:00
  • 5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) Erik van der Zalm 2013-05-29 19:29:30 +02:00
  • 16b9239a26 Report temperatures for all extruders Guillaume Seguin 2013-05-29 18:06:12 +02:00
  • a964b3cf3d Merge pull request #495 from Gatulibu/Marlin_v1 ErikZalm 2013-05-28 07:51:49 -07:00
  • 34fb4831a2 Merge pull request #496 from MStohn/fix-16x2-lcd ErikZalm 2013-05-28 07:50:52 -07:00
  • e8572c5239 Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation Maik Stohn 2013-05-28 15:53:07 +02:00
  • 7ee70c2248 Fix: removed wrong ; at end of define Maik Stohn 2013-05-28 15:50:48 +02:00
  • b78fa6bb70 Added support for Megatronics v2.0 and Minitronics v1.0 Gatulibu 2013-05-28 14:03:31 +02:00
  • 9be61cdc02 Added redundant temp sensor Erik van der Zalm 2013-05-26 17:57:49 +02:00
  • 7231a20dba Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42. Erik van der Zalm 2013-05-24 21:05:11 +02:00
  • 7296de34cb Merge pull request #491 from stoneburner/patch-1 ErikZalm 2013-05-22 06:10:25 -07:00
  • e2ff536b03 Fixed typo in Comment Alexander Kasimir 2013-05-22 16:02:03 +03:00
  • df776f36a4 Merge pull request #490 from buildrob101/Marlin_v1 ErikZalm 2013-05-22 05:37:25 -07:00
  • 40eb07bad4 Revert and extend previous change pin check change Robert F-C 2013-05-22 21:33:23 +10:00
  • 440cf2bc10 Merge pull request #488 from MStohn/fix-typo ErikZalm 2013-05-21 09:36:14 -07:00
  • bd33cf4a9f fixed typo / added "const" to defines for newer gcc compatibility Maik Stohn 2013-05-21 17:58:34 +02:00
  • 567291e734 Merge pull request #485 from Banjer/Panelolu2_Melzi ErikZalm 2013-05-21 08:46:27 -07:00
  • 68f9f2521e Merge pull request #487 from MStohn/fix-bad-lcd-commit-from-buildrob ErikZalm 2013-05-21 08:17:21 -07:00
  • 8d80cbbf4c fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored Maik Stohn 2013-05-21 16:53:38 +02:00
  • 273502a172 Merge pull request #486 from xifle/Marlin_v1 ErikZalm 2013-05-20 08:09:51 -07:00
  • 98d0d48191 fixed merge xifle 2013-05-20 14:52:35 +02:00
  • bbe67fca5a soft tab correction xifle 2013-05-20 14:50:39 +02:00
  • 9eeb711c96 Merged from Upstream Master xifle 2013-05-20 14:45:37 +02:00
  • 424101110c Add Panelolu2 support for Melzi Bas Spaans 2013-05-19 12:04:26 +02:00
  • b2eeebd9c3 Merge pull request #409 from buildrob202/Marlin_v1 ErikZalm 2013-05-19 02:10:33 -07:00
  • 0d4a9444c4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Robert F-C 2013-05-19 08:50:58 +10:00
  • 86cce025f4 Added #ifdef NUM_SERVOS to servo.cpp Erik van der Zalm 2013-05-18 23:12:28 +02:00
  • 1a18a487f9 Merge pull request #407 from buildrob101/Marlin_v1 ErikZalm 2013-05-18 11:28:32 -07:00
  • 03141a5ef4 LCD: Added Deadzone at 100% Feedrate xifle 2013-05-18 19:53:46 +02:00
  • 28ada096e2 Adding servo documentation Gord Christmas 2013-05-18 06:01:58 -07:00
  • 4121311b9d Change to LCD status indicators Robert F-C 2013-05-18 22:30:42 +10:00
  • dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Robert F-C 2013-05-18 21:59:39 +10:00
  • 64360164ad Merge pull request #482 from codexmas/Marlin_v1 ErikZalm 2013-05-16 10:19:00 -07:00
  • 86405cdd11 Merge pull request #479 from MStohn/thermocouple ErikZalm 2013-05-16 10:06:59 -07:00
  • 6c45c3f4e7 BariCUDA changes Erik van der Zalm 2013-05-16 19:00:57 +02:00
  • 96624f0f31 Forgot to include reference to Servo in makefile Gord Christmas 2013-05-16 08:25:20 -07:00
  • dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. Gord Christmas 2013-05-16 07:03:01 -07:00
  • b668cb0516 Adding in clean copies of Servo library from Arduino 1.0.4 Gord Christmas 2013-05-16 06:47:42 -07:00
  • 95dff34b73 fixed wrong compare for min temp check of heater 1 and heater 2 MaikStohn 2013-05-16 01:17:38 +02:00
  • 4cc6f9f6de fixed wrong pin initialization when using temperature 2 pin input MaikStohn 2013-05-16 01:17:08 +02:00
  • 61a48cc662 Add support for RUMBA thermocouple add on MaikStohn 2013-05-16 01:16:33 +02:00
  • 9cc15876be Add support for RUMBA thermocouple add on MaikStohn 2013-05-16 01:16:08 +02:00
  • c9cf2174dd Merge pull request #474 from xifle/Marlin_v1 ErikZalm 2013-05-14 14:58:53 -07:00
  • bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes Erik van der Zalm 2013-05-14 23:56:32 +02:00
  • 37f3199df3 fixed problems in planner with solenoids for BariCUDA when set to 0 Jordan Miller 2013-05-14 17:16:10 -04:00
  • fbd899a37d Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129. Jordan Miller 2013-05-14 16:25:53 -04:00
  • 29bb8d7d4f Fixed "Cooldown" Selection not reseting bed temp xifle 2013-05-14 16:56:19 +02:00
  • 015d0594b0 Optimize menu selection for Viki rotary encoder. Robert F-C 2013-05-12 07:51:28 +10:00
  • 90664d20a4 Merge pull request #472 from gregor2005/Marlin_v1 ErikZalm 2013-05-10 13:26:17 -07:00
  • 2739c26c4f changes: - changed the variables from keypad to reprapworld_keypad - added a missing ifdef check gregor 2013-05-10 22:20:02 +02:00
  • 6fb9573157 added support for the reprapworld keypad gregor 2013-05-10 21:57:17 +02:00
  • 594193c908 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Tim Anderson 2013-05-06 23:29:38 -06:00
  • 1fa61c297e Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion. Tim Anderson 2013-05-06 23:23:54 -06:00
  • b27a59f41e Added support for Elefu RA Board and Elefu Control Panel kiyoshigawa 2013-05-06 08:44:38 -06:00
  • 2c0fa34c9e Merge pull request #466 from midopple/Marlin_v1 ErikZalm 2013-05-05 14:24:48 -07:00
  • a65a26d6b4 If CORE_XY is in use X and Y Axis had to be activated at the same time midopple 2013-05-05 19:23:59 +02:00
  • db2f157a22 Replace the <= to < in the Command M907, M350 and M351. The for loop for Axis count over the Array. Add a break after M907 midopple 2013-05-05 19:19:55 +02:00
  • a5cd582665 Support for 10 level deep SD folder hierarchy Scott Lahteine 2013-05-04 04:18:02 -07:00
  • e3bc420daa Merge pull request #464 from arnoudja/Marlin_v1 daid 2013-05-03 12:38:23 -07:00
  • fc4ab05157 Solved minor bug in controllerFan() Arnoud 2013-05-03 21:32:34 +02:00
  • 0ef54f2f85 Make M303 silent when "S0" is sent Scott Lahteine 2013-05-02 09:55:15 -07:00
  • a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h Scott Lahteine 2013-05-02 09:22:58 -07:00
  • 727aa2a051 Merge pull request #459 from martinxyz/fix-rounding-error daid 2013-05-02 08:34:03 -07:00