CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 73d41c10b9 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff Denis Bakin 2013-02-18 12:10:52 -0500
  • 63da4dc59a Merge pull request #398 from DanieleSdei/Marlin_v1 daid 2013-02-16 15:41:43 -0800
  • 7eb9811958 Merge pull request #397 from codenamepawel/patch-1 daid 2013-02-16 15:41:07 -0800
  • 82e28851bd Italian language: SD-Card change and SD-Card init Daniele Sdei 2013-02-16 12:17:11 +0100
  • aed5965ad8 Italian language: remove space and some fix Daniele Sdei 2013-02-15 23:30:25 +0100
  • d360846dd4 Update Marlin/language.h codenamepawel 2013-02-16 03:42:53 +0100
  • 2f60e324dc Fixed #394 daid303 2013-02-14 14:04:26 +0100
  • 5e2abfcdcd Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu daid 2013-02-13 08:56:00 -0800
  • fa5c45f515 Merge pull request #392 from mfeherpataky/Marlin_v1 daid 2013-02-13 08:54:58 -0800
  • a0d4e8e78e Add Messages for SD Card init. & change Dirk Eichel 2013-02-13 10:05:18 +0100
  • bbf0cc1379 Update Marlin/ultralcd_implementation_hitachi_HD44780.h mfeherpataky 2013-02-12 20:06:51 +0100
  • c8f1fbd9d8 Add SD-Card change and SD-Card init. Dirk Eichel 2013-02-12 17:35:46 +0100
  • be91fb9b47 Merge pull request #389 from mfeherpataky/Marlin_v1 daid 2013-02-12 07:56:15 -0800
  • 71ddb8dc60 Update Marlin/ultralcd_implementation_hitachi_HD44780.h mfeherpataky 2013-02-12 00:03:40 +0100
  • d2c547c407 Update Marlin/ultralcd_implementation_hitachi_HD44780.h mfeherpataky 2013-02-11 23:25:24 +0100
  • 70871715e4 Added support for extruder offset handling Denis B 2013-02-04 23:05:45 -0500
  • 49b2ddc8c1 Cleaned up non-standard characters Denis B 2013-02-04 01:41:40 -0500
  • f8876a7958 Merge pull request #376 from kintel/skip_longfilenames Bernhard Kubicek 2013-02-03 03:05:31 -0800
  • 18fcc367d2 Merge pull request #371 from Banjer/Melzi_LED_PIN daid 2013-02-02 03:23:43 -0800
  • 6b78edf7c5 Merge pull request #374 from kintel/quickstop daid 2013-02-01 13:54:12 -0800
  • 19ce90fe02 Added comment about M42 usage (clean) Bas Spaans 2013-01-31 18:20:23 +0100
  • 00fed0a703 Revert "Extended comment explaining M42 usage" Bas Spaans 2013-01-31 18:11:13 +0100
  • e06d820909 Also skip .files and _files with long filenames Marius Kintel 2013-01-31 12:07:14 -0500
  • 01541ee64c Extended comment explaining M42 usage Bas Spaans 2013-01-31 18:00:25 +0100
  • f24f02e212 compile fix: quickStop() needs stepper.h Marius Kintel 2013-01-31 10:43:03 -0500
  • 12c41423ad Fixed typo in comment Bas Spaans 2013-01-30 22:54:04 +0100
  • 0995eaa492 Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries Bas Spaans 2013-01-30 22:12:47 +0100
  • 1d06b10962 Added a feature to have filament change by gcode or display trigger. [default off for now] syntax: M600 X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] Bernhard 2013-01-27 13:21:34 +0100
  • 408b349a84 Fixed #368. Commented out the wrong pin definition, but explained why it is there. daid303 2013-01-21 15:46:17 +0100
  • 236bb2c110 Merge pull request #365 from DanieleSdei/Marlin_v1 daid 2013-01-14 08:29:55 -0800
  • 9ecb267b63 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Daniele Sdei 2013-01-14 15:47:40 +0100
  • 3cf59f6f9a add RepRapPro Huxley thermistor tables Daniele Sdei 2012-12-30 12:09:38 +0100
  • c1730e2b08 Merge pull request #363 from yuroller/sanguino_panelolu daid 2013-01-10 07:19:37 -0800
  • 86358dd6cd Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu Yuri Valentini 2013-01-10 12:23:20 +0100
  • 0f3f5d083d Minor cleanup of the new FAN_KICKSTART code. #334 daid303 2013-01-10 11:08:45 +0100
  • 6ec56fa923 Merge pull request #334 from KevinOConnor/FanKick daid 2013-01-09 02:47:59 -0800
  • 965baf2683 Merge pull request #362 from daid/Marlin_v1 daid 2013-01-09 02:42:09 -0800
  • 4fde836d83 Merge pull request #8 from randomev/Marlin_v1 daid 2013-01-09 02:39:43 -0800
  • 3d91bd486c Add "kick fan" feature - briefly run fan at full speed on start. Kevin O'Connor 2012-12-09 23:47:52 -0500
  • 3f2f94ef28 Be consistent in setting of the fan PWM. Kevin O'Connor 2012-12-09 22:28:09 -0500
  • 7f30039d2a + Finnish translation Henry Palonen 2013-01-08 19:21:34 +0200
  • 14e1d495ef Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2013-01-08 17:10:30 +0100
  • bbe7d3d0fe Fixed #312 daid303 2013-01-08 17:09:57 +0100
  • 7ce509b9a7 Merge pull request #361 from yuroller/MakefileSanguino daid 2013-01-08 06:22:27 -0800
  • 9c34c4f05b fixes for ramps compilation using installed arduino ide Yuri Valentini 2013-01-08 12:54:31 +0100
  • 442ade15a6 Move Gen6 stuff into a proper location. daid303 2013-01-08 12:31:28 +0100
  • 5fd4582cc8 Merge pull request #242 from Drakelive/Marlin_v1 daid 2013-01-08 03:29:20 -0800
  • 8b88e3b386 Fixed #345, Fixed #267. daid303 2013-01-08 12:14:55 +0100
  • 27843388c6 Merge pull request #360 from njprossi/Marlin_v1 daid 2013-01-08 02:58:02 -0800
  • bfa5bb86e4 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2013-01-08 11:54:13 +0100
  • 921273baa0 Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit. daid303 2013-01-08 11:53:18 +0100
  • 7d20ec706e Added libraries from Arduino 1.0.3 for sanguino build Yuri Valentini 2013-01-07 17:26:50 +0100
  • 437eb3bafc Initialize PS_ON at startup Nicolas Rossi 2013-01-07 14:57:51 +0100
  • f3c1fc70a9 Power signal control definitions for ATX and others Nicolas Rossi 2013-01-07 14:33:30 +0100
  • dad7691df9 makefile for sanguino standalone compilation Yuri Valentini 2013-01-07 11:08:10 +0100
  • 6752cb2d9c PID now per extruder. Fixed typo Erik vd Zalm 2013-01-06 14:26:23 +0100
  • 0ac452e252 Disable is now multi extruder compatible. M84 got a T option. Erik vd Zalm 2013-01-06 13:37:01 +0100
  • 3a1cd30ce1 Merge pull request #358 from yuroller/sanguino_spi daid 2013-01-04 11:53:10 -0800
  • 69582042d7 Definitions for Sanguino SPI Yuri Valentini 2013-01-04 18:32:08 +0100
  • 9e7b5056a0 {X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates. Johann Rocholl 2012-12-28 16:20:10 -0800
  • 5f82f03ff3 Add italian MSG_RESUMING. Daniele Sdei 2012-12-28 11:44:35 +0100
  • 5e3873c8db Add german MSG_RESUMING. daid303 2012-12-25 20:53:11 +0100
  • 01aac2a142 Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu. daid303 2012-12-21 16:14:47 +0100
  • b69cb9fbd9 Change the end of SD cart print message from minutes/seconds to hours/minutes. daid303 2012-12-19 12:26:40 +0100
  • 30254e3388 Merge pull request #350 from jcrocholl/Marlin_v1 daid 2012-12-17 02:16:31 -0800
  • 38ee395ac7 Replace the 1ms delay for 2 nops to get a 100ns delay. #259 daid303 2012-12-17 11:12:11 +0100
  • 5df5e4c4a2 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2012-12-17 11:09:18 +0100
  • a95dcd74e7 Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on. daid303 2012-12-17 11:09:09 +0100
  • ab318beaaf Merge pull request #348 from oni303/Marlin_v1 daid 2012-12-17 02:08:28 -0800
  • 8caf5d252d Remove bogus blank line. Johann Rocholl 2012-12-16 12:50:20 -0800
  • 1c2ecddae4 Fix typo (# missing before define). Johann Rocholl 2012-12-16 12:33:44 -0800
  • 6dfb8a2187 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. Johann Rocholl 2012-12-16 12:30:33 -0800
  • 3b2e5027e5 Merged updates from Marlin_v1. Johann Rocholl 2012-12-16 12:19:24 -0800
  • b39f5d614a For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR. Johann Rocholl 2012-12-16 12:08:55 -0800
  • ab09fa4bbf fixed pwm generation at pin D12 and D13 when one of them is used as FAN_PIN on Sanguino, added soft pwm entry for FAN_PIN in temperature.cpp oni303 2012-12-16 01:36:57 +0100
  • 83ea7dc5b9 Merge pull request #342 from setar/Marlin_v1 daid 2012-12-14 05:04:41 -0800
  • 5697451c72 fix lcd class Sergey Taranenko 2012-12-14 15:39:47 +0400
  • 58e806f3fa Fix the russial translation. Sergey Taranenko 2012-12-14 15:39:26 +0400
  • 50a5ce1dc4 deduplicate messages Sergey Taranenko 2012-12-14 15:37:05 +0400
  • 6123a00e64 Fix the german translation. daid303 2012-12-14 11:11:02 +0100
  • 7c21716886 Fixed #341 daid303 2012-12-14 10:53:11 +0100
  • ae1bc83350 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2012-12-13 13:25:22 +0100
  • 596a7e1904 Fix compiling for Arduin < 1.0.0 daid303 2012-12-13 13:24:55 +0100
  • b264317fa0 Reverted the patch by KevinOConnor, as it crashes some versions of avr-gcc and caused linking issues. Daid 2012-12-13 12:19:12 +0100
  • 673577a31b Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 Daid 2012-12-13 11:41:34 +0100
  • 23022f1a82 Updates to Makefile to compile for Teensy. Daid 2012-12-13 11:41:27 +0100
  • 96e9db8919 Merge pull request #339 from KevinOConnor/CompilerFlags daid 2012-12-13 01:30:17 -0800
  • 08356361ac Fixing a problem with heated beds not working without PID and BED_LIMIT_SWITCHING daid303 2012-12-13 10:25:29 +0100
  • 047d037f8c #ifdef fix for #326 daid303 2012-12-13 09:04:41 +0100
  • 0908458381 Use gcc "-fwhole-program" optimization. Kevin O'Connor 2012-12-12 23:18:31 -0500
  • 16fbb455ef Use linker "--relax" option. Kevin O'Connor 2012-12-12 23:15:28 -0500
  • f30b46b2a8 One more fix for #338, I really should get a heated bed to test with. daid303 2012-12-12 23:06:17 +0100
  • 65c3f1ffcd Most likely fixing #338 daid303 2012-12-12 21:56:17 +0100
  • 7577717b59 Fixed #336 daid303 2012-12-12 13:08:26 +0100
  • 1a8f54cea1 The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated. daid303 2012-12-12 11:47:03 +0100
  • 6731c094ee Fix compiling with just an 16x2 LCD and no buttons. daid303 2012-12-12 11:32:33 +0100
  • b99a928a80 Fix the M117 (display message on LCD) when used over USB with checksums. daid303 2012-12-12 09:35:32 +0100
  • 55ba90ac19 Add PID functional range setting. With high powered heaters the current functional range of 10 degrees causes high overshoots as the PID needs to kick in before the temperature hits 10 degrees below target. daid303 2012-12-12 09:08:37 +0100
  • 5ff5cee8ce Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition) daid303 2012-12-11 14:53:53 +0100
  • 8b58edc70e Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2012-12-11 13:38:34 +0100