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

Merge pull request #7504 from thinkyhead/bf1_servo_delays

Browse Source 
Individual servo delays
This commit is contained in:
Scott Lahteine
2017-08-16 16:05:22 -05:00
committed by GitHub
parent 2a31c9f2ce e9c72978c7
commit 385f1bb9e5
38 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/Marlin_main.cpp
View File

@@ -2101,7 +2101,7 @@ static void clean_up_after_endstop_or_probe_move() {
#if ENABLED(BLTOUCH)
void bltouch_command(int angle) {
servo[Z_ENDSTOP_SERVO_NR].move(angle); // Give the BL-Touch the command and wait
MOVE_SERVO(Z_ENDSTOP_SERVO_NR, angle); // Give the BL-Touch the command and wait
safe_delay(BLTOUCH_DELAY);
}
@@ -2192,7 +2192,7 @@ static void clean_up_after_endstop_or_probe_move() {
#elif HAS_Z_SERVO_ENDSTOP && DISABLED(BLTOUCH)
servo[Z_ENDSTOP_SERVO_NR].move(z_servo_angle[deploy ? 0 : 1]);
MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[deploy ? 0 : 1]);
#elif ENABLED(Z_PROBE_ALLEN_KEY)
@@ -6702,7 +6702,7 @@ inline void gcode_M42() {
SERIAL_ERROR_START();
SERIAL_ERRORLNPGM("Z_ENDSTOP_SERVO_NR not setup");
#else
#else // HAS_Z_SERVO_ENDSTOP
const uint8_t probe_index = parser.byteval('P', Z_ENDSTOP_SERVO_NR);
@@ -6750,10 +6750,10 @@ inline void gcode_M42() {
SET_INPUT_PULLUP(PROBE_TEST_PIN);
bool deploy_state, stow_state;
for (uint8_t i = 0; i < 4; i++) {
servo[probe_index].move(z_servo_angle[0]); //deploy
MOVE_SERVO(probe_index, z_servo_angle[0]); //deploy
safe_delay(500);
deploy_state = READ(PROBE_TEST_PIN);
servo[probe_index].move(z_servo_angle[1]); //stow
MOVE_SERVO(probe_index, z_servo_angle[1]); //stow
safe_delay(500);
stow_state = READ(PROBE_TEST_PIN);
}
@@ -6777,7 +6777,7 @@ inline void gcode_M42() {
}
else { // measure active signal length
servo[probe_index].move(z_servo_angle[0]); // deploy
MOVE_SERVO(probe_index, z_servo_angle[0]); // deploy
safe_delay(500);
SERIAL_PROTOCOLLNPGM("please trigger probe");
uint16_t probe_counter = 0;
@@ -6802,7 +6802,7 @@ inline void gcode_M42() {
else
SERIAL_PROTOCOLLNPGM("noise detected - please re-run test"); // less than 2mS pulse
servo[probe_index].move(z_servo_angle[1]); //stow
MOVE_SERVO(probe_index, z_servo_angle[1]); //stow
} // pulse detected