mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-28 08:39:51 +02:00
Code Issues Releases Wiki Activity

Fixed compile error with parking enabled (#524)

Browse Source
This commit is contained in:
Mitch Bradley
2020-08-08 11:22:59 -10:00
committed by GitHub
parent 06fae66507
commit a3793de20b
1 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Grbl_Esp32/src/protocol.cpp
View File

@@ -86,6 +86,14 @@ err_t execute_line(char* line, uint8_t client, auth_t auth_level) {
return gc_execute_line(line, client); return gc_execute_line(line, client);
} }
bool can_park() {
return
#ifdef ENABLE_PARKING_OVERRIDE_CONTROL
sys.override_ctrl == OVERRIDE_PARKING_MOTION &&
#endif
homing_enable->get() && !laser_mode->get();
}
/* /*
GRBL PRIMARY LOOP: GRBL PRIMARY LOOP:
*/ */
@@ -574,12 +582,7 @@ static void protocol_exec_rt_suspend() {
// Execute slow pull-out parking retract motion. Parking requires homing enabled, the // Execute slow pull-out parking retract motion. Parking requires homing enabled, the
// current location not exceeding the parking target location, and laser mode disabled. // current location not exceeding the parking target location, and laser mode disabled.
// NOTE: State is will remain DOOR, until the de-energizing and retract is complete. // NOTE: State is will remain DOOR, until the de-energizing and retract is complete.
# ifdef ENABLE_PARKING_OVERRIDE_CONTROL if (can_park() && parking_target[PARKING_AXIS] < PARKING_TARGET) {
if (homing_enable->get() && (parking_target[PARKING_AXIS] < PARKING_TARGET) && !laser_mode->get() &&
(sys.override_ctrl == OVERRIDE_PARKING_MOTION)) {
# else
if (homing_enable->get() && (parking_target[PARKING_AXIS] < PARKING_TARGET) && !laser_mode->get()) {
# endif
// Retract spindle by pullout distance. Ensure retraction motion moves away from // Retract spindle by pullout distance. Ensure retraction motion moves away from
// the workpiece and waypoint motion doesn't exceed the parking target location. // the workpiece and waypoint motion doesn't exceed the parking target location.
if (parking_target[PARKING_AXIS] < retract_waypoint) { if (parking_target[PARKING_AXIS] < retract_waypoint) {
@@ -631,12 +634,7 @@ static void protocol_exec_rt_suspend() {
#ifdef PARKING_ENABLE #ifdef PARKING_ENABLE
// Execute fast restore motion to the pull-out position. Parking requires homing enabled. // Execute fast restore motion to the pull-out position. Parking requires homing enabled.
// NOTE: State is will remain DOOR, until the de-energizing and retract is complete. // NOTE: State is will remain DOOR, until the de-energizing and retract is complete.
# ifdef ENABLE_PARKING_OVERRIDE_CONTROL if (can_park()) {
if (homing_enable->get() && !laser_mode->get()) &&
(sys.override_ctrl == OVERRIDE_PARKING_MOTION)) {
# else
if (homing_enable->get() && !laser_mode->get()) {
# endif
// Check to ensure the motion doesn't move below pull-out position. // Check to ensure the motion doesn't move below pull-out position.
if (parking_target[PARKING_AXIS] <= PARKING_TARGET) { if (parking_target[PARKING_AXIS] <= PARKING_TARGET) {
parking_target[PARKING_AXIS] = retract_waypoint; parking_target[PARKING_AXIS] = retract_waypoint;
@@ -669,12 +667,7 @@ static void protocol_exec_rt_suspend() {
} }
#ifdef PARKING_ENABLE #ifdef PARKING_ENABLE
// Execute slow plunge motion from pull-out position to resume position. // Execute slow plunge motion from pull-out position to resume position.
# ifdef ENABLE_PARKING_OVERRIDE_CONTROL if (can_park()) {
if (homing_enable->get() && !laser_mode->get()) &&
(sys.override_ctrl == OVERRIDE_PARKING_MOTION)) {
# else
if (homing_enable->get() && !laser_mode->get()) {
# endif
// Block if safety door re-opened during prior restore actions. // Block if safety door re-opened during prior restore actions.
if (bit_isfalse(sys.suspend, SUSPEND_RESTART_RETRACT)) { if (bit_isfalse(sys.suspend, SUSPEND_RESTART_RETRACT)) {
// Regardless if the retract parking motion was a valid/safe motion or not, the // Regardless if the retract parking motion was a valid/safe motion or not, the