0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

servo_endstop_angles -> servo_endstop_angle

Browse source
This commit is contained in:
Scott Lahteine 2015-07-30 20:57:27 -07:00 committed by Richard Wackerbarth
parent 9334479aeb
commit 9d151bb61b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View file

@ -316,7 +316,7 @@ bool target_direction;
#if HAS_SERVO_ENDSTOPS
const int servo_endstop_id[] = SERVO_ENDSTOP_IDS;
const int servo_endstop_angles[][2] = SERVO_ENDSTOP_ANGLES;
const int servo_endstop_angle[][2] = SERVO_ENDSTOP_ANGLES;
#endif
#ifdef BARICUDA
@ -581,7 +581,7 @@ void servo_init() {
#if HAS_SERVO_ENDSTOPS
for (int i = 0; i < 3; i++)
if (servo_endstop_id[i] >= 0)
servo[servo_endstop_id[i]].move(servo_endstop_angles[i][1]);
servo[servo_endstop_id[i]].move(servo_endstop_angle[i][1]);
#endif
}
@ -1325,7 +1325,7 @@ static void setup_for_endstop_move() {
#if HAS_SERVO_ENDSTOPS
// Engage Z Servo endstop if enabled
if (servo_endstop_id[Z_AXIS] >= 0) servo[servo_endstop_id[Z_AXIS]].move(servo_endstop_angles[Z_AXIS][0]);
if (servo_endstop_id[Z_AXIS] >= 0) servo[servo_endstop_id[Z_AXIS]].move(servo_endstop_angle[Z_AXIS][0]);
#elif defined(Z_PROBE_ALLEN_KEY)
feedrate = Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE;
@ -1425,7 +1425,7 @@ static void setup_for_endstop_move() {
#endif
// Change the Z servo angle
servo[servo_endstop_id[Z_AXIS]].move(servo_endstop_angles[Z_AXIS][1]);
servo[servo_endstop_id[Z_AXIS]].move(servo_endstop_angle[Z_AXIS][1]);
}
#elif defined(Z_PROBE_ALLEN_KEY)
@ -1679,7 +1679,7 @@ static void homeaxis(AxisEnum axis) {
#if HAS_SERVO_ENDSTOPS
// Engage Servo endstop if enabled
if (axis != Z_AXIS && servo_endstop_id[axis] >= 0)
servo[servo_endstop_id[axis]].move(servo_endstop_angles[axis][0]);
servo[servo_endstop_id[axis]].move(servo_endstop_angle[axis][0]);
#endif
// Set a flag for Z motor locking
@ -1781,7 +1781,7 @@ static void homeaxis(AxisEnum axis) {
#if HAS_SERVO_ENDSTOPS
// Retract Servo endstop if enabled
if (servo_endstop_id[axis] >= 0)
servo[servo_endstop_id[axis]].move(servo_endstop_angles[axis][1]);
servo[servo_endstop_id[axis]].move(servo_endstop_angle[axis][1]);
#endif
}