Small bug in relative extrude feeds fixed.

This commit is contained in:
Adrian Bowyer 2013-05-23 12:27:05 +01:00
parent 549d56c08d
commit b0ae371ec8
4 changed files with 4 additions and 7 deletions

View file

@ -58,8 +58,5 @@ Licence: GPL
#define START_FEED_RATE 200
#define GCODE_LENGTH 100 // Maximum lenght of internally-generated G Code string
// The axes etc in a GCode
#define GCODE_LETTERS { 'X', 'Y', 'Z', 'E', 'F' }
#endif

View file

@ -43,7 +43,7 @@ void GCodes::Init()
active = true;
moveAvailable = false;
heatAvailable = false;
drivesRelative = false;
drivesRelative = true;
axesRelative = false;
gCodeLetters = GCODE_LETTERS;
distanceScale = 1.0;

View file

@ -107,7 +107,7 @@ void Move::Qmove()
boolean work = dda->Init(currentPosition, nextMove, u, v);
for(char i = 0; i <= AXES; i++)
for(char i = 0; i < AXES; i++)
currentPosition[i] = nextMove[i];
if(work)
@ -241,7 +241,7 @@ boolean DDA::Init(float currentPosition[], float targetPosition[], float& u, flo
distance = sqrt(distance);
if(axesMoving&4) // Z involved?
if(axesMoving & (1<<Z_AXIS)) // Z involved?
{
acceleration = platform->Acceleration(Z_AXIS);
jerk = platform->Jerk(Z_AXIS);

View file

@ -72,7 +72,7 @@ Licence: GPL
#define ACCELERATIONS {800, 800, 30, 250} // mm/sec^2??
#define DRIVE_STEPS_PER_UNIT {91.4286, 91.4286, 4000, 929}
#define JERKS {15.0, 15.0, 0.4, 15.0} // (mm/sec)
#define GCODE_LETTERS { 'X', 'Y', 'Z', 'E', 'F' } // The drives and feedrate in a GCode
// AXES