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

Commit graph

  • 6901445592 Improvements, more SORT_USES_MORE_RAM Scott Lahteine 2014-11-26 07:17:47 -08:00
  • 0d35b1d0b8 Allow negative values in menus Lionello Lunesu 2014-11-24 22:51:16 +08:00
  • 87fc00c182 Expand on More RAM concept, address minor bugs Scott Lahteine 2014-11-24 20:26:27 -08:00
  • 7681711e7e Clear LCD to welcome_msg if not printing Scott Lahteine 2014-11-24 18:50:11 -08:00
  • aa4160ba62 Relocate click ignore code into info screen Scott Lahteine 2014-11-24 17:12:08 -08:00
  • cd769781a1 M0-M1 Enhancements Scott Lahteine 2014-11-24 16:56:37 -08:00
  • f40cff59f3 SD Card Alpha Sorting Scott Lahteine 2014-11-24 14:03:20 -08:00
  • 90eb266139 Merge pull request #1148 from krasin/travis galexander1 2014-11-16 08:57:31 -05:00
  • d078c7c29f Add Travis CI config to build Marlin firmware. Ivan Krasin 2014-11-16 01:46:24 -05:00
  • 3dc9e478ad Merge pull request #1143 from Silly105/Marlin_v1 galexander1 2014-11-12 17:41:36 -05:00
  • 0d97dec434 Adaption of LCD info screen Jonas 2014-11-12 17:10:48 +01:00
  • 1651ccc0cc Added Filament Sensor to the README Filip Mulier 2014-11-10 22:05:20 -06:00
  • 3b1ab84536 Display Filament Sensor data on graphic LCD Filip Mulier 2014-11-10 21:46:37 -06:00
  • d84934d8c5 Display Filament Sensor data on 20x4 LCD Filip Mulier 2014-11-10 21:43:58 -06:00
  • 4ffdbcbd4e Merge pull request #1138 from filipmu/Marlin_v1 Bernhard Kubicek 2014-11-09 20:38:30 +01:00
  • 5c8107bcdd Commented out FILAMENT_SENSOR #define Filip Mulier 2014-11-09 13:26:02 -06:00
  • df7c80335a Merge pull request #3 from filipmu/Marlin_v1 filipmu 2014-11-09 07:07:26 -06:00
  • b014fd1ad2 Merge pull request #2 from ErikZalm/Marlin_v1 filipmu 2014-11-09 07:01:57 -06:00
  • 443b648863 Merge pull request #1133 from monkeydave/update_delta_config galexander1 2014-11-03 08:14:54 -05:00
  • 377dfb182f Updated example configurations for Delta printers David 2014-11-02 21:04:54 +00:00
  • b81021f475 Merge https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-10-21 12:06:56 +01:00
  • 724197454c Merge pull request #1104 from ch100/Marlin_v1 Erik van der Zalm 2014-10-11 23:10:00 +02:00
  • 058e446531 Merge pull request #1037 from filipmu/Filament-Sensor Erik van der Zalm 2014-10-11 22:56:01 +02:00
  • 110c5dcf23 Fixed typo. Christian Inci 2014-10-11 00:25:36 +02:00
  • 256c25a843 Merge pull request #1101 from MattStultz/patch-1 galexander1 2014-10-07 08:20:53 -04:00
  • ca30aee903 Fix "add_homeing" to "add_homing" to match changes Matt Stultz 2014-10-07 00:16:27 -04:00
  • 0733825fb1 Merge pull request #1099 from Fourmi/Marlin_v1 Erik van der Zalm 2014-10-06 14:36:00 +02:00
  • af3e4d7510 Update line 627 ,wrong number on thermistortables Fourmi 2014-10-06 14:21:44 +02:00
  • aaaf8fe8dd Merge pull request #1068 from darkjavi/Marlin_v1 Erik van der Zalm 2014-10-06 13:41:38 +02:00
  • b360306881 Merge pull request #1073 from WingTangWong/wing-fix-float-delta Erik van der Zalm 2014-10-06 13:41:01 +02:00
  • ce85515428 Merge pull request #1082 from Fourmi/Marlin_v1 Erik van der Zalm 2014-10-06 13:39:36 +02:00
  • 764921bdbf Merge pull request #1091 from Aldert/patch-1 Erik van der Zalm 2014-10-06 13:37:19 +02:00
  • c40c7b589b Merge pull request #1095 from thinkyhead/codeclean Erik van der Zalm 2014-10-06 13:36:48 +02:00
  • 0f2e0525df Merge pull request #1096 from thinkyhead/set-home Erik van der Zalm 2014-10-06 13:36:11 +02:00
  • 5ae02a361b Merge pull request #1097 from thinkyhead/round-up-xyz Erik van der Zalm 2014-10-06 13:35:00 +02:00
  • 83037542aa Merge pull request #1098 from mattsch/optional_hotend_lcd Erik van der Zalm 2014-10-06 13:34:37 +02:00
  • fb34265d75 Make hotend optional when compiling with lcd support Matthew Schick 2014-10-06 00:16:08 -04:00
  • 6e343ef2f0 Adjust the Z display to hide float rounding errors Scott Lahteine 2014-10-05 18:34:54 -07:00
  • 2f6c57eadc Proposed feature: Set Home Offsets Scott Lahteine 2014-10-05 13:35:45 -07:00
  • f989bd5435 Simple code cleanup. Rename "homeing" to homing. Scott Lahteine 2014-10-05 13:20:53 -07:00
  • 6c5a460e65 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-10-05 12:54:54 +01:00
  • d1e4237e1d Update motion_control.cpp Aldert 2014-10-04 09:24:09 +02:00
  • a664763e6f Update thermistortables.h Fourmi 2014-09-27 09:05:10 +02:00
  • b5dc228a7a Update configuration.h Fourmi 2014-09-27 09:02:58 +02:00
  • 3cbb2f56c6 Update configuration.h Fourmi 2014-09-26 22:01:06 +02:00
  • c35736a140 Update thermistortables.h Fourmi 2014-09-26 21:49:07 +02:00
  • cb4a6dd2dc Merge pull request #1065 from oliasmage/Marlin_v1 galexander1 2014-09-19 15:12:09 -04:00
  • 5b66810580 Merge pull request #1078 from brackendawson/Marlin_v1 galexander1 2014-09-19 15:05:34 -04:00
  • 01e9b536cb Fix build for non-sled bed auto levelling Bracken Dawson 2014-09-19 19:42:32 +01:00
  • 58eabd21fb Added ifndef Wing Tang Wong 2014-09-16 14:31:58 -07:00
  • 88d12a762a Added #ifndef DELTA wrapper to float delta Wing Tang Wong 2014-09-16 14:29:44 -07:00
  • bf0ecedf60 Merge pull request #1051 from fsantini/EZ_fix935 alexborro 2014-09-14 21:49:15 -03:00
  • 9bc7aec349 Update README.md filipmu 2014-09-06 21:55:47 -05:00
  • 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 +02:00
  • 3b8216bdd1 Corrected #endif and ifdef for Z_PROBE_SLED code. Charles Bell 2014-09-04 16:40:22 -04:00
  • 37799f70ba Corrected retract() call for use of auto probe without sled enabled. Charles Bell 2014-09-04 14:36:39 -04:00
  • 1632e5e38a Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-09-04 12:21:35 +01:00
  • fe3a09bbcf Correct analog sampling time for additional A to D sample Filip Mulier 2014-09-01 06:26:19 -05:00
  • 1d62309d2a Merge pull request #1053 from foosel/fix/translated_serial_protocol Bernhard Kubicek 2014-08-30 10:38:09 +02:00
  • 1e9dc85148 Do not use translations for the serial console messages Gina Häußge 2014-08-29 18:02:59 +02:00
  • cf325ba240 Fix issue 935: error in matrix calculation fsantini 2014-08-28 21:10:50 +02:00
  • 018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi Erik van der Zalm 2014-08-28 16:32:52 +02:00
  • dde61d8886 Merge pull request #977 from OskarLinde/Marlin_v1 Erik van der Zalm 2014-08-28 16:31:53 +02:00
  • 0fbfb1bf82 Merge pull request #991 from bonm014/patch-1 Erik van der Zalm 2014-08-28 16:27:52 +02:00
  • 8340ca6e05 Merge pull request #992 from Grogyan/patch-1 Erik van der Zalm 2014-08-28 16:27:14 +02:00
  • 9887555192 Merge pull request #998 from darconeous/pull-requests/fwretract Erik van der Zalm 2014-08-28 16:24:51 +02:00
  • 105571ec68 Merge pull request #1005 from midopple/Marlin_v1 Erik van der Zalm 2014-08-28 16:24:14 +02:00
  • 68dd5e635e Merge pull request #1024 from oliasmage/Marlin_v1 Erik van der Zalm 2014-08-28 16:15:54 +02:00
  • 25069ed4e9 Merge pull request #1031 from Roxy-3DPrintBoard/Z_PROBE_REPEATABILITY-with-correct-Defaults Erik van der Zalm 2014-08-28 16:14:10 +02:00
  • 8b52eff2c1 Merge pull request #1034 from DerFlob/Marlin_v1 Erik van der Zalm 2014-08-28 16:08:51 +02:00
  • 75b3a68b65 Revert "Change pinMode to SET_INPUT or SET_OUTPUT" Filip Mulier 2014-08-16 13:26:48 -05:00
  • e3c88a5120 Filament sensor changes to config file Filip Mulier 2014-08-16 07:08:09 -05:00
  • 62db9848d3 Improvements and bug fixes in sensor delay buffer for filament sensor code Filip Mulier 2014-08-16 06:50:13 -05:00
  • 5908fd5cec Fix reseting CHDK pin to LOW Florian Baumann 2014-08-11 14:12:32 +02:00
  • 0adbc79571 Fix Default Configuration so Auto Bed Leveling is off Roxy-3DPrintBoard 2014-08-10 10:18:54 -05:00
  • 0091865583 Z_PROBE_REPEATABILITY test Roxy-3DPrintBoard 2014-08-09 15:37:23 -05:00
  • 85649a4549 Real-time filament diameter measurement and control Filip Mulier 2014-08-06 19:30:57 -05:00
  • 1d0fe035f3 Change pinMode to SET_INPUT or SET_OUTPUT Filip Mulier 2014-08-04 21:44:04 -05:00
  • e7707aedbc Commented out new #defines in Configuration.h. Charles Bell 2014-08-04 10:18:25 -04:00
  • 0a8dc0e96b Added documentation to the README.md for the sled Z probe option. CAB Charles Bell 2014-08-04 10:07:43 -04:00
  • d2fcb3ee56 CAB: Added code for Z-probe with Z endstop mounted on a sled. Charles Bell 2014-08-01 11:29:59 -04:00
  • 3cd7dbcc45 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-07-30 13:01:52 +01:00
  • c13a831ea1 Merge pull request #1017 from foosel/fix/checksum_truncation_bug daid 2014-07-24 19:41:34 +02:00
  • 2d22902d08 Fix for a wrong checksum truncation for certain commands Gina Häußge 2014-07-24 12:04:02 +02:00
  • ad3b770c1a updated examples cocktailyogi 2014-07-20 13:55:13 +02:00
  • 2f4a20257c imported last Marlin changes cocktailyogi 2014-07-20 13:49:26 +02:00
  • 1bd0dd04e3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 cocktailyogi 2014-07-20 13:23:32 +02:00
  • aacff0d361 Merge pull request #948 from Dim3nsioneer/Marlin_v1 daid 2014-07-18 16:10:15 +02:00
  • 8bf3139bc8 Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965 Pablo Clemente 2014-07-01 16:45:03 +02:00
  • 50b4e86f75 Add "Thermal Runaway Protection" feature alexborro 2014-06-30 15:22:37 -03:00
  • 2096188ac3 Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too. Pablo Clemente 2014-06-30 15:12:13 +02:00
  • f9f54019ab Inverted state logic for forced_heating_stop variable Pablo Clemente 2014-06-13 08:39:58 +02:00
  • c51a6f94e0 Fixed stop print LCD function on M104 Pablo Clemente 2014-06-12 18:43:16 +02:00
  • 89abf07faa Added gen7-dist - marlin now compiles for gen7 mattrobbo10 2014-07-18 18:04:27 +10:00
  • 17aa67e4ea If the option DISABLE_INACTIVE_EXTRUDER ist active the extruder switch to early to inactive because there are some moves in the buffer. So the planner wait 32 moves to disable the unused extruder. midopple 2014-07-13 21:52:32 +02:00
  • c7273d521f Merge pull request #2 from ErikZalm/Marlin_v1 midopple 2014-07-13 21:38:26 +02:00
  • 1fd9a7d476 Fix for FWRETRACT on DELTA printers. Robert Quattlebaum 2014-07-09 09:24:26 -07:00
  • 3f2c771d90 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-07-07 18:17:15 +01:00
  • bcd039aa81 Update pins.h Grogyan 2014-07-05 17:55:03 +12:00
  • 82606354dd Update temperature.cpp Grogyan 2014-07-05 17:17:17 +12:00