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

Commit Graph

  • 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
  • 253cf0f427 Add Arduino additions for Arduino 1.5.x. Courtney Bane 2014-07-03 18:51:52 -05:00
  • 32a6451ad8 Add leapfrog and dual Y/Z bonm014 2014-07-03 21:15:03 +02:00
  • b5417be109 Update Configuration.h bonm014 2014-07-03 21:03:22 +02:00
  • f244045245 Update pins.h bonm014 2014-07-03 21:01:41 +02:00
  • ce517df702 Merge pull request #989 from bq/cancel_heatup alexborro 2014-07-01 13:21:53 -03:00
  • 2242a84218 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
  • 6e3406d228 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-07-01 10:27:39 +01:00
  • 43c298a7a9 Add "Thermal Runaway Protection" feature alexborro 2014-06-30 15:22:37 -03:00
  • 4c823224b0 Merge pull request #965 from bq/forced_heating_stop daid 2014-06-30 18:50:26 +02:00
  • d86c3cf43c 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
  • f0cab611db optimised some math-code cocktailyogi 2014-06-24 18:43:36 +02:00
  • 269a068032 Fix lcd itostr3() to handle negative numbers Oskar Linde 2014-06-24 14:31:15 +02:00
  • fae7d08698 fixed wrong compiler-option cocktailyogi 2014-06-23 18:16:42 +02:00
  • 512f2a3136 restore Branch from Backup cocktailyogi 2014-06-23 17:09:57 +02:00
  • cd3220d055 Inverted state logic for forced_heating_stop variable Pablo Clemente 2014-06-13 08:39:58 +02:00
  • 86b4b805d2 Fixed stop print LCD function on M104 Pablo Clemente 2014-06-12 18:43:16 +02:00
  • 1875ab3bd7 Merge pull request #955 from gregington/pico-thermistor nothinman 2014-06-08 17:27:21 +01:00
  • 6e6e4e2143 Added thermistor table for the 500C thermistor shipped with the Pico hot end. Greg Tan 2014-06-08 09:35:04 +08:00
  • 9d11b70436 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-06-07 20:48:25 +01:00
  • ea9bffdc48 Merge pull request #949 from foosel/fix/M30_clearToSend_bug nothinman 2014-06-02 18:02:36 +01:00
  • 0de826160e M30 response is missing linefeed, "ok" therefore not on own line Gina Häußge 2014-06-02 17:11:32 +02:00
  • 3c927901a4 Implementation of FW extruder change retract Dim3nsioneer 2014-06-02 17:02:10 +02:00
  • c8d0ca9337 Merge pull request #947 from Dim3nsioneer/Marlin_v1 nothinman 2014-06-02 14:10:25 +01:00
  • 8a32c5395b renaming the disable inactive extruder feature Dim3nsioneer 2014-06-02 14:07:02 +02:00
  • 29e7639933 Add switch unused feeder(s) off Dim3nsioneer 2014-06-02 08:13:09 +02:00
  • 5a18324030 Merge pull request #946 from Jnesselr/jnesselr/plannerdoc nothinman 2014-06-02 01:33:23 +01:00
  • 07c0eeee99 Fixed a comment in the planner Justin Nesselrotte 2014-06-01 19:04:41 -05:00
  • b7aac49995 Merge pull request #941 from drf5n/teensypp2 nothinman 2014-05-30 12:29:25 +01:00
  • 09b84faa00 Configuration.h, pins.h: Add MOTHERBOARD 84 for Teensy++2.0 David Forrest 2014-01-10 15:23:30 -05:00
  • efb6d61413 Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 neildarlow 2014-05-24 13:08:58 +01:00
  • 38192cb5f3 Add M112 description to Marlin_main nothinman 2014-05-20 15:20:19 +01:00
  • aed5ec008a Merge pull request #851 from DanNixon/estop nothinman 2014-05-19 17:55:34 +01:00
  • cfb98ef682 More coverity fixes Erik van der Zalm 2014-05-15 22:09:50 +02:00
  • 88b494678f Merge pull request #919 from zaubara/Marlin_v1 nothinman 2014-05-15 15:51:14 +01:00