b753c542c7
- Increment to v1.1e due to new laser features. - After several discussions with some prominent laser people, a few tweaks to the new laser mode has been installed. - LASER: M3 behaves in a constant power mode. - LASER: M4 behaves in a dynamic power mode, where the laser power is automatically adjusted based on how fast Grbl is moving relative to the programmed feed rate. This is the same as the CONSTANT_POWER_PER_RATE config.h option in the last version. NOTE: When not in motion in M4, Grbl automatically turns off the laser. Again, it only operates while moving! - LASER: Only G1, G2, and G3 motion modes will turn on the laser. So, this means that G0, G80 motion modes will always keep the laser disabled. No matter if M3/M4 are active! - LASER: A spindle stop override is automatically invoked when a laser is put in a feed hold. This behavior may be disabled by a config.h option. - Lots of little tweaks to the g-code parser to help streamline it a bit. It should no effect how it operates. Generally just added a parser flag to track and execute certain scenarios a little more clearly. - Jog motions now allow line numbers to be passed to it and will be displayed in the status reports. - Fixed a CoreXY homing bug. - Fixed an issue when $13 is changed, WCO isn’t sent immediately. - Altered how spindle PWM is set in the stepper ISR. Updated on a step segment basis now. May need to change this back if there are any oddities from doing this. - Updated some documentation. Clarified why M0 no longer showing up in $G and why a `1.` floating point values are shown with no decimals, like so `1`.
51 lines
1.7 KiB
C
51 lines
1.7 KiB
C
/*
|
|
jog.h - Jogging methods
|
|
Part of Grbl
|
|
|
|
Copyright (c) 2016 Sungeun K. Jeon for Gnea Research LLC
|
|
|
|
Grbl is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Grbl is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "grbl.h"
|
|
|
|
|
|
// Sets up valid jog motion received from g-code parser, checks for soft-limits, and executes the jog.
|
|
uint8_t jog_execute(plan_line_data_t *pl_data, parser_block_t *gc_block)
|
|
{
|
|
// Initialize planner data struct for jogging motions.
|
|
// NOTE: Spindle and coolant are allowed to fully function with overrides during a jog.
|
|
pl_data->feed_rate = gc_block->values.f;
|
|
pl_data->condition |= PL_COND_FLAG_NO_FEED_OVERRIDE;
|
|
#ifdef USE_LINE_NUMBERS
|
|
pl_data->line_number = gc_block.values.n;
|
|
#endif
|
|
|
|
if (bit_istrue(settings.flags,BITFLAG_SOFT_LIMIT_ENABLE)) {
|
|
if (system_check_travel_limits(gc_block->values.xyz)) { return(STATUS_TRAVEL_EXCEEDED); }
|
|
}
|
|
|
|
// Valid jog command. Plan, set state, and execute.
|
|
mc_line(gc_block->values.xyz,pl_data);
|
|
if (sys.state == STATE_IDLE) {
|
|
if (plan_get_current_block() != NULL) { // Check if there is a block to execute.
|
|
sys.state = STATE_JOG;
|
|
st_prep_buffer();
|
|
st_wake_up(); // NOTE: Manual start. No state machine required.
|
|
}
|
|
}
|
|
|
|
return(STATUS_OK);
|
|
}
|