SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Commit graph

  • da05b3ba94 faster GLCD (ST7920 SW-SPI) implementation / fixes Maik Stohn 2013-06-05 16:27:44 +0200
  • 4b19c8552e Fixing changed Configuration.h settings to be default values per ErikZalm Request. kiyoshigawa 2013-06-04 12:01:55 -0600
  • 971ec35135 Expanded M302 to allow setting the temp Erik van der Zalm 2013-06-02 17:36:23 +0200
  • 4de419e26e Updated README.md Erik van der Zalm 2013-06-02 16:26:42 +0200
  • a0729f0c3a no message Erik van der Zalm 2013-06-02 15:42:59 +0200
  • 5090c56651 More redundant temp sensor changes. (After testing and debugging by reifsnderb) Erik van der Zalm 2013-05-29 19:29:30 +0200
  • 16b9239a26 Report temperatures for all extruders Guillaume Seguin 2013-05-29 18:06:12 +0200
  • a964b3cf3d Merge pull request #495 from Gatulibu/Marlin_v1 ErikZalm 2013-05-28 07:51:49 -0700
  • 34fb4831a2 Merge pull request #496 from MStohn/fix-16x2-lcd ErikZalm 2013-05-28 07:50:52 -0700
  • e8572c5239 Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation Maik Stohn 2013-05-28 15:53:07 +0200
  • 7ee70c2248 Fix: removed wrong ; at end of define Maik Stohn 2013-05-28 15:50:48 +0200
  • b78fa6bb70 Added support for Megatronics v2.0 and Minitronics v1.0 Gatulibu 2013-05-28 14:03:31 +0200
  • 9be61cdc02 Added redundant temp sensor Erik van der Zalm 2013-05-26 17:57:49 +0200
  • 7231a20dba Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42. Erik van der Zalm 2013-05-24 21:05:11 +0200
  • 7296de34cb Merge pull request #491 from stoneburner/patch-1 ErikZalm 2013-05-22 06:10:25 -0700
  • e2ff536b03 Fixed typo in Comment Alexander Kasimir 2013-05-22 16:02:03 +0300
  • df776f36a4 Merge pull request #490 from buildrob101/Marlin_v1 ErikZalm 2013-05-22 05:37:25 -0700
  • 40eb07bad4 Revert and extend previous change pin check change Robert F-C 2013-05-22 21:33:23 +1000
  • 440cf2bc10 Merge pull request #488 from MStohn/fix-typo ErikZalm 2013-05-21 09:36:14 -0700
  • bd33cf4a9f fixed typo / added "const" to defines for newer gcc compatibility Maik Stohn 2013-05-21 17:58:34 +0200
  • 567291e734 Merge pull request #485 from Banjer/Panelolu2_Melzi ErikZalm 2013-05-21 08:46:27 -0700
  • 68f9f2521e Merge pull request #487 from MStohn/fix-bad-lcd-commit-from-buildrob ErikZalm 2013-05-21 08:17:21 -0700
  • 8d80cbbf4c fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored Maik Stohn 2013-05-21 16:53:38 +0200
  • 273502a172 Merge pull request #486 from xifle/Marlin_v1 ErikZalm 2013-05-20 08:09:51 -0700
  • 98d0d48191 fixed merge xifle 2013-05-20 14:52:35 +0200
  • bbe67fca5a soft tab correction xifle 2013-05-20 14:50:39 +0200
  • 9eeb711c96 Merged from Upstream Master xifle 2013-05-20 14:45:37 +0200
  • 424101110c Add Panelolu2 support for Melzi Bas Spaans 2013-05-19 12:04:26 +0200
  • b2eeebd9c3 Merge pull request #409 from buildrob202/Marlin_v1 ErikZalm 2013-05-19 02:10:33 -0700
  • 0d4a9444c4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Robert F-C 2013-05-19 08:50:58 +1000
  • 86cce025f4 Added #ifdef NUM_SERVOS to servo.cpp Erik van der Zalm 2013-05-18 23:12:28 +0200
  • 1a18a487f9 Merge pull request #407 from buildrob101/Marlin_v1 ErikZalm 2013-05-18 11:28:32 -0700
  • 03141a5ef4 LCD: Added Deadzone at 100% Feedrate xifle 2013-05-18 19:53:46 +0200
  • 28ada096e2 Adding servo documentation Gord Christmas 2013-05-18 06:01:58 -0700
  • 4121311b9d Change to LCD status indicators Robert F-C 2013-05-18 22:30:42 +1000
  • dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Robert F-C 2013-05-18 21:59:39 +1000
  • 64360164ad Merge pull request #482 from codexmas/Marlin_v1 ErikZalm 2013-05-16 10:19:00 -0700
  • 86405cdd11 Merge pull request #479 from MStohn/thermocouple ErikZalm 2013-05-16 10:06:59 -0700
  • 6c45c3f4e7 BariCUDA changes Erik van der Zalm 2013-05-16 19:00:57 +0200
  • 96624f0f31 Forgot to include reference to Servo in makefile Gord Christmas 2013-05-16 08:25:20 -0700
  • 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 -0700
  • b668cb0516 Adding in clean copies of Servo library from Arduino 1.0.4 Gord Christmas 2013-05-16 06:47:42 -0700
  • 95dff34b73 fixed wrong compare for min temp check of heater 1 and heater 2 MaikStohn 2013-05-16 01:17:38 +0200
  • 4cc6f9f6de fixed wrong pin initialization when using temperature 2 pin input MaikStohn 2013-05-16 01:17:08 +0200
  • 61a48cc662 Add support for RUMBA thermocouple add on MaikStohn 2013-05-16 01:16:33 +0200
  • 9cc15876be Add support for RUMBA thermocouple add on MaikStohn 2013-05-16 01:16:08 +0200
  • c9cf2174dd Merge pull request #474 from xifle/Marlin_v1 ErikZalm 2013-05-14 14:58:53 -0700
  • bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes Erik van der Zalm 2013-05-14 23:56:32 +0200
  • 37f3199df3 fixed problems in planner with solenoids for BariCUDA when set to 0 Jordan Miller 2013-05-14 17:16:10 -0400
  • 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 -0400
  • 29bb8d7d4f Fixed "Cooldown" Selection not reseting bed temp xifle 2013-05-14 16:56:19 +0200
  • 015d0594b0 Optimize menu selection for Viki rotary encoder. Robert F-C 2013-05-12 07:51:28 +1000
  • 90664d20a4 Merge pull request #472 from gregor2005/Marlin_v1 ErikZalm 2013-05-10 13:26:17 -0700
  • 2739c26c4f changes: - changed the variables from keypad to reprapworld_keypad - added a missing ifdef check gregor 2013-05-10 22:20:02 +0200
  • 6fb9573157 added support for the reprapworld keypad gregor 2013-05-10 21:57:17 +0200
  • 594193c908 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Tim Anderson 2013-05-06 23:29:38 -0600
  • 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 -0600
  • b27a59f41e Added support for Elefu RA Board and Elefu Control Panel kiyoshigawa 2013-05-06 08:44:38 -0600
  • 2c0fa34c9e Merge pull request #466 from midopple/Marlin_v1 ErikZalm 2013-05-05 14:24:48 -0700
  • 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 +0200
  • 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 +0200
  • a5cd582665 Support for 10 level deep SD folder hierarchy Scott Lahteine 2013-05-04 04:18:02 -0700
  • e3bc420daa Merge pull request #464 from arnoudja/Marlin_v1 daid 2013-05-03 12:38:23 -0700
  • fc4ab05157 Solved minor bug in controllerFan() Arnoud 2013-05-03 21:32:34 +0200
  • 0ef54f2f85 Make M303 silent when "S0" is sent Scott Lahteine 2013-05-02 09:55:15 -0700
  • a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h Scott Lahteine 2013-05-02 09:22:58 -0700
  • 727aa2a051 Merge pull request #459 from martinxyz/fix-rounding-error daid 2013-05-02 08:34:03 -0700
  • 1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error Martin Renold 2013-05-01 08:18:45 +0200
  • 289c02eda4 Remove unnecessary pin initialization in stepper.cpp Robert F-C 2013-04-30 01:11:23 +1000
  • d5ad7a0814 Rework change to incorporate CONTROLLERFAN Robert F-C 2013-04-30 01:08:29 +1000
  • c3cdaceab3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Robert F-C 2013-04-29 22:13:55 +1000
  • 1c127217df Make DOGLCD merge neater. Robert F-C 2013-04-29 22:03:37 +1000
  • 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 +1000
  • 788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 Robert F-C 2013-04-29 21:13:46 +1000
  • 4f96ad5621 Merge pull request #456 from Stefanowicz/Marlin_v1 ErikZalm 2013-04-24 02:01:52 -0700
  • d71f1e9bf6 Add (as an option) slower SD transfer mode Lukasz Stefanowicz 2013-04-24 10:50:57 +0200
  • db5bb8546d Merge pull request #452 from MStohn/Marlin_v1 ErikZalm 2013-04-23 09:43:37 -0700
  • 4b2ece159b Merge pull request #453 from brackendawson/Marlin_v1 daid 2013-04-16 10:12:25 -0700
  • d5ee2a5a62 Make Gen7 1.4 heater pins match silkscreen Bracken Dawson 2013-04-16 17:37:38 +0100
  • 7ac6d7f78e FIX: Speedup - no explicit display clear needed in u8glib MaikStohn 2013-04-16 14:22:24 +0200
  • 13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller MaikStohn 2013-04-16 14:21:39 +0200
  • 3a6abe1d6e Removed STB custom font hack from u8glib library and moved to marlin project MaikStohn 2013-04-16 13:54:39 +0200
  • 16afbf9bfa FIX: adopted latest changes from hitachi implementation MaikStohn 2013-04-16 13:51:48 +0200
  • c83863d5d6 add U8glib library to Arduino1.x includes MaikStohn 2013-04-16 12:44:54 +0200
  • 34bca48b98 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 daid303 2013-04-15 15:11:38 +0200
  • ac52dcc174 Updated the card menu and watch messages to make it more informative. daid303 2013-04-15 15:11:22 +0200
  • 84920e9c58 Merge pull request #449 from Stefanowicz/Marlin_v1 daid 2013-04-12 13:45:15 -0700
  • 31bb3fb297 Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined Stefanowicz 2013-04-12 18:04:32 +0200
  • 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 +0200
  • 5d5909fc25 Fix failure to compile with heated bed: remove call to non-existant scaleBedPID(). Simon Oliver 2013-04-06 12:18:39 -0500
  • 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 -0500
  • 1f74ef4157 Merge pull request #441 from bkpsu/Marlin_v1 ErikZalm 2013-04-01 01:06:10 -0700
  • 4fa2260a59 Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file) Bart K 2013-03-31 19:59:16 -0400
  • 038d405254 Corrected #endif in language.h Erik van der Zalm 2013-03-31 20:28:29 +0200
  • 2438b34df9 Merge pull request #439 from STB3/Marlin-language.h-repair ErikZalm 2013-03-30 15:44:26 -0700
  • 443aaa30bf Removed GIT fragments Dirk Eichel 2013-03-30 23:26:42 +0100
  • 7f622467fc Merge pull request #425 from kefir-/m928_logging ErikZalm 2013-03-30 08:50:34 -0700
  • 86867928ac Merge pull request #434 from DDRBoxman/Marlin_v1 ErikZalm 2013-03-30 08:49:54 -0700
  • 9a38cad6f0 Merge pull request #430 from STB3/GLCD_128x64_dots ErikZalm 2013-03-30 08:49:14 -0700
  • 7a5c474d91 Update Configuration.h ErikZalm 2013-03-28 21:27:50 +0100