Commit Graph

1470 Commits

Author SHA1 Message Date
Bernhard Kubicek
1d62309d2a Merge pull request #1053 from foosel/fix/translated_serial_protocol
thanks...
2014-08-30 10:38:09 +02:00
Gina Häußge
1e9dc85148 Do not use translations for the serial console messages
The serial protocol has to stay machine readable, without having
to cope with a ton of different human language variants. So
just leave it at the original english version.

Should fix ErikZalm/Marlin#1052
2014-08-29 18:02:59 +02:00
Erik van der Zalm
018b68a5c4 Merge pull request #976 from cocktailyogi/SCARA_by_Yogi
Implemented SCARA-Maths
2014-08-28 16:32:52 +02:00
Erik van der Zalm
dde61d8886 Merge pull request #977 from OskarLinde/Marlin_v1
Fix lcd itostr3() to handle negative numbers
2014-08-28 16:31:53 +02:00
Erik van der Zalm
0fbfb1bf82 Merge pull request #991 from bonm014/patch-1
Leapfrog controller board support
2014-08-28 16:27:52 +02:00
Erik van der Zalm
8340ca6e05 Merge pull request #992 from Grogyan/patch-1
temperature.cpp fixes for SD card and MAX6675
2014-08-28 16:27:14 +02:00
Erik van der Zalm
9887555192 Merge pull request #998 from darconeous/pull-requests/fwretract
FWRETRACT fixes
2014-08-28 16:24:51 +02:00
Erik van der Zalm
105571ec68 Merge pull request #1005 from midopple/Marlin_v1
With option DISABLE_INACTIVE_EXTRUDER the extruder is disable to early
2014-08-28 16:24:14 +02:00
Erik van der Zalm
68dd5e635e Merge pull request #1024 from oliasmage/Marlin_v1
Adding Z Probe via sled mounted endstop
2014-08-28 16:15:54 +02:00
Erik van der Zalm
25069ed4e9 Merge pull request #1031 from Roxy-3DPrintBoard/Z_PROBE_REPEATABILITY-with-correct-Defaults
Z probe repeatability with correct defaults
2014-08-28 16:14:10 +02:00
Erik van der Zalm
8b52eff2c1 Merge pull request #1034 from DerFlob/Marlin_v1
Fix reseting CHDK pin to LOW
2014-08-28 16:08:51 +02:00
Florian Baumann
5908fd5cec Fix reseting CHDK pin to LOW
chdkActive was set to false regardless of (millis() - chdkHigh) being bigger than the CHDK_DELAY or not. So if (millis() - chdkHigh) wasn't bigger than the delay the first time, the CHDK would never be set back to LOW.

Also, don't return from the function, as there might be other stuff to do, after the CHDK check.
2014-08-11 14:12:32 +02:00
Roxy-3DPrintBoard
0adbc79571 Fix Default Configuration so Auto Bed Leveling is off
This snapshot has the Auto Bed Leveling turned off because most Marlin
users do not have that feature.
2014-08-10 10:18:54 -05:00
Roxy-3DPrintBoard
0091865583 Z_PROBE_REPEATABILITY test
Z_PROBE_REPEATABILITY test for Auto Bed Leveling.
Implemented as M48 with extra user specified options.
Full support at
http://3dprintboard.com/showthread.php?2802-Auto_Bed_Leveling-Z-Probe-Repeatability-code
2014-08-09 15:37:23 -05:00
Charles Bell
e7707aedbc Commented out new #defines in Configuration.h. 2014-08-04 10:18:25 -04:00
Charles Bell
0a8dc0e96b Added documentation to the README.md for the sled Z probe option. CAB 2014-08-04 10:07:43 -04:00
Charles Bell
d2fcb3ee56 CAB: Added code for Z-probe with Z endstop mounted on a sled. 2014-08-01 11:29:59 -04:00
daid
c13a831ea1 Merge pull request #1017 from foosel/fix/checksum_truncation_bug
Fix for a wrong checksum truncation for certain commands
2014-07-24 19:41:34 +02:00
Gina Häußge
2d22902d08 Fix for a wrong checksum truncation for certain commands
Positioning of string terminator to truncate checksum from the commands
M23, M28, M30, M32, M928 and M117 was off by one, causing the last
letter of the actual command to be truncated instead of just the
checksum.

In case of the SD commands this caused checksummed commands targeting
existing files to fail since the last letter of the filename was
truncated.

In case of M117 this caused the last given letter not to be displayed.

This patch fixes the off-by-one error and sets the null terminator
on the exact position of the * starting the checksum instead of the
character before that.
2014-07-24 12:04:02 +02:00
cocktailyogi
ad3b770c1a updated examples 2014-07-20 13:55:13 +02:00
cocktailyogi
2f4a20257c imported last Marlin changes 2014-07-20 13:49:26 +02:00
cocktailyogi
1bd0dd04e3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2014-07-20 13:23:32 +02:00
daid
aacff0d361 Merge pull request #948 from Dim3nsioneer/Marlin_v1
Implementation of FW extruder change retract
2014-07-18 16:10:15 +02:00
Pablo Clemente
8bf3139bc8 Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965 2014-07-18 15:28:02 +02:00
alexborro
50b4e86f75 Add "Thermal Runaway Protection" feature
This is a feature to protect your printer from burn up in flames if it
has a thermistor coming off place (this happened to a friend of mine
recently and motivated me writing this feature).

The issue: If a thermistor come off, it will read a lower temperature
than actual. The system will turn the heater on forever, burning up the
filament and anything
else around.

After the temperature reaches the target for the first time, this
feature will start measuring for how long the current temperature stays
below the target minus _HYSTERESIS (set_temperature -
THERMAL_RUNAWAY_PROTECTION_HYSTERESIS).

If it stays longer than _PERIOD, it means the thermistor temperature
cannot catch up with the target, so something *may be* wrong. Then, to
be on the safe side, the system will he halt.

Bear in mind the count down will just start AFTER the first time the
thermistor temperature is over the target, so you will have no problem
if your extruder heater takes 2 minutes to hit the target on heating.
2014-07-18 15:28:01 +02:00
Pablo Clemente
2096188ac3 Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too. 2014-07-18 15:27:59 +02:00
Pablo Clemente
f9f54019ab Inverted state logic for forced_heating_stop variable 2014-07-18 15:27:58 +02:00
Pablo Clemente
c51a6f94e0 Fixed stop print LCD function on M104 2014-07-18 15:27:57 +02:00
midopple
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. 2014-07-13 21:52:32 +02:00
midopple
c7273d521f Merge pull request #2 from ErikZalm/Marlin_v1
Update my github
2014-07-13 21:38:26 +02:00
Robert Quattlebaum
1fd9a7d476 Fix for FWRETRACT on DELTA printers.
Fixes #817
2014-07-09 09:24:26 -07:00
Grogyan
bcd039aa81 Update pins.h 2014-07-05 17:55:03 +12:00
Grogyan
82606354dd Update temperature.cpp
Enables both SD card and MAX6675 to talk with each other
Fixes also issue #750
2014-07-05 17:17:17 +12:00
bonm014
32a6451ad8 Add leapfrog and dual Y/Z
I have added the pin set for the leapfrog and the support of dual Y and Z
2014-07-03 21:15:03 +02:00
bonm014
b5417be109 Update Configuration.h
Leapfrog added to the board list
2014-07-03 21:03:22 +02:00
bonm014
f244045245 Update pins.h
Leapfrog board added to the pin list
2014-07-03 21:01:41 +02:00
alexborro
ce517df702 Merge pull request #989 from bq/cancel_heatup
Changed the declaration of the variable "cancel_heatup" to Marlin_main.cpp to fix issue on commit #965
2014-07-01 13:21:53 -03:00
Pablo Clemente
2242a84218 Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965 2014-07-01 16:45:03 +02:00
alexborro
43c298a7a9 Add "Thermal Runaway Protection" feature
This is a feature to protect your printer from burn up in flames if it
has a thermistor coming off place (this happened to a friend of mine
recently and motivated me writing this feature).

The issue: If a thermistor come off, it will read a lower temperature
than actual. The system will turn the heater on forever, burning up the
filament and anything
else around.

After the temperature reaches the target for the first time, this
feature will start measuring for how long the current temperature stays
below the target minus _HYSTERESIS (set_temperature -
THERMAL_RUNAWAY_PROTECTION_HYSTERESIS).

If it stays longer than _PERIOD, it means the thermistor temperature
cannot catch up with the target, so something *may be* wrong. Then, to
be on the safe side, the system will he halt.

Bear in mind the count down will just start AFTER the first time the
thermistor temperature is over the target, so you will have no problem
if your extruder heater takes 2 minutes to hit the target on heating.
2014-06-30 15:22:49 -03:00
daid
4c823224b0 Merge pull request #965 from bq/forced_heating_stop
Fixed stop print LCD function on M104
2014-06-30 18:50:26 +02:00
Pablo Clemente
d86c3cf43c Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too. 2014-06-30 15:12:13 +02:00
cocktailyogi
f0cab611db optimised some math-code 2014-06-24 18:43:36 +02:00
Oskar Linde
269a068032 Fix lcd itostr3() to handle negative numbers 2014-06-24 14:31:15 +02:00
cocktailyogi
fae7d08698 fixed wrong compiler-option 2014-06-23 18:16:42 +02:00
cocktailyogi
512f2a3136 restore Branch from Backup
sorry for that
2014-06-23 17:09:57 +02:00
Pablo Clemente
cd3220d055 Inverted state logic for forced_heating_stop variable 2014-06-13 08:39:58 +02:00
Pablo Clemente
86b4b805d2 Fixed stop print LCD function on M104 2014-06-12 18:43:16 +02:00
nothinman
1875ab3bd7 Merge pull request #955 from gregington/pico-thermistor
Added thermistor table for the 500C thermistor shipped with the Pico hotend
2014-06-08 17:27:21 +01:00
Greg Tan
6e6e4e2143 Added thermistor table for the 500C thermistor shipped with the Pico hot end. 2014-06-08 09:35:04 +08:00
nothinman
ea9bffdc48 Merge pull request #949 from foosel/fix/M30_clearToSend_bug
M30 response is missing linefeed, "ok" therefore not on own line
2014-06-02 18:02:36 +01:00