This website requires JavaScript.
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
92e14298b0
Fixes typo for lcd backlighting on I2C PCF8575
zaubara
2014-05-15 01:37:23 +02:00
9db9842aea
Fixed error found by the free coverity tool (https://scan.coverity.com/ )
Erik van der Zalm
2014-05-14 21:59:48 +02:00
e541323741
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
Neil Darlow
2014-05-09 15:02:50 +01:00
1c9a70cee9
Support for Gen3 Monolithic electronics
Alejandro Romero
2014-05-06 19:24:20 -05:00
2acd3792fc
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
daid
2014-05-01 12:03:47 +02:00
8b4c4aa5c3
Add feature to check&retry CRC read errors on SD.
daid
2014-05-01 12:03:41 +02:00
ce76843dc3
Merge pull request #897 from Makible/5DPrint_D8_Board_Support
nothinman
2014-04-28 22:11:28 +01:00
ad5c8cbba9
Add safety limit for hot bed power in example configuration
Cameron Lai
2014-04-25 17:04:24 +08:00
6460709d92
Fix bug in PID Autotune report
Cameron Lai
2014-04-25 16:05:05 +08:00
105bebb466
Fix for pin mapping for SDSS pin and Fan pin, so Arduino library can be used
Cameron Lai
2014-04-25 12:57:47 +08:00
97ead2eccb
Fix for microstepping pin mapping, not using Teensy pin mapping, but Arduino's default pin mapping so Arduino library can be used
Cameron Lai
2014-04-25 12:57:11 +08:00
d85411f13a
Revert "Fix for stepper microstepping"
Cameron Lai
2014-04-25 12:41:56 +08:00
7c7f2d094e
Revert "Fix for reading microstepping resolution"
Cameron Lai
2014-04-25 12:41:48 +08:00
e2d703377a
Enable EEPROM by default for 5DPrint D8 Controller Board in example configuration
Cameron Lai
2014-04-24 19:15:35 +08:00
2715f6ddbf
Fix for reading microstepping resolution
Cameron Lai
2014-04-24 17:48:33 +08:00
39e9b133f3
Add example configuration for Makibox printer, which uses the 5DPrint D8 Driver Board
Cameron Lai
2014-04-24 17:06:07 +08:00
da6b536182
Add 5DPrint D8 Driver Board info and temperature table for Makibox hot bed
Cameron Lai
2014-04-24 16:49:42 +08:00
3a8e36f19e
Add Digipot config for 5DPrint D8 Driver Board
Cameron Lai
2014-04-24 12:56:46 +08:00
eea3ba5588
Fix for stepper microstepping
Cameron Lai
2014-04-24 12:56:06 +08:00
1cbcbb0971
Add makibox machine information
Cameron Lai
2014-04-24 12:55:21 +08:00
2fa514e88a
Add port for 5DPrint D8 Driver board
Cameron Lai
2014-04-24 12:55:00 +08:00
b9126ab497
Merge pull request #894 from MyMakibox/Marlin_v1
nothinman
2014-04-23 16:23:56 +01:00
a33f099547
Merge pull request #893 from MyMakibox/patch-1
nothinman
2014-04-23 16:23:40 +01:00
21ec6b88c3
Update Marlin_main.cpp
MyMakibox
2014-04-23 17:33:26 +08:00
e4dc80d3d3
Update Configuration_adv.h
MyMakibox
2014-04-23 17:30:07 +08:00
6adbdf42e0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Neil Darlow
2014-04-21 15:10:57 +01:00
5107018414
Merge pull request #888 from whosawhatsis/quick_home
nothinman
2014-04-20 03:13:36 +01:00
27d544ac25
Speed up QUICK_HOME feedrate for diagonal move
whosawhatsis
2014-04-19 17:26:43 -07:00