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

Merge remote-tracking branch 'justblair/master' into Marlin_v1

Browse Source
This commit is contained in:
Erik van der Zalm
2012-03-03 20:20:55 +01:00
parent 1d5809d458 4879de08e8
commit cb0c84e075
14 changed files with 582 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/planner.cpp
View File

@ -59,6 +59,7 @@
#include "stepper.h"
#include "temperature.h"
#include "ultralcd.h"
#include "language.h"
//===========================================================================
//=============================public variables ============================
@ -469,13 +470,13 @@ void plan_buffer_line(const float &x, const float &y, const float &z, const floa
{
position[E_AXIS]=target[E_AXIS]; //behave as if the move really took place, but ignore E part
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(" cold extrusion prevented");
SERIAL_ECHOLNPGM(MSG_ERR_COLD_EXTRUDE_STOP);
}
if(labs(target[E_AXIS]-position[E_AXIS])>axis_steps_per_unit[E_AXIS]*EXTRUDE_MAXLENGTH)
{
position[E_AXIS]=target[E_AXIS]; //behave as if the move really took place, but ignore E part
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(" too long extrusion prevented");
SERIAL_ECHOLNPGM(MSG_ERR_LONG_EXTRUDE_STOP);
}
#endif