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

Commit Graph

  • aa6c58ad37 Merge pull request #575 from buildrob101/DualXCarriageMerge ErikZalm 2013-08-07 13:10:54 -0700
  • 221286c10a Add .gitignore change to ignore .bak files (produced by WinMerge and other editors) Robert F-C 2013-08-08 00:16:38 +1000
  • 9547fb9dfb Add duplication and auto-park mode for dual x-carriage support. Robert F-C 2013-08-08 00:10:26 +1000
  • 62aab66299 Merge pull request #572 from ultimachine/rambo_LCD ErikZalm 2013-08-05 10:04:47 -0700
  • d7b1a8ba33 add rambo arduino addons Steve Kelly 2013-08-03 12:42:34 -0500
  • 53614e5144 add pins for rambo lcd Steve Kelly 2013-08-03 11:45:53 -0500
  • b42d24e31e add additional pins to avr2560 for rambo lcd Steve Kelly 2013-08-03 11:37:12 -0500
  • 07f029c2d5 Merge pull request #563 from njprossi/Marlin_v1 ErikZalm 2013-08-03 08:05:26 -0700
  • b0c8120fcc Added feedrate setting in exemple config for manual moves from panel Nicolas Rossi 2013-08-03 13:09:53 +0200
  • a54fe2d73c Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 Nicolas Rossi 2013-08-03 13:05:56 +0200
  • 7ea63d08df Merge pull request #565 from iXce/avrdudeconfpath ErikZalm 2013-08-02 13:16:07 -0700
  • 4187b637a5 Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops ErikZalm 2013-08-02 13:15:30 -0700
  • 07e7de3600 Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions ErikZalm 2013-08-02 13:13:29 -0700
  • c0c4c97db6 Detect OS in Makefile to use the correct avrdude.conf path Guillaume Seguin 2013-08-01 19:20:27 +0200
  • 2ca983568d separate INVERTING for MIN and MAX endstops (6 #defines instead of 3) hg42@gmx.net 2013-08-01 15:06:39 +0200
  • 3700f688f5 convert PROTOCOL macros from statements to (multiple, comma separated) expressions hg42@gmx.net 2013-08-01 14:56:39 +0200
  • 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 +0200
  • c6cb93d38c Merge pull request #556 from ellensp/Marlin_v1 ErikZalm 2013-07-31 13:34:40 -0700
  • 394ed08f88 Added feedrate setting for manual moves from panel Nicolas Rossi 2013-07-30 14:33:30 +0200
  • 9bf1cf1b22 Pre-calculate diagonal rod length squared Nicolas Rossi 2013-07-30 14:09:21 +0200
  • 4623e78ce0 Added Honeywell thermistor 135-104LAF-J01 Nicolas Rossi 2013-07-30 14:01:41 +0200
  • d7f384f680 Skip SD menu refresh if nothing has changed Brendan-csel 2013-07-29 21:00:29 +1200
  • abc8320a68 Save LCD_CLICKED before it is cleared Brendan-csel 2013-07-29 20:58:09 +1200
  • f4c3135c6d Add Panelolu2 pins for RAMPS1.3 Guillaume Seguin 2013-07-28 19:19:57 +0200
  • aae42c68f9 Update French translation in language.h Guillaume Seguin 2013-07-28 18:18:41 +0200
  • 4d435c38a6 Add support of LiquidTWI2-based panels to Makefile Guillaume Seguin 2013-07-24 12:09:53 +0200
  • 6c42a3a339 Woops, fix logic Guillaume Seguin 2013-07-23 23:34:42 +0200
  • 376d8af2c8 Report temperatures for all extruders Guillaume Seguin 2013-05-29 18:06:12 +0200
  • 434b6a05c1 Merge pull request #552 from iXce/Marlin_v1 ErikZalm 2013-07-29 10:39:21 -0700
  • bdc2621119 Merge pull request #561 from Brendan-csel/Marlin_v1 ErikZalm 2013-07-29 10:38:17 -0700
  • 6965bd4e15 Merge pull request #560 from njprossi/Marlin_v1 ErikZalm 2013-07-29 10:37:40 -0700
  • a55b33e613 Merge pull request #559 from iXce/panelolupinsramps13 ErikZalm 2013-07-29 10:37:03 -0700
  • 8b34351537 Merge pull request #558 from iXce/frenchupdate ErikZalm 2013-07-29 10:36:43 -0700
  • 735e556724 Merge pull request #555 from iXce/liquidtwi2_makefile ErikZalm 2013-07-29 10:33:54 -0700
  • d80aecda0a Skip SD menu refresh if nothing has changed Brendan-csel 2013-07-29 21:00:29 +1200
  • be2dea1dc6 Save LCD_CLICKED before it is cleared Brendan-csel 2013-07-29 20:58:09 +1200
  • 55c287a69e Fixed move from panel for delta bot #557 Nicolas Rossi 2013-07-28 22:54:37 +0200
  • 1902d339b0 Add Panelolu2 pins for RAMPS1.3 Guillaume Seguin 2013-07-28 19:19:57 +0200
  • eb23a68e92 Update French translation in language.h Guillaume Seguin 2013-07-28 18:18:41 +0200
  • 7ced55b97c Merge pull request #1 from ErikZalm/Marlin_v1 midopple 2013-07-27 08:06:44 -0700
  • e019197b32 renamed ArduinoAddons/Arduino_1.x.x/sanguino to Sanguino. Now make works for Arduino > 1.0 on linux ellensp 2013-07-27 00:13:49 +1200
  • 1561c6df51 Merge pull request #547 from wolfmanjm/delta-configuration ErikZalm 2013-07-24 03:11:36 -0700
  • 374bc99fa3 Add support of LiquidTWI2-based panels to Makefile Guillaume Seguin 2013-07-24 12:09:53 +0200
  • ab624eac2a revert COnfiguratiuon to the same as head Jim Morris 2013-07-24 02:57:46 -0700
  • 52f79ffeca add an example default configuration for delta style bots Jim Morris 2013-07-24 02:55:52 -0700
  • b9d7ccf1cd Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration Jim Morris 2013-07-24 02:49:25 -0700
  • c323fced9a Merge pull request #554 from iXce/cxa_atexit ErikZalm 2013-07-24 02:49:08 -0700
  • d4d1540727 Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit Guillaume Seguin 2013-07-24 11:19:38 +0200
  • 01ed99143c Woops, fix logic Guillaume Seguin 2013-07-23 23:34:42 +0200
  • e578f988d3 Merge pull request #553 from iXce/req413 ErikZalm 2013-07-23 14:19:30 -0700
  • 76841450c8 Only display poweron/poweroff if PS_ON_PIN > -1 Guillaume Seguin 2013-07-23 22:28:30 +0200
  • 44f327d738 Uniformly reindent language.h Guillaume Seguin 2013-07-23 22:13:40 +0200
  • 326d2db025 Update language.h so that all languages compile Guillaume Seguin 2013-07-23 22:11:54 +0200
  • 2cb716f513 Run Marlin/language.h through dos2unix Guillaume Seguin 2013-07-23 21:49:37 +0200
  • 34da3a0a3f Merge github.com:ErikZalm/Marlin into Marlin_v1 Guillaume Seguin 2013-07-23 21:46:41 +0200
  • 18199ff960 Merge github.com:ErikZalm/Marlin into Marlin_v1 Guillaume Seguin 2013-07-23 21:33:52 +0200
  • a105e10075 Merge pull request #550 from buildrob101/MinimalDualXCarriage ErikZalm 2013-07-22 06:08:44 -0700
  • fb5334f428 Fixed compile error when QUICK_HOME is defined. Robert F-C 2013-07-22 22:46:14 +1000
  • c5bf8298d3 Merge pull request #549 from buildrob101/MinimalDualXCarriage ErikZalm 2013-07-20 09:43:47 -0700
  • c3568398b5 Disable DUAL_X_CARRIAGE by default Robert F-C 2013-07-20 23:50:30 +1000
  • 96a773fa48 Merge pull request #548 from buildrob101/MinimalDualXCarriage ErikZalm 2013-07-20 02:59:32 -0700
  • 39cd3dbdbe Remove dual x-carriage functionality that could/should be implemented in slicer Robert F-C 2013-07-20 13:07:50 +1000
  • fb20ceabce enable soft endstops for delta disable delta by default Jim Morris 2013-07-17 16:21:51 -0700
  • d01ee7e7b5 fix zjerk being the same for delta as xy jerk add more delta defaults on delta make second home even slower Jim Morris 2013-07-17 16:14:07 -0700
  • d7390e13d9 Support dual x-carriage printers Robert F-C 2013-07-17 22:44:45 +1000
  • f3aa2a48e7 update max pos Jim Morris 2013-07-17 01:29:51 -0700
  • 460751503e Added default configurations for deltas when DELTA is defined Jim Morris 2013-07-17 01:17:27 -0700
  • 5ab872de1f Merge pull request #545 from MStohn/fix-bad-lcd-commit-from-makr3d ErikZalm 2013-07-15 08:57:43 -0700
  • 9da94c247a fixed bad lcd commit from makr3d Maik Stohn 2013-07-15 17:34:21 +0200
  • 59004023fd Fixed typo Erik van der Zalm 2013-07-15 17:22:56 +0200
  • 461dad6e05 Added : M32 - Select file and start SD print (Can be used when printing from SD card) Untested Erik van der Zalm 2013-07-14 22:39:59 +0200
  • c4a2077951 M109 and M190 now wait when cooling down if R is used instead of S. M109 S180 waits only when heating. M109 R180 also waits when cooling. Erik van der Zalm 2013-07-14 21:10:24 +0200
  • 8a2a3ef91d Merge pull request #531 from iXce/Marlin_v1_lcd ErikZalm 2013-07-14 06:50:23 -0700
  • 6397b3339c restored configuration.h defaults Erik van der Zalm 2013-07-14 15:49:03 +0200
  • cdaaad3df1 Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1 Erik van der Zalm 2013-07-14 15:45:49 +0200
  • e3bdefd873 fixed missing #endif Erik van der Zalm 2013-07-14 15:42:53 +0200
  • a5be0c52c6 no message Erik van der Zalm 2013-07-14 15:35:54 +0200
  • e73611f5fa Merge pull request #535 from GabinoLopez/patch-1 ErikZalm 2013-07-14 02:24:31 -0700
  • e509cdbeb0 added contrast control function for gLCDs Michael Mayer 2013-07-14 15:28:26 +0700
  • 99b7e926e7 added MaKr3d Melzi board Michael Mayer 2013-07-14 15:17:55 +0700
  • 68be33b1fc Update language.h Gabino Lopez 2013-07-04 10:23:00 +0200
  • acb3271c9a Merge pull request #534 from xifle/Marlin_v1 daid 2013-07-01 23:41:51 -0700
  • 61fe430d4f Should fix compiler warning for feedrate deadzone xifle 2013-06-29 13:25:11 +0200
  • d77f5ee722 Merge pull request #532 from codexmas/ServoEndstops daid 2013-06-28 08:04:55 -0700
  • fde17d5720 Fix for ugly code compilation errors in SERVO_ENDSTOP checks Gord Christmas 2013-06-28 08:02:04 -0700
  • aa65c20d1f Only clamp panel movements if software endstops are enabled Guillaume Seguin 2013-06-28 14:18:00 +0200
  • ecf3ab5de4 Added thermistor 60 to configuration.h Erik van der Zalm 2013-06-27 23:25:51 +0200
  • 2daa85918e Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1 Nicolas Rossi 2013-06-20 23:59:56 +0200
  • 2015989f84 Added DISABLE_MIN_ENDSTOPS Erik van der Zalm 2013-06-18 19:20:26 +0200
  • 1c86adc760 Merge pull request #526 from ch100/Marlin_v1 ErikZalm 2013-06-17 05:53:57 -0700
  • 648d45cfb2 Fix Pin Description Typo Christian Inci 2013-06-16 23:35:33 +0200
  • 171719f18c Merge pull request #525 from lajos/ultralcd_pid ErikZalm 2013-06-16 00:02:54 -0700
  • b519af4f05 fixed another !defined(PIDTEMP) compile in ultralcd.cpp lajos 2013-06-15 20:49:18 -0400
  • 7d03c52511 fixed compile error in ultralcd.cpp when PIDTEMP undefined lajos 2013-06-15 18:09:52 -0400
  • 312b4aa7c2 Merge pull request #521 from lajos/azteeg_x1 ErikZalm 2013-06-15 14:08:45 -0700
  • 02dee80fa5 added Azteeg X1 motherboard lajos 2013-06-15 16:58:17 -0400
  • 73569d891f Merge pull request #520 from henrikbrixandersen/Makefile-fixes ErikZalm 2013-06-15 02:35:51 -0700
  • 47dc70e3ec Fix location of avrdude.conf Henrik Brix Andersen 2013-06-15 09:50:25 +0200
  • 1d258903bb Allow command line compilation when using BEEPER. Henrik Brix Andersen 2013-06-15 09:36:55 +0200
  • e34c9981ab Delta disabled by default Erik van der Zalm 2013-06-11 22:33:58 +0200