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

Commit Graph

  • 65c9a0728f Set default serial port back to 0. Robert F-C 2012-11-05 22:15:07 +1100
  • ab9d183024 Make serial port configurable. Robert F-C 2012-11-05 21:34:27 +1100
  • f5631a89e8 Add dummy Emergancy Pin to Gen7 1.4 Bracken Dawson 2012-10-26 22:28:37 +0100
  • a4f9e1ebf2 Merge git://github.com/ErikZalm/Marlin into Marlin_v1 Bracken Dawson 2012-10-26 22:20:35 +0100
  • 2873d67b17 Put bogus temp override back in Gen7 up to 1.3 Bracken Dawson 2012-10-26 22:17:26 +0100
  • a7e40b2903 Merge pull request #276 from setar/Marlin_v1 ErikZalm 2012-10-23 09:48:55 -0700
  • 23b0f8ed4b Merge pull request #279 from MaikStohn/Marlin_v1 ErikZalm 2012-10-23 09:48:02 -0700
  • 6ed02c86be Fixed wrong code (will not even compile when EXTRUDERS>2) MaikStohn 2012-10-23 18:08:43 +0200
  • 2a67363e27 Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp Sergey Taranenko 2012-10-22 11:05:17 +0400
  • 205304ddee Merge git://github.com/ErikZalm/Marlin into Marlin_v1 Sergey Taranenko 2012-10-22 10:59:27 +0400
  • 58bca87c72 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 ' Erik vd Zalm 2012-10-21 14:40:06 +0200
  • febeb43197 Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '" Erik vd Zalm 2012-10-21 14:36:31 +0200
  • 8178dec4c3 Fix num of digits on LCD for E and Z axis. The number of steps per mm often contains 4 digits before the decimal point and does not require precision greater than 0.1 Sergey Taranenko 2012-10-18 17:45:40 +0400
  • 70f57a6844 Merge pull request #273 from setar/Marlin_v1 ErikZalm 2012-10-17 04:10:18 -0700
  • ff14199e58 Merge pull request #270 from jothan/Marlin_v1 ErikZalm 2012-10-17 04:09:36 -0700
  • bfdf0932c1 Merge pull request #274 from DanieleSdei/Marlin_v1 ErikZalm 2012-10-17 04:09:13 -0700
  • 695938ba3f Italian language support Daniele Sdei 2012-10-17 12:48:26 +0200
  • cb02c2f9d8 fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 ' Sergey Taranenko 2012-10-17 10:49:05 +0400
  • e4a5e333ef Generalize. Jonathan Bastien-Filiatrault 2012-10-15 21:34:33 -0400
  • e10d3136c8 Create an explicit rule for building applet/Marlin.cpp. Jonathan Bastien-Filiatrault 2012-10-15 21:16:25 -0400
  • 9f089756b7 Merge pull request #265 from setar/Marlin_v1 ErikZalm 2012-10-14 14:11:58 -0700
  • 654387297f Merge pull request #268 from brupje/Marlin_v1 ErikZalm 2012-10-14 08:55:01 -0700
  • 326423719f Add support for Megatronics brupje 2012-10-14 14:05:57 +0300
  • d07b6e93d5 Add support for Megatronics brupje 2012-10-14 14:05:12 +0300
  • efcc28d347 Fix check for include LiquidCrystalRus.h Sergey Taranenko 2012-10-13 00:29:34 +0400
  • cfc193cdac Enables support the Cyrillic alphabet for LCD Sergey Taranenko 2012-10-12 19:06:43 +0400
  • 24bcc9647d Added Russian translation Sergey Taranenko 2012-10-12 18:33:05 +0400
  • bc27d809fb Merge pull request #262 from markfinn/bedpid-clean3 ErikZalm 2012-10-09 13:18:58 -0700
  • bf7e453d02 Unwanted artifacts from unclean merge of bed-pid tree Mark Finn 2012-10-09 14:47:35 -0500
  • 36a746d7d5 Merge pull request #244 from markfinn/pidbed ErikZalm 2012-10-08 11:15:16 -0700
  • ca811156a0 Merge pull request #1 from johnnyr/patch-1 tonokip 2012-10-01 23:55:08 -0700
  • 50daf27e5a Merge pull request #255 from elgambitero/Marlin_v1 ErikZalm 2012-09-26 10:29:03 -0700
  • df09e2adce Spanish updated elgambitero 2012-09-26 19:14:07 +0200
  • ddf6603d81 Spanish language updated. Bug fixes on dialogs. elgambitero 2012-09-26 19:11:45 +0200
  • 4bf8b1aeee fesfas elgambitero 2012-09-26 19:05:31 +0200
  • be1e099f1b Union whit Erick version drakelive 2012-09-25 19:17:15 +0200
  • 7afd202b89 New dialogs translated to spanish. Bug fixes. elgambitero 2012-09-25 19:16:57 +0200
  • ebc4601185 Some new dialogs translated to Spanish elgambitero 2012-09-07 14:55:39 +0200
  • c8ea9b0e58 Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin drakelive 2012-09-25 18:51:20 +0200
  • ca7ca4572e primo commit drakelive 2012-09-25 18:46:38 +0200
  • c0aad4c28a Merge pull request #254 from ZetaPhoenix/Marlin_v1_bugfix ErikZalm 2012-09-25 00:10:38 -0700
  • 8016f058bc fix max endstop pins johnnyr 2012-09-19 13:15:17 -0500
  • d197f8504b clean up and changes from testing Mark Finn 2012-09-17 19:18:09 -0500
  • eb06a886c4 missed Mark Finn 2012-09-17 14:23:49 -0500
  • 04631d2250 cleanup for pull Mark Finn 2012-09-17 14:17:24 -0500
  • 0a5ad3ab85 move comment to correct place Mark Finn 2012-09-17 08:42:35 -0500
  • 8ac5b29e02 Changes to M119 response for easier visual comparison Changed to report on individual lines with "TRIGGERED" or "open" instead of "H" or "L" on one line as H&L could be confused with logic levels High and Low which may be wrong if using inverted logic. Added strings to language.h. ZetaPhoenix 2012-09-16 14:51:24 -0700
  • 0a31ccb1d1 Merge pull request #251 from ZetaPhoenix/Marlin_v1_bugfix ErikZalm 2012-09-16 01:47:51 -0700
  • c6caa45ae2 Limit Switch locations based on MIN/MAX limits and homing direction fixes #246 Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined. Relocated code based on feedback. ZetaPhoenix 2012-09-15 15:25:49 -0700
  • dc566d654f fixes #246 Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined. ZetaPhoenix 2012-09-14 21:48:49 -0700
  • ba898faa7d Merge pull request #249 from gwelchc/patch-2 ErikZalm 2012-09-14 12:13:36 -0700
  • 0152ee71a5 Merge pull request #248 from gwelchc/patch-1 ErikZalm 2012-09-14 12:10:28 -0700
  • 348d543425 Merge pull request #245 from andrey-vasilyev/patch-1 ErikZalm 2012-09-14 12:04:57 -0700
  • 6ccbfeb80c Update Marlin/Marlin.pde G. W. C. 2012-09-14 16:38:54 +0300
  • c433142abf Update Marlin/ultralcd.pde G. W. C. 2012-09-14 16:29:43 +0300
  • 1d389ad3a8 Fix M81 not working reliably on Gen7 andrey-vasilyev 2012-09-13 19:23:48 +0400
  • 5bfccab650 readme Mark Finn 2012-09-12 21:52:16 -0500
  • 9698f4ea64 bed pid Mark Finn 2012-09-12 21:01:31 -0500
  • 769796ed4c Merge pull request #240 from ZetaPhoenix/Marlin_v1_bugfix ErikZalm 2012-09-11 02:10:39 -0700
  • e5c39b7c2a commit drakelive 2012-09-10 14:25:49 +0200
  • e8c92e0a95 Missing #else in temperature.cpp prevented reading bed temp when TEMP_BED_PIN <7. Thanks to Leland Wallace for helping me track this down via "Sesame Street" coding (what is not like the other) ZetaPhoenix 2012-09-09 16:06:02 -0700
  • bf2071871c Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin drake 2012-09-08 23:08:34 +0200
  • fc32e20881 first commit drake 2012-09-08 22:26:23 +0200
  • abf0693e8e Added KILL_PIN -1 to gen7 boards Erik vd Zalm 2012-09-04 08:20:27 +0200
  • 47319cf64e Fixed typo in SF arc fix code. Erik vd Zalm 2012-09-03 21:28:31 +0200
  • e358a2d7af Added fix for SF Arc Point fillet procedure Erik vd Zalm 2012-09-02 01:12:49 +0200
  • 044a64a1fb Merge pull request #225 from Justblair/Marlin_v1 ErikZalm 2012-09-01 04:41:49 -0700
  • cd91e0e3e1 Merge pull request #228 from Drakelive/patch-1 ErikZalm 2012-08-30 13:39:37 -0700
  • d728e35658 Update Marlin/pins.h Drakelive 2012-08-30 23:36:49 +0300
  • 1c1fddc7ac Added support for the Rambo reprap electronics board. Added Mcodes to set motor current and microstepping pins. tonokip 2012-08-30 00:16:57 -0700
  • dcd3e8a211 Tidy up Blair Thompson 2012-08-29 22:53:41 +0100
  • ddd9d0cfd4 Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included. Blair Thompson 2012-08-29 21:08:41 +0100
  • 0e58ef6805 Some dialogs are corrected Erik vd Zalm 2012-08-29 21:15:59 +0200
  • 0e89022cc3 Correct temptable_55 name. Erik vd Zalm 2012-08-28 19:47:22 +0200
  • 47d4f55bc0 Fix Gen7 1.4 pinout Bracken Dawson 2012-08-22 23:15:46 +0100
  • 6cd150842f Update Marlin/language.h elgambitero 2012-08-22 21:46:22 +0300
  • 299c18596f Update Marlin/language.h elgambitero 2012-08-22 21:44:57 +0300
  • b86336c3f5 Merge pull request #221 from daid/Marlin_v1 ErikZalm 2012-08-22 06:30:35 -0700
  • b69e75c89a Added long filename support. daid 2012-08-22 14:49:57 +0200
  • 825adbd67b Merge pull request #220 from MaikStohn/1d224cc031 ErikZalm 2012-08-22 04:33:28 -0700
  • 1d224cc031 merged with upstream and FIXED AGAIN bad translation commit stohn 2012-08-22 13:05:42 +0200
  • 06c03fe2f0 new method for message for making KILLED message visible stohn 2012-08-22 12:44:41 +0200
  • 87ff61a8a6 Fix for #201 daid 2012-08-22 10:54:55 +0200
  • 8c94ad0d26 Merge pull request #219 from Justblair/Marlin_v1 ErikZalm 2012-08-21 23:21:11 -0700
  • aacbebbebe Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory. Blair Thompson 2012-08-21 23:46:10 +0100
  • 31873ec707 changed int to long to overcome overflow of number display stohn 2012-08-21 16:47:39 +0200
  • de0448343f added KILL_PIN support / cleaned up manage_inactivity function definition stohn 2012-08-21 14:48:29 +0200
  • 69961dbba3 fixed incorrect menu messages from last commit... stohn 2012-08-21 14:44:20 +0200
  • f67feea093 Merge pull request #217 from Justblair/Marlin_v1 ErikZalm 2012-08-20 14:34:32 -0700
  • 6c050b8440 Fixes error introduced at commit aee475aa55 which caused the sketch not to comile for language option 1. Several defines were removed but still referenced in ultralcd.pde Blair Thompson 2012-08-20 21:54:47 +0100
  • b9f9f8f7d3 The pre-heat ABS and PLA options in the LCD Menu were broken a while back. The pre-heat worked fine, but the cooling fans were not switching on as intended. This is now fixed. Blair Thompson 2012-08-20 21:49:37 +0100
  • d38b96fff1 Update Marlin/language.h elgambitero 2012-08-12 22:45:11 +0300
  • 9f7f7354f5 Set default language 1 Erik vd Zalm 2012-08-12 21:29:42 +0200
  • d3b8edb6a2 Merge pull request #212 from elgambitero/Marlin_v1 ErikZalm 2012-08-12 12:27:06 -0700
  • aee475aa55 Update Marlin/language.h elgambitero 2012-08-12 21:26:17 +0300
  • 9083966c22 Do not use feedrate multiiply on Z and E only moves. Erik vd Zalm 2012-08-12 18:13:34 +0200
  • 5406c533db Disable FAST_PWM by default. On some systems it does not work ok. Erik vd Zalm 2012-08-11 15:51:04 +0200
  • f92dc91c3d Enable M503 also when eeprom is disabled Erik vd Zalm 2012-08-11 15:49:40 +0200
  • 35a1dd081f no message James Adams 2012-07-28 12:08:18 -0600
  • 5131ab19ca Fixed Retract in LCD Menu James Adams 2012-07-26 23:44:03 -0600