Commit Graph

Select branches

Hide Pull Requests

master

2.0.5.3_Merge

2.0.7.2_Merge

2.0.7_Merge

2.1.2

Mono Color

• e48f5aa6a7 fixed typo MaikStohn 2012-05-11 15:22:06 +02:00
• 1efe9ab497 changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu MaikStohn 2012-05-11 15:19:09 +02:00
• 602c8ee02b Melzi support Guan Yang 2012-04-27 11:28:10 -04:00
• 279d00da9f Fixed #if for Ultimaker. Daid 2012-05-09 10:50:44 +02:00
• 830972ce3c Merge pull request #1 from ErikDeBruijn/Marlin_v1_Ultimaker-rc3 daid 2012-05-09 01:35:59 -07:00
• 451f9cc6d1 Residual in the comments: there are no more mm/minutes but only mm/sec in the planner buffer. Bernhard Kubicek 2012-05-09 08:05:13 +03:00
• e3fe1f0d00 Made a more granular configuration possible PREVENT_LENGTHY_EXTRUDE. You can now decide to allow/disallow large length of extrusions to be executed. Erik de Bruijn 2012-05-08 17:27:45 +02:00
• d88205d89d Suggestion to improve (TODO), no actual code changed Erik de Bruijn 2012-05-08 17:18:31 +02:00
• 5aa80e6c05 Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel" Erik de Bruijn 2012-05-08 17:32:50 +02:00
• b657a18449 Revert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings" MaikStohn 2012-05-04 12:24:07 +02:00
• 108011085b futher docu of M500 Bernhard Kubicek 2012-05-04 08:37:49 +03:00
• d188ae4c9d added missing declaration of buttons_init() MaikStohn 2012-05-03 15:48:44 +02:00
• 3682d9bd5b magic PROGMEM defines to avoid hundreds of wrong GCC warnings MaikStohn 2012-05-03 15:43:23 +02:00
• 032df0b2c6 Moved LCD initialization out of constructor MaikStohn 2012-05-03 14:28:17 +02:00
• bd1ad7c76a explicit includes to make it compile with AVRStudio/Eclipse MaikStohn 2012-05-03 14:22:43 +02:00
• 060b38de5c delete obsolete and wrong code MaikStohn 2012-05-03 14:15:46 +02:00
• 789ba02d43 fixed typo in comment MaikStohn 2012-05-03 14:13:53 +02:00
• 1874cb71a6 Added option to increase the FAN PWM frequency. Erik van der Zalm 2012-05-02 19:26:14 +02:00
• 6a5a34e0ff Small cleanup Erik van der Zalm 2012-04-30 13:37:49 +02:00
• e3821bd86f Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2012-04-30 13:36:27 +02:00
• 02af69911e Added temperature window to M109. This is needed for systems with no overshoot PID. Erik van der Zalm 2012-04-30 13:36:19 +02:00
• e203b8c754 Merge pull request #154 from daid/Marlin_v1 ErikZalm 2012-04-28 13:19:55 -07:00
• 362ddc4efc Merge pull request #155 from Atntias/patch-1 ErikZalm 2012-04-28 13:19:19 -07:00
• 58cad83253 Merge pull request #156 from Atntias/patch-2 ErikZalm 2012-04-28 13:19:00 -07:00
• c27081aa4a Fix to allow M120/M121 sefi 2012-04-28 17:35:51 +03:00
• e11e072eca adding M120 and 121 for turning on and off the endstops only for homing function sefi 2012-04-28 17:31:22 +03:00
• 8e68c6cf89 Show proper temperature for extruder 2 Daid 2012-04-27 15:00:01 +02:00
• 8503b78876 Added support for 2nd extruder temperature to UltraLCD Daid 2012-04-27 14:51:32 +02:00
• 8446c9dc92 Merge pull request #152 from loganb/Marlin_v1 Bernhard Kubicek 2012-04-25 22:23:31 -07:00
• 3eacb4c16d Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater Logan Bowers 2012-04-25 19:22:38 -07:00
• e4d2138dbd reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time. Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt. actually, it solves a problem with the UltiControlle Bernhard 2012-04-22 21:12:17 +02:00
• 464b755918 added support for the UltiController Bernhard 2012-04-22 20:55:56 +02:00
• 44fd8d46d2 fixed quickhome Bernhard 2012-04-22 20:44:27 +02:00
• 33bb044d7c fixed catsting to (int)e in serial error messages. see https://github.com/ErikZalm/Marlin/issues/148 Bernhard 2012-04-22 20:04:39 +02:00
• ffea8008ca Update readme file Erik van der Zalm 2012-04-15 22:44:03 +02:00
• c2557abc03 Merge pull request #138 from triffid/fix-makefile ErikZalm 2012-04-15 10:21:46 -07:00
• 67cf105bc6 Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp) Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo. Erik van der Zalm 2012-04-15 19:17:33 +02:00
• 8aee9d51b6 Disabled disable_heater in PID_autotune. Erik van der Zalm 2012-04-12 21:12:31 +02:00
• 939f1fab46 Merge pull request #140 from daid/Marlin_v1 ErikZalm 2012-04-12 05:29:24 -07:00
• 414408b2d0 Fix for wrong systax in #ifdef. Daid 2012-04-12 14:01:30 +02:00
• 77d503fa13 Fix Makefile Michael Moon 2012-04-11 11:37:55 +10:00
• cf7c8c458f Fixed MAX6675 Erik van der Zalm 2012-04-10 21:57:57 +02:00
• 325f0651ac Merge pull request #136 from grrf/patch-1 ErikZalm 2012-04-10 09:48:45 -07:00
• 03b0850e63 This breaks temperature readout for pronterface! grrf 2012-04-09 23:37:34 +03:00
• 2a019a53d2 Merge pull request #134 from tgiphil/Marlin_v1 ErikZalm 2012-04-08 05:16:29 -07:00
• ad8bc71d3e - Fixed a typo tgiphil 2012-04-07 20:01:31 -07:00
• 46feae79c6 Fixed typo in arc Erik van der Zalm 2012-04-02 17:19:20 +02:00
• 4ca2f336f0 Changed default MINIMUM_PLANNER_SPEED -> 0.05 Fixed small bug in arcs M105 prints now actual_temp/target_temp Erik van der Zalm 2012-04-01 16:23:40 +02:00
• ae0bf8068b Fixed arc offset. Erik van der Zalm 2012-03-27 19:03:33 +02:00
• 0c1b863755 Ignore ":" in comments. Erik van der Zalm 2012-03-25 14:41:26 +02:00
• 63aec3c56e Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart. Erik van der Zalm 2012-03-25 14:36:51 +02:00
• 8b785f75a6 Merge pull request #123 from buserror-uk/for-upstream ErikZalm 2012-03-23 11:54:58 -07:00
• 5b8758f42b Merge pull request #126 from tommycheng/patch-1 ErikZalm 2012-03-23 11:54:37 -07:00
• 520f1a54a8 Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined. Tommy Cheng 2012-03-24 02:26:59 +08:00
• 5550e893d5 New board variant, Open Motion Controller Michel Pollet 2012-03-22 13:51:21 +00:00
• aa6e6e914e Makefile: Redone Michel Pollet 2012-03-22 13:48:10 +00:00
• 0183e6332a made prepare->autostart independent of current folder. Bernhard 2012-03-19 20:24:40 +01:00
• 1532200435 found error in filenames. One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely Bernhard 2012-03-19 20:06:58 +01:00
• 7f775c142c Update README.md ErikZalm 2012-03-18 15:59:14 +01:00
• b985e4a134 Fixed compile errors in ultralcd when no ultra_lcd is selected. Erik van der Zalm 2012-03-15 22:29:31 +01:00
• 2e749d60c3 Added DISABLE_MAX_ENDSTOPS Erik van der Zalm 2012-03-12 20:32:14 +01:00
• 33f5697888 PPID tune exports more constants. Erik van der Zalm 2012-03-11 22:18:25 +01:00
• b44055cc51 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2012-03-11 18:03:00 +01:00
• f5eae52098 Added more manage_inactivity checks Erik van der Zalm 2012-03-11 17:59:44 +01:00
• 19a47dae4a Merge pull request #99 from Justblair/master ErikZalm 2012-03-11 04:34:59 -07:00
• 910f4e77a2 Added 20MHz support. Erik van der Zalm 2012-03-11 12:25:04 +01:00
• 7cefad3744 Merge pull request #106 from bgamari/Marlin_v1 ErikZalm 2012-03-11 01:48:30 -08:00
• 87ff2f8867 Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers) Erik van der Zalm 2012-03-11 10:44:10 +01:00
• 387fe51a56 Do not disable steppers when there are moves in the queue. Erik van der Zalm 2012-03-09 20:20:01 +01:00
• 421264e58a Fixed typo Erik van der Zalm 2012-03-09 17:49:48 +01:00
• 15ad923310 Removed !!!. Stupid arduino bootloader can't handle this. Erik van der Zalm 2012-03-09 17:42:32 +01:00
• 61e09e6be2 Added FAN_PIN -1 checks Erik van der Zalm 2012-03-08 22:09:49 +01:00
• 87c4e06c24 Corrected active_extruder when autotemp is used. Erik van der Zalm 2012-03-08 22:04:13 +01:00
• 7b1e295f34 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2012-03-08 21:48:06 +01:00
• c077316b2b Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h Erik van der Zalm 2012-03-08 21:43:21 +01:00
• 49b228c4b3 Add instructions to regenerate speed_lookuptable when changing F_CPU Ben Gamari 2012-03-07 18:05:10 -05:00
• 96509494f0 stepper: Clarify comment on timer-counter configuration Ben Gamari 2012-03-07 17:58:35 -05:00
• 6d7e6a11fc Add create_speed_lookup Ben Gamari 2012-03-07 17:41:29 -05:00
• f3095493b0 Merge pull request #100 from tommycheng/patch-1 ErikZalm 2012-03-05 09:56:50 -08:00
• ce07c9186d While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached. Tommy Cheng 2012-03-05 23:12:26 +08:00
• 116dc86b8a Fixed type in e-jerk Erik van der Zalm 2012-03-04 23:09:13 +01:00
• 02ee9e3d30 Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4 Blair Thompson 2012-03-04 21:34:20 +00:00
• e056bf8081 Added E-Jerk Erik van der Zalm 2012-03-04 16:34:58 +01:00
• 4deeffbc88 Added missing defines to the german section. Translation still needed. Erik van der Zalm 2012-03-04 14:08:20 +01:00
• 632528aa95 merging with SCUBA82 Erik van der Zalm 2012-03-04 13:41:47 +01:00
• aac7aa3bf0 Queued fan control. Issue #90 Erik van der Zalm 2012-03-04 13:05:26 +01:00
• fde51084f3 set SD file delete to M30; switch printime output to M31 Christian Thalhammer 2012-03-03 21:58:12 +01:00
• 21e2bae063 Changed (corrected?) SD_card comment handling. Erik van der Zalm 2012-03-03 21:28:33 +01:00
• e509bbf636 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Erik van der Zalm 2012-03-03 20:41:22 +01:00
• 072011a3ef Added current_block = NULL to quickStop() Erik van der Zalm 2012-03-03 20:40:46 +01:00
• 2422a857a1 Merge pull request #96 from haxar/Marlin_v1 ErikZalm 2012-03-03 11:24:58 -08:00
• f598077af3 Removed vc files Erik van der Zalm 2012-03-03 20:22:42 +01:00
• cb0c84e075 Merge remote-tracking branch 'justblair/master' into Marlin_v1 Erik van der Zalm 2012-03-03 20:20:55 +01:00
• 1d5809d458 Merge pull request #88 from daid/Marlin_v1 ErikZalm 2012-03-03 11:18:14 -08:00
• ed951b1977 Fixed RAMPS 1.2 support (Found and fixed by rrhb) Erik van der Zalm 2012-03-03 20:15:41 +01:00
• 4879de08e8 The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);". Blair Thompson 2012-03-03 16:47:27 +00:00
• f278e1c00f This is in my opinion a much better way of dealing with SD cards than my previous fix. Blair Thompson 2012-03-03 16:30:31 +00:00
• 046a8e0039 Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task. Blair Thompson 2012-03-03 15:51:47 +00:00
• 79a466ca26 make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e haxar 2012-03-02 17:15:21 -08:00
• 5f3a422e68 added M31 - delete file from sd card Christian Thalhammer 2012-03-02 21:49:05 +01:00