bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Commit Graph

  • 4121311b9d Change to LCD status indicators Robert F-C 2013-05-18 22:30:42 +10:00
  • dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Robert F-C 2013-05-18 21:59:39 +10:00
  • 64360164ad Merge pull request #482 from codexmas/Marlin_v1 ErikZalm 2013-05-16 10:19:00 -07:00
  • 86405cdd11 Merge pull request #479 from MStohn/thermocouple ErikZalm 2013-05-16 10:06:59 -07:00
  • 6c45c3f4e7 BariCUDA changes Erik van der Zalm 2013-05-16 19:00:57 +02:00
  • 96624f0f31 Forgot to include reference to Servo in makefile Gord Christmas 2013-05-16 08:25:20 -07:00
  • dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. Gord Christmas 2013-05-16 07:03:01 -07:00
  • b668cb0516 Adding in clean copies of Servo library from Arduino 1.0.4 Gord Christmas 2013-05-16 06:47:42 -07:00
  • 95dff34b73 fixed wrong compare for min temp check of heater 1 and heater 2 MaikStohn 2013-05-16 01:17:38 +02:00
  • 4cc6f9f6de fixed wrong pin initialization when using temperature 2 pin input MaikStohn 2013-05-16 01:17:08 +02:00
  • 61a48cc662 Add support for RUMBA thermocouple add on MaikStohn 2013-05-16 01:16:33 +02:00
  • 9cc15876be Add support for RUMBA thermocouple add on MaikStohn 2013-05-16 01:16:08 +02:00
  • c9cf2174dd Merge pull request #474 from xifle/Marlin_v1 ErikZalm 2013-05-14 14:58:53 -07:00
  • bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes Erik van der Zalm 2013-05-14 23:56:32 +02:00
  • 37f3199df3 fixed problems in planner with solenoids for BariCUDA when set to 0 Jordan Miller 2013-05-14 17:16:10 -04:00
  • fbd899a37d Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129. Jordan Miller 2013-05-14 16:25:53 -04:00
  • 29bb8d7d4f Fixed "Cooldown" Selection not reseting bed temp xifle 2013-05-14 16:56:19 +02:00
  • 015d0594b0 Optimize menu selection for Viki rotary encoder. Robert F-C 2013-05-12 07:51:28 +10:00
  • 90664d20a4 Merge pull request #472 from gregor2005/Marlin_v1 ErikZalm 2013-05-10 13:26:17 -07:00
  • 2739c26c4f changes: - changed the variables from keypad to reprapworld_keypad - added a missing ifdef check gregor 2013-05-10 22:20:02 +02:00
  • 6fb9573157 added support for the reprapworld keypad gregor 2013-05-10 21:57:17 +02:00
  • 594193c908 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Tim Anderson 2013-05-06 23:29:38 -06:00
  • 1fa61c297e Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion. Tim Anderson 2013-05-06 23:23:54 -06:00
  • b27a59f41e Added support for Elefu RA Board and Elefu Control Panel kiyoshigawa 2013-05-06 08:44:38 -06:00
  • 2c0fa34c9e Merge pull request #466 from midopple/Marlin_v1 ErikZalm 2013-05-05 14:24:48 -07:00
  • a65a26d6b4 If CORE_XY is in use X and Y Axis had to be activated at the same time midopple 2013-05-05 19:23:59 +02:00
  • db2f157a22 Replace the <= to < in the Command M907, M350 and M351. The for loop for Axis count over the Array. Add a break after M907 midopple 2013-05-05 19:19:55 +02:00
  • a5cd582665 Support for 10 level deep SD folder hierarchy Scott Lahteine 2013-05-04 04:18:02 -07:00
  • e3bc420daa Merge pull request #464 from arnoudja/Marlin_v1 daid 2013-05-03 12:38:23 -07:00
  • fc4ab05157 Solved minor bug in controllerFan() Arnoud 2013-05-03 21:32:34 +02:00
  • 0ef54f2f85 Make M303 silent when "S0" is sent Scott Lahteine 2013-05-02 09:55:15 -07:00
  • a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h Scott Lahteine 2013-05-02 09:22:58 -07:00
  • 727aa2a051 Merge pull request #459 from martinxyz/fix-rounding-error daid 2013-05-02 08:34:03 -07:00
  • 1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error Martin Renold 2013-05-01 08:18:45 +02:00
  • 289c02eda4 Remove unnecessary pin initialization in stepper.cpp Robert F-C 2013-04-30 01:11:23 +10:00
  • d5ad7a0814 Rework change to incorporate CONTROLLERFAN Robert F-C 2013-04-30 01:08:29 +10:00
  • c3cdaceab3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Robert F-C 2013-04-29 22:13:55 +10:00
  • 1c127217df Make DOGLCD merge neater. Robert F-C 2013-04-29 22:03:37 +10:00
  • 7f57f28ccc Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer. Robert F-C 2013-04-29 21:50:52 +10:00
  • 788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Robert F-C 2013-04-29 21:13:46 +10:00
  • 4f96ad5621 Merge pull request #456 from Stefanowicz/Marlin_v1 ErikZalm 2013-04-24 02:01:52 -07:00
  • d71f1e9bf6 Add (as an option) slower SD transfer mode Lukasz Stefanowicz 2013-04-24 10:50:57 +02:00
  • db5bb8546d Merge pull request #452 from MStohn/Marlin_v1 ErikZalm 2013-04-23 09:43:37 -07:00
  • 4b2ece159b Merge pull request #453 from brackendawson/Marlin_v1 daid 2013-04-16 10:12:25 -07:00
  • d5ee2a5a62 Make Gen7 1.4 heater pins match silkscreen Bracken Dawson 2013-04-16 17:37:38 +01:00
  • 7ac6d7f78e FIX: Speedup - no explicit display clear needed in u8glib MaikStohn 2013-04-16 14:22:24 +02:00
  • 13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller MaikStohn 2013-04-16 14:21:39 +02:00
  • 3a6abe1d6e Removed STB custom font hack from u8glib library and moved to marlin project MaikStohn 2013-04-16 13:54:39 +02:00
  • 16afbf9bfa FIX: adopted latest changes from hitachi implementation MaikStohn 2013-04-16 13:51:48 +02:00
  • c83863d5d6 add U8glib library to Arduino1.x includes MaikStohn 2013-04-16 12:44:54 +02:00
  • 34bca48b98 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2013-04-15 15:11:38 +02:00
  • ac52dcc174 Updated the card menu and watch messages to make it more informative. daid303 2013-04-15 15:11:22 +02:00
  • 84920e9c58 Merge pull request #449 from Stefanowicz/Marlin_v1 daid 2013-04-12 13:45:15 -07:00
  • 31bb3fb297 Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined Stefanowicz 2013-04-12 18:04:32 +02:00
  • c80a78bb70 Lower the default max E feedrate a bit. With the stepper fix this is much to high. daid303 2013-04-12 13:54:38 +02:00
  • 5d5909fc25 Fix failure to compile with heated bed: remove call to non-existant scaleBedPID(). Simon Oliver 2013-04-06 12:18:39 -05:00
  • 93f0463b21 Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values Simon Oliver 2013-03-19 09:05:11 -05:00
  • 1f74ef4157 Merge pull request #441 from bkpsu/Marlin_v1 ErikZalm 2013-04-01 01:06:10 -07:00
  • 4fa2260a59 Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file) Bart K 2013-03-31 19:59:16 -04:00
  • 038d405254 Corrected #endif in language.h Erik van der Zalm 2013-03-31 20:28:29 +02:00
  • 2438b34df9 Merge pull request #439 from STB3/Marlin-language.h-repair ErikZalm 2013-03-30 15:44:26 -07:00
  • 443aaa30bf Removed GIT fragments Dirk Eichel 2013-03-30 23:26:42 +01:00
  • 7f622467fc Merge pull request #425 from kefir-/m928_logging ErikZalm 2013-03-30 08:50:34 -07:00
  • 86867928ac Merge pull request #434 from DDRBoxman/Marlin_v1 ErikZalm 2013-03-30 08:49:54 -07:00
  • 9a38cad6f0 Merge pull request #430 from STB3/GLCD_128x64_dots ErikZalm 2013-03-30 08:49:14 -07:00
  • 7a5c474d91 Update Configuration.h ErikZalm 2013-03-28 21:27:50 +01:00
  • 4e448b700a Merged fetched files from Marlin_v1 branch Dirk Eichel 2013-03-26 21:43:04 +01:00
  • fa58be3cb8 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Dirk Eichel 2013-03-26 21:37:05 +01:00
  • 9f2862ce48 Merge pull request #414 from whosawhatsis/Marlin_v1 ErikZalm 2013-03-25 13:14:49 -07:00
  • 9fb8bd5685 Merge pull request #433 from whosawhatsis/bang-mode ErikZalm 2013-03-25 13:11:34 -07:00
  • aa816ee81c Merge pull request #432 from blddk/Marlin_v1 ErikZalm 2013-03-25 13:06:25 -07:00
  • 0d075378d5 Add LARGE_FLASH define and enable it for some of the beefier boards The LARGE_FLASH flag allows superfluous features to be excluded on boards with less memory Colin Edwards 2013-03-25 10:42:27 -05:00
  • 9a1c90471f Ignore unused beeper pins Colin Edwards 2013-03-25 10:28:15 -05:00
  • 1a0f889803 Add support for M300: Play beep sound Colin Edwards 2013-03-24 23:35:05 -05:00
  • 9322c408c6 Updated for LiquidTWI2 library version 1.2.3 Robert F-C 2013-03-24 18:19:58 +11:00
  • fd5b7e0cec Separate PID_MAX from BANG_MAX whosawhatsis 2013-03-22 18:16:26 -07:00
  • e5a853a3d0 Added automated extruder fan function blddk 2013-03-22 18:49:05 +01:00
  • 72419f69a9 Added rumba blddk 2013-03-22 18:41:54 +01:00
  • 91bea43332 Added rumba pinout blddk 2013-03-22 18:29:47 +01:00
  • d2b00fe486 Removed html and added rumba blddk 2013-03-22 18:28:16 +01:00
  • 6c66cae694 GLCD init screen cosmetics Dirk Eichel 2013-03-19 21:25:11 +01:00
  • f3e0e5184d Add include selector between char. LCD and GLCD Dirk Eichel 2013-03-19 20:59:21 +01:00
  • 5d3862f9d1 Modified u8glib logo on welcome screen Dirk Eichel 2013-03-19 20:32:23 +01:00
  • 0b320f75e9 Removed debug code, add some comments Dirk Eichel 2013-03-19 20:29:25 +01:00
  • 5f1cd70122 Add code to lcd_update() for GLCD Dirk Eichel 2013-03-19 20:19:16 +01:00
  • a49c09a776 Add variable for animated fan, add float conversion w/o sign Dirk Eichel 2013-03-19 20:13:23 +01:00
  • 26d8863111 Add library selection between GLCD and char. LCD Dirk Eichel 2013-03-19 20:03:47 +01:00
  • 4a141a694f Marlin code for GLCD display Dirk Eichel 2013-03-19 19:59:56 +01:00
  • 83c790a020 Add bitmap graphics for GLCD Dirk Eichel 2013-03-19 19:57:35 +01:00
  • c28e71a1bf Reduced u8glib SPI speed to fosc/8 Dirk Eichel 2013-03-19 19:50:08 +01:00
  • ee8feb9dee Add Marlin (reprap) specific fonts 6x10, 6x9 Dirk Eichel 2013-03-19 19:45:57 +01:00
  • c8e2f44087 Add u8glib library supporting dot matrix displays Dirk Eichel 2013-03-19 19:41:23 +01:00
  • 7417423691 Merge remote-tracking branch 'origin/Marlin_language_file_fix' into GLCD_128x64_dots Dirk Eichel 2013-03-19 19:38:44 +01:00
  • 590225be25 Merge pull request #428 from ryanturner/Marlin_v1 ErikZalm 2013-03-19 11:32:47 -07:00
  • a0e41c0970 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Dirk Eichel 2013-03-19 19:16:00 +01:00
  • 233df9cca0 Add missing LF at the end of the file Dirk Eichel 2013-03-19 19:12:33 +01:00
  • bb0de75a92 Removed umwanted HTML code ath the end of the file Dirk Eichel 2013-03-19 06:46:05 +01:00
  • 7c47e7162d Adding Maker's Tool Works heated bed thermistor Ryan Turner 2013-03-18 22:53:37 -05:00
  • af78d0cbfa Merge pull request #1 from illuminarti/Fix_E_Speed daid 2013-03-15 01:03:53 -07:00
  • 9a78f321a4 Add pins for Motherboard variant 64 Dirk Eichel 2013-03-01 17:47:32 +01:00