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

Commit Graph

  • 59b96e323e Merge pull request #640 from fmalpartida/SAV-MkI ErikZalm 2013-11-10 07:26:08 -08:00
  • 2433ee6fc8 Merge pull request #637 from justuswilhelm/Marlin_v1 ErikZalm 2013-11-10 07:22:12 -08:00
  • 3455a2bac2 Merge pull request #636 from PrintToPeer/Marlin_v1 ErikZalm 2013-11-10 07:21:46 -08:00
  • ec1cf6e7f8 Merge pull request #635 from dbenamy/Marlin_v1 ErikZalm 2013-11-10 07:20:49 -08:00
  • dc887ef99b Implement M226 - GCode Initiated Pause Richard Miles 2013-11-09 00:55:23 +00:00
  • c244eb860c If you have a switch on suicide pin, this is useful if you want to start another print with suicide feature after a print without suicide... Charles R 2013-11-04 12:04:04 +01:00
  • 7b556d2e96 Added BT support on AT90USB devices fmalpartida 2013-11-03 19:57:06 +01:00
  • a5e8575829 Add UUID support to M115 responses. Kaz Walker 2013-11-01 14:51:50 -06:00
  • cab84e0e5b Add (correct) missing pin definitions for Y2 Daniel Benamy 2013-10-30 22:44:20 -04:00
  • 5b3f60ea2e Corrected LCD only error fmalpartida 2013-10-30 21:52:46 +01:00
  • 62d0b79023 Fix servo control for Melzi Justus Perlwitz 2013-10-30 20:58:38 +01:00
  • c184f808f7 Merge pull request #632 from dbenamy/Marlin_v1 ErikZalm 2013-10-30 10:47:11 -07:00
  • c886f5cb13 Made instructions more clear. Daniel Benamy 2013-10-30 13:26:49 -04:00
  • b5a964fcc5 Initial SAV MkI (RepRap CloneWars board) integration. fmalpartida 2013-10-30 11:45:32 +01:00
  • 4382068f92 Merge pull request #630 from dumle29/Marlin_v1 ErikZalm 2013-10-29 10:57:12 -07:00
  • f941203172 PS_ON configurable boot state dumle29 2013-10-29 18:44:56 +01:00
  • 47854ff5ce Merge pull request #629 from whosawhatsis/Marlin_v1 Bernhard Kubicek 2013-10-24 20:48:16 -07:00
  • c79e3967b3 Make G11 not horribly broken whosawhatsis 2013-10-24 18:58:42 -07:00
  • 5b8b939a1f Add comments about RAMPS 5V rail for servos. alexborro 2013-10-22 10:38:33 -02:00
  • d69822ed51 Fix '#' since it can occure in comments. bkubicek 2013-10-22 10:34:51 +02:00
  • 2fb2a0a119 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 bkubicek 2013-10-22 10:08:21 +02:00
  • 39d88bcccb preparation for hibernation bkubicek 2013-10-22 10:04:08 +02:00
  • ab965376ff Sub-file calls. by overloading M32 it is now possible to execute gcode files from other gcode files, with a fixed recursion level. This can be used e.g. for having a real start.g and end.g somewhere on the sd card, which are then called from the normal print file. Another usecase would be to have macro-files for nozzle-change and layerchange. I have not tested the speedwise performance. The testing was done with pronterface. bkubicek 2013-10-22 10:02:18 +02:00
  • b2cc27e5ea Added a magic character for sd buffering. if a '#' is read now the buffer will be emptied before reading ahead. This is so one can execute files from within gcode files, without messing the buffer with preread characters from the caller file. # can not occure in sd files imho, because it should only occure within checksums in ther serial communication. Yes, thats a lame argument. If you have a better idea please tell me. It has to be a character that one can type on a keyboard manually. bkubicek 2013-10-22 09:54:13 +02:00
  • 8a08cca0f2 Added temperature status less. Hopefully fixed viky button handling without braking other boards Erik van der Zalm 2013-10-20 12:12:35 +02:00
  • 667d278f54 Revert "Fix for Viki display" Erik van der Zalm 2013-10-20 10:16:46 +02:00
  • bf27e79e74 Small BlinkM fix Erik van der Zalm 2013-10-20 10:06:02 +02:00
  • 87e28c0599 Added ifdefs to blinkm Erik van der Zalm 2013-10-20 09:55:15 +02:00
  • 24c6b2ab35 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2013-10-20 09:51:58 +02:00
  • 6a803ba9c5 Merge pull request #590 from timkoster/Marlin_v1 ErikZalm 2013-10-20 00:51:35 -07:00
  • 457d8a0acb Fixed merge conflicts Erik van der Zalm 2013-10-20 09:50:27 +02:00
  • 6f85a8c7aa Bed auto Leveling change: Raise Z before homing Alex Borro 2013-10-12 17:28:11 -03:00
  • dd3086d3f2 Show Temperature ADC values Alex Borro 2013-10-12 10:41:23 -03:00
  • 7fad13a1e2 Reverse SD card file name order. This is _not_ automatically the cronological, since deleting a file will free the filesystem descriptor for it, which then will be used by the next file copied on it. Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu. bkubicek 2013-10-12 13:24:55 +02:00
  • 73c82e7ad8 Clarifying M280 command in Bed Auto Leveling section. alexborro 2013-10-08 10:15:09 -03:00
  • b832f5b9f6 added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try. also, removed some trouble for compilation with corexy. I think that babystepping is only possible in z for a delta tower. not sure if it would be usefull to step individual motors on a delta, i don't own one bkubicek 2013-10-07 09:14:04 +02:00
  • c38b0855c8 I think that filament change is ready for the masses. I have tested very often with my ultimaker. bkubicek 2013-10-06 21:20:26 +02:00
  • d147a057ac Add the socalled "Babystepping" feature. It is a realtime control over the head position via the LCD menu system that works _while_ printing. Using it, one can e.g. tune the z-position in realtime, while printing the first layer. Also, lost steps can be manually added/removed, but thats not the prime feature. Stuff is placed into the Tune->Babystep * bkubicek 2013-10-06 21:14:51 +02:00
  • bca353cc12 Fixed duplicate define in fastio.h Erik van der Zalm 2013-10-03 19:24:53 +02:00
  • 253dfc4bc1 Bed Auto Leveling feature Alex Borro 2013-09-29 13:20:06 -03:00
  • 1bda6bf862 Merge pull request #609 from phq1910/patch-1 ErikZalm 2013-09-26 11:47:58 -07:00
  • c80aac1518 Merge pull request #610 from phq1910/patch-2 ErikZalm 2013-09-26 11:47:47 -07:00
  • 314fd13c39 Fix for Viki display Erik van der Zalm 2013-09-26 20:32:19 +02:00
  • 4f7c6dfe35 Update pins.h phq1910 2013-09-26 11:40:54 -03:00
  • 57173739a1 Update Configuration.h phq1910 2013-09-26 11:29:44 -03:00
  • 0dca49a7c0 Added Azteeg X3 board. Erik van der Zalm 2013-09-24 17:31:16 +02:00
  • d8c2c810b4 Added info to the delta configuration files in the configuration.h file Erik van der Zalm 2013-09-23 23:29:46 +02:00
  • 9bc88f8bab Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file Erik van der Zalm 2013-09-23 23:25:11 +02:00
  • 3ca1ca6869 Fixed missing ENCODER_PULSES_PER_STEP Erik van der Zalm 2013-09-23 23:18:35 +02:00
  • 97b0da0c2e Removed #ifndef BLINKM Tim Koster 2013-09-22 10:43:27 +03:00
  • 61db046b32 Added #ifdef BLINKM around new code. Also refined BlinkM.h. Tim Koster 2013-09-20 10:57:42 +03:00
  • 77df2ab0e7 Make Y_DUAL_STEPPER_DRIVERS disabled by default Richard Miles 2013-09-17 21:49:44 +01:00
  • ed1ab42186 Added Y_DUAL_STEPPER_DRIVERS Richard Miles 2013-09-17 19:19:20 +01:00
  • f4a59e4ce5 Revert "Added Y_DUAL_STEPPER_DRIVERS" Richard Miles 2013-09-17 19:05:49 +01:00
  • 7ee275b620 Added Y_DUAL_STEPPER_DRIVERS Richard Miles 2013-09-17 19:02:00 +01:00
  • 6a1e980c6d Merge pull request #600 from xoan/Encoder_Pulses_Per_Step ErikZalm 2013-09-14 04:56:45 -07:00
  • 20076a8bd3 Merge pull request #598 from GDV0/Marlin_v1 ErikZalm 2013-09-14 04:54:19 -07:00
  • 3626b5ad8b Removed Delta from the default config file. Changed EEPROM CHITCHAT behavior. M503 is always enabled. Erik van der Zalm 2013-09-14 13:50:09 +02:00
  • bf7007d02f add ENCODER_PULSES_PER_STEP Xoan Sampaiño 2013-09-13 04:12:51 +02:00
  • f17506c504 FIx compilation error when enabling SERVO_ENDSTOPS (#591) GDV0 2013-09-11 23:09:37 +02:00
  • 59e36f1d27 Merge pull request #595 from nothinman/Marlin_v1 ErikZalm 2013-09-11 00:39:17 -07:00
  • acd8619809 Fan fix for Panelolu2+Sanguinololu. Martin Lukasik 2013-09-10 22:10:58 +01:00
  • 7c35be7fd8 Merge pull request #594 from gr5/Marlin_v1 ErikZalm 2013-09-10 07:56:55 -07:00
  • 595580556c Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert. Bug introduced in version 6beb42cdf6. Robert did a good job of simplifying but messed up this chunk of code. George Roberts 2013-09-10 09:56:19 -04:00
  • 88dfeefca3 Define BlinkM default disabled Tim Koster 2013-09-10 12:32:21 +03:00
  • 5350faf2a2 Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1 Tim Koster 2013-09-10 12:27:26 +03:00
  • 7016cc9511 Added BlinkM support over i2c Tim Koster 2013-09-10 12:18:29 +03:00
  • d78db12abd Merge pull request #589 from wolfmanjm/upgrade ErikZalm 2013-09-09 07:09:19 -07:00
  • 3b315b3da0 Added BlinkM support over i2c Tim Koster 2013-09-06 22:25:39 +03:00
  • f26f26b7bd Fix the example delta configuration as someone forgot to do it. Jim Morris 2013-09-05 16:36:55 -07:00
  • a447e76fdf Update read me. Added comment about products that have a patent. Erik van der Zalm 2013-08-30 14:39:19 +02:00
  • f8d173bd0b Merge pull request #582 from hercek/upstream ErikZalm 2013-08-28 01:49:44 -07:00
  • 9aa2229077 add command M666 for adjusting delta printer endstop position Peter Hercek 2013-08-28 01:15:20 +02:00
  • aa6c58ad37 Merge pull request #575 from buildrob101/DualXCarriageMerge ErikZalm 2013-08-07 13:10:54 -07:00
  • 221286c10a Add .gitignore change to ignore .bak files (produced by WinMerge and other editors) Robert F-C 2013-08-08 00:16:38 +10:00
  • 9547fb9dfb Add duplication and auto-park mode for dual x-carriage support. Robert F-C 2013-08-08 00:10:26 +10:00
  • 62aab66299 Merge pull request #572 from ultimachine/rambo_LCD ErikZalm 2013-08-05 10:04:47 -07:00
  • d7b1a8ba33 add rambo arduino addons Steve Kelly 2013-08-03 12:42:34 -05:00
  • 53614e5144 add pins for rambo lcd Steve Kelly 2013-08-03 11:45:53 -05:00
  • b42d24e31e add additional pins to avr2560 for rambo lcd Steve Kelly 2013-08-03 11:37:12 -05:00
  • 07f029c2d5 Merge pull request #563 from njprossi/Marlin_v1 ErikZalm 2013-08-03 08:05:26 -07:00
  • b0c8120fcc Added feedrate setting in exemple config for manual moves from panel Nicolas Rossi 2013-08-03 13:09:53 +02:00
  • a54fe2d73c Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 Nicolas Rossi 2013-08-03 13:05:56 +02:00
  • 7ea63d08df Merge pull request #565 from iXce/avrdudeconfpath ErikZalm 2013-08-02 13:16:07 -07:00
  • 4187b637a5 Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops ErikZalm 2013-08-02 13:15:30 -07:00
  • 07e7de3600 Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions ErikZalm 2013-08-02 13:13:29 -07:00
  • c0c4c97db6 Detect OS in Makefile to use the correct avrdude.conf path Guillaume Seguin 2013-08-01 19:20:27 +02:00
  • 2ca983568d separate INVERTING for MIN and MAX endstops (6 #defines instead of 3) hg42@gmx.net 2013-08-01 15:06:39 +02:00
  • 3700f688f5 convert PROTOCOL macros from statements to (multiple, comma separated) expressions hg42@gmx.net 2013-08-01 14:56:39 +02:00
  • a504c88346 Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts. daid 2013-08-01 14:12:30 +02:00
  • c6cb93d38c Merge pull request #556 from ellensp/Marlin_v1 ErikZalm 2013-07-31 13:34:40 -07:00
  • 394ed08f88 Added feedrate setting for manual moves from panel Nicolas Rossi 2013-07-30 14:33:30 +02:00
  • 9bf1cf1b22 Pre-calculate diagonal rod length squared Nicolas Rossi 2013-07-30 14:09:21 +02:00
  • 4623e78ce0 Added Honeywell thermistor 135-104LAF-J01 Nicolas Rossi 2013-07-30 14:01:41 +02:00
  • d7f384f680 Skip SD menu refresh if nothing has changed Brendan-csel 2013-07-29 21:00:29 +12:00
  • abc8320a68 Save LCD_CLICKED before it is cleared Brendan-csel 2013-07-29 20:58:09 +12:00
  • f4c3135c6d Add Panelolu2 pins for RAMPS1.3 Guillaume Seguin 2013-07-28 19:19:57 +02:00
  • aae42c68f9 Update French translation in language.h Guillaume Seguin 2013-07-28 18:18:41 +02:00
  • 4d435c38a6 Add support of LiquidTWI2-based panels to Makefile Guillaume Seguin 2013-07-24 12:09:53 +02:00
  • 6c42a3a339 Woops, fix logic Guillaume Seguin 2013-07-23 23:34:42 +02:00