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

Commit Graph

  • 599530902d Polish up a little... Scott Lahteine 2014-12-06 03:40:39 -0800
  • 1ba7c31395 Adding Melzi board Bo Herrmannsen 2014-12-04 23:45:51 +0100
  • 64139f5e5a Merge https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-12-04 21:09:03 +0000
  • 2f9ed1777d Merge pull request #1168 from boelle/Marlin_v1 galexander1 2014-12-03 09:32:23 -0500
  • edfcf3b527 Toshiba Stepper Driver support Bo Herrmannsen 2014-12-03 15:01:52 +0100
  • c429a4b3ec Toshiba Stepper Driver support Bo Herrmannsen 2014-12-03 14:37:16 +0100
  • e5a334b83a Use SdFatUtil::FreeRam() for freeMemory() if there Scott Lahteine 2014-12-03 05:19:42 -0800
  • f05928d886 Merge branch 'sd_sorting' of https://github.com/thinkyhead/Marlin into sd_sorting Scott Lahteine 2014-11-30 21:38:26 -0800
  • b4e287fe8e Completed SORT_USES_MORE_RAM implementation Scott Lahteine 2014-11-30 21:28:16 -0800
  • de725bd408 # This is a combination of 4 commits. # The first commit's message is: SD Card Alpha Sorting Scott Lahteine 2014-11-24 14:03:20 -0800
  • 061c1fcd93 Merge branch 'lcd_abort_message' of https://github.com/thinkyhead/Marlin into lcd_abort_message Scott Lahteine 2014-11-30 19:58:10 -0800
  • 181e487f13 Print a message when printing is aborted Scott Lahteine 2014-11-30 19:56:06 -0800
  • ff38d7c293 Print a message when printing is aborted Scott Lahteine 2014-11-30 19:56:06 -0800
  • 1977b4490f Merge pull request #1159 from thinkyhead/lcd_wait_better nothinman 2014-11-28 16:44:29 +0000
  • 7562183efc Skip over spaces first Scott Lahteine 2014-11-28 08:09:28 -0800
  • 5a8b3a84ae Merge pull request #1155 from thinkyhead/lcd_wait_better nothinman 2014-11-28 11:01:24 +0000
  • 1b7c065055 Merge pull request #1158 from elgambitero/patch-2 nothinman 2014-11-28 10:57:50 +0000
  • 433ac29d31 Updated a bit of spanish language elgambitero 2014-11-27 22:02:49 +0100
  • 2427d0b683 Merge branch 'sd_sorting' of https://github.com/thinkyhead/Marlin into sd_sorting Scott Lahteine 2014-11-26 21:09:09 -0800
  • 8ebefe6d35 Completed SORT_USES_MORE_RAM implementation Scott Lahteine 2014-11-26 08:51:31 -0800
  • 725ba8d01e Improvements, more SORT_USES_MORE_RAM Scott Lahteine 2014-11-26 07:17:47 -0800
  • 2b54eeb897 Expand on More RAM concept, address minor bugs Scott Lahteine 2014-11-24 20:26:27 -0800
  • 14187dae6c SD Card Alpha Sorting Scott Lahteine 2014-11-24 14:03:20 -0800
  • 662fe8288b kill DEADJOE Scott Lahteine 2014-11-26 21:07:48 -0800
  • aad336eb81 Merge branch 'lcd_wait_better' of https://github.com/thinkyhead/Marlin into lcd_wait_better Scott Lahteine 2014-11-26 21:06:13 -0800
  • 5874852501 get latest Marlin_v1 changes Scott Lahteine 2014-11-26 21:00:02 -0800
  • 12b51d6060 Ignore S and P if no value >0 is included. Scott Lahteine 2014-11-26 09:21:37 -0800
  • d12b24758a Clear LCD to welcome_msg if not printing Scott Lahteine 2014-11-24 18:50:11 -0800
  • 3f54c9ba33 Relocate click ignore code into info screen Scott Lahteine 2014-11-24 17:12:08 -0800
  • 92e21d3ee2 M0-M1 Enhancements Scott Lahteine 2014-11-24 16:56:37 -0800
  • 5714f64927 get latest Marlin_v1 changes Scott Lahteine 2014-11-26 21:00:02 -0800
  • d407a43ac1 Ignore S and P if no value >0 is included. Scott Lahteine 2014-11-26 09:21:37 -0800
  • eaa788e076 Completed SORT_USES_MORE_RAM implementation Scott Lahteine 2014-11-26 08:51:31 -0800
  • 6901445592 Improvements, more SORT_USES_MORE_RAM Scott Lahteine 2014-11-26 07:17:47 -0800
  • 0d35b1d0b8 Allow negative values in menus Lionello Lunesu 2014-11-24 22:51:16 +0800
  • 87fc00c182 Expand on More RAM concept, address minor bugs Scott Lahteine 2014-11-24 20:26:27 -0800
  • 7681711e7e Clear LCD to welcome_msg if not printing Scott Lahteine 2014-11-24 18:50:11 -0800
  • aa4160ba62 Relocate click ignore code into info screen Scott Lahteine 2014-11-24 17:12:08 -0800
  • cd769781a1 M0-M1 Enhancements Scott Lahteine 2014-11-24 16:56:37 -0800
  • f40cff59f3 SD Card Alpha Sorting Scott Lahteine 2014-11-24 14:03:20 -0800
  • 90eb266139 Merge pull request #1148 from krasin/travis galexander1 2014-11-16 08:57:31 -0500
  • d078c7c29f Add Travis CI config to build Marlin firmware. Ivan Krasin 2014-11-16 01:46:24 -0500
  • 3dc9e478ad Merge pull request #1143 from Silly105/Marlin_v1 galexander1 2014-11-12 17:41:36 -0500
  • 0d97dec434 Adaption of LCD info screen Jonas 2014-11-12 17:10:48 +0100
  • 1651ccc0cc Added Filament Sensor to the README Filip Mulier 2014-11-10 22:05:20 -0600
  • 3b1ab84536 Display Filament Sensor data on graphic LCD Filip Mulier 2014-11-10 21:46:37 -0600
  • d84934d8c5 Display Filament Sensor data on 20x4 LCD Filip Mulier 2014-11-10 21:43:58 -0600
  • 4ffdbcbd4e Merge pull request #1138 from filipmu/Marlin_v1 Bernhard Kubicek 2014-11-09 20:38:30 +0100
  • 5c8107bcdd Commented out FILAMENT_SENSOR #define Filip Mulier 2014-11-09 13:26:02 -0600
  • df7c80335a Merge pull request #3 from filipmu/Marlin_v1 filipmu 2014-11-09 07:07:26 -0600
  • b014fd1ad2 Merge pull request #2 from ErikZalm/Marlin_v1 filipmu 2014-11-09 07:01:57 -0600
  • 443b648863 Merge pull request #1133 from monkeydave/update_delta_config galexander1 2014-11-03 08:14:54 -0500
  • 377dfb182f Updated example configurations for Delta printers David 2014-11-02 21:04:54 +0000
  • b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-10-21 12:06:56 +0100
  • 724197454c Merge pull request #1104 from ch100/Marlin_v1 Erik van der Zalm 2014-10-11 23:10:00 +0200
  • 058e446531 Merge pull request #1037 from filipmu/Filament-Sensor Erik van der Zalm 2014-10-11 22:56:01 +0200
  • 110c5dcf23 Fixed typo. Christian Inci 2014-10-11 00:25:36 +0200
  • 256c25a843 Merge pull request #1101 from MattStultz/patch-1 galexander1 2014-10-07 08:20:53 -0400
  • ca30aee903 Fix "add_homeing" to "add_homing" to match changes Matt Stultz 2014-10-07 00:16:27 -0400
  • 0733825fb1 Merge pull request #1099 from Fourmi/Marlin_v1 Erik van der Zalm 2014-10-06 14:36:00 +0200
  • af3e4d7510 Update line 627 ,wrong number on thermistortables Fourmi 2014-10-06 14:21:44 +0200
  • aaaf8fe8dd Merge pull request #1068 from darkjavi/Marlin_v1 Erik van der Zalm 2014-10-06 13:41:38 +0200
  • b360306881 Merge pull request #1073 from WingTangWong/wing-fix-float-delta Erik van der Zalm 2014-10-06 13:41:01 +0200
  • ce85515428 Merge pull request #1082 from Fourmi/Marlin_v1 Erik van der Zalm 2014-10-06 13:39:36 +0200
  • 764921bdbf Merge pull request #1091 from Aldert/patch-1 Erik van der Zalm 2014-10-06 13:37:19 +0200
  • c40c7b589b Merge pull request #1095 from thinkyhead/codeclean Erik van der Zalm 2014-10-06 13:36:48 +0200
  • 0f2e0525df Merge pull request #1096 from thinkyhead/set-home Erik van der Zalm 2014-10-06 13:36:11 +0200
  • 5ae02a361b Merge pull request #1097 from thinkyhead/round-up-xyz Erik van der Zalm 2014-10-06 13:35:00 +0200
  • 83037542aa Merge pull request #1098 from mattsch/optional_hotend_lcd Erik van der Zalm 2014-10-06 13:34:37 +0200
  • fb34265d75 Make hotend optional when compiling with lcd support Matthew Schick 2014-10-06 00:16:08 -0400
  • 6e343ef2f0 Adjust the Z display to hide float rounding errors Scott Lahteine 2014-10-05 18:34:54 -0700
  • 2f6c57eadc Proposed feature: Set Home Offsets Scott Lahteine 2014-10-05 13:35:45 -0700
  • f989bd5435 Simple code cleanup. Rename "homeing" to homing. Scott Lahteine 2014-10-05 13:20:53 -0700
  • 6c5a460e65 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-10-05 12:54:54 +0100
  • d1e4237e1d Update motion_control.cpp Aldert 2014-10-04 09:24:09 +0200
  • a664763e6f Update thermistortables.h Fourmi 2014-09-27 09:05:10 +0200
  • b5dc228a7a Update configuration.h Fourmi 2014-09-27 09:02:58 +0200
  • 3cbb2f56c6 Update configuration.h Fourmi 2014-09-26 22:01:06 +0200
  • c35736a140 Update thermistortables.h Fourmi 2014-09-26 21:49:07 +0200
  • cb4a6dd2dc Merge pull request #1065 from oliasmage/Marlin_v1 galexander1 2014-09-19 15:12:09 -0400
  • 5b66810580 Merge pull request #1078 from brackendawson/Marlin_v1 galexander1 2014-09-19 15:05:34 -0400
  • 01e9b536cb Fix build for non-sled bed auto levelling Bracken Dawson 2014-09-19 19:42:32 +0100
  • 58eabd21fb Added ifndef Wing Tang Wong 2014-09-16 14:31:58 -0700
  • 88d12a762a Added #ifndef DELTA wrapper to float delta Wing Tang Wong 2014-09-16 14:29:44 -0700
  • bf0ecedf60 Merge pull request #1051 from fsantini/EZ_fix935 alexborro 2014-09-14 21:49:15 -0300
  • 9bc7aec349 Update README.md filipmu 2014-09-06 21:55:47 -0500
  • 40ba644bb4 Added profile for RAMPS with 2 extruders and 1 fan. modified: Marlin/Configuration.h modified: Marlin/pins.h Javi 2014-09-06 02:53:36 +0200
  • 3b8216bdd1 Corrected #endif and ifdef for Z_PROBE_SLED code. Charles Bell 2014-09-04 16:40:22 -0400
  • 37799f70ba Corrected retract() call for use of auto probe without sled enabled. Charles Bell 2014-09-04 14:36:39 -0400
  • 1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-09-04 12:21:35 +0100
  • fe3a09bbcf Correct analog sampling time for additional A to D sample Filip Mulier 2014-09-01 06:26:19 -0500
  • 1d62309d2a Merge pull request #1053 from foosel/fix/translated_serial_protocol Bernhard Kubicek 2014-08-30 10:38:09 +0200
  • 1e9dc85148 Do not use translations for the serial console messages Gina Häußge 2014-08-29 18:02:59 +0200
  • cf325ba240 Fix issue 935: error in matrix calculation fsantini 2014-08-28 21:10:50 +0200
  • 018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi Erik van der Zalm 2014-08-28 16:32:52 +0200
  • dde61d8886 Merge pull request #977 from OskarLinde/Marlin_v1 Erik van der Zalm 2014-08-28 16:31:53 +0200
  • 0fbfb1bf82 Merge pull request #991 from bonm014/patch-1 Erik van der Zalm 2014-08-28 16:27:52 +0200
  • 8340ca6e05 Merge pull request #992 from Grogyan/patch-1 Erik van der Zalm 2014-08-28 16:27:14 +0200
  • 9887555192 Merge pull request #998 from darconeous/pull-requests/fwretract Erik van der Zalm 2014-08-28 16:24:51 +0200
  • 105571ec68 Merge pull request #1005 from midopple/Marlin_v1 Erik van der Zalm 2014-08-28 16:24:14 +0200