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

Z Endstop Servo => Z Probe Servo

Browse Source
This commit is contained in:
Scott Lahteine
2018-04-01 23:54:12 -05:00
parent e3bbd70664
commit adcb87f0db
73 changed files with 103 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/module/probe.cpp
View File

@ -52,7 +52,7 @@
float zprobe_zoffset; // Initialized by settings.load()
#if HAS_Z_SERVO_ENDSTOP
#if HAS_Z_SERVO_PROBE
#include "../module/servo.h"
const int z_servo_angle[2] = Z_SERVO_ANGLES;
#endif
@ -299,7 +299,7 @@ float zprobe_zoffset; // Initialized by settings.load()
#if ENABLED(BLTOUCH)
void bltouch_command(const int angle) {
MOVE_SERVO(Z_ENDSTOP_SERVO_NR, angle); // Give the BL-Touch the command and wait
MOVE_SERVO(Z_PROBE_SERVO_NR, angle); // Give the BL-Touch the command and wait
safe_delay(BLTOUCH_DELAY);
}
@ -433,9 +433,9 @@ bool set_probe_deployed(const bool deploy) {
dock_sled(!deploy);
#elif HAS_Z_SERVO_ENDSTOP && DISABLED(BLTOUCH)
#elif HAS_Z_SERVO_PROBE && DISABLED(BLTOUCH)
MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[deploy ? 0 : 1]);
MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[deploy ? 0 : 1]);
#elif ENABLED(Z_PROBE_ALLEN_KEY)
@ -700,7 +700,7 @@ float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after/
return measured_z;
}
#if HAS_Z_SERVO_ENDSTOP
#if HAS_Z_SERVO_PROBE
void servo_probe_init() {
/**
@ -715,6 +715,6 @@ float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after/
STOW_Z_SERVO();
}
#endif // HAS_Z_SERVO_ENDSTOP
#endif // HAS_Z_SERVO_PROBE
#endif // HAS_BED_PROBE

2
Marlin/src/module/probe.h
View File

@ -48,7 +48,7 @@
#define STOW_PROBE()
#endif
#if HAS_Z_SERVO_ENDSTOP
#if HAS_Z_SERVO_PROBE
extern const int z_servo_angle[2];
void servo_probe_init();
#endif

6
Marlin/src/module/servo.h
View File

@ -36,9 +36,9 @@ extern void servo_init();
#include "../inc/MarlinConfig.h"
#if HAS_Z_SERVO_ENDSTOP
#define DEPLOY_Z_SERVO() MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[0])
#define STOW_Z_SERVO() MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[1])
#if HAS_Z_SERVO_PROBE
#define DEPLOY_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[0])
#define STOW_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[1])
#endif
#endif // _SERVO_H_