grbl-LPC-CoreXY/grbl/limits.c

361 lines
15 KiB
C
Raw Normal View History

/*
limits.c - code pertaining to limit-switches and performing the homing cycle
Part of Grbl
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
Copyright (c) 2012-2016 Sungeun K. Jeon for Gnea Research LLC
Copyright (c) 2009-2011 Simen Svale Skogsrud
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
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/>.
*/
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
#include "grbl.h"
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
// Homing axis search distance multiplier. Computed by this value times the cycle travel.
#ifndef HOMING_AXIS_SEARCH_SCALAR
#define HOMING_AXIS_SEARCH_SCALAR 1.5 // Must be > 1 to ensure limit switch will be engaged.
#endif
#ifndef HOMING_AXIS_LOCATE_SCALAR
#define HOMING_AXIS_LOCATE_SCALAR 5.0 // Must be > 1 to ensure limit switch is cleared.
#endif
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
void limits_init()
{
LIMIT_DDR &= ~(LIMIT_MASK); // Set as input pins
#ifdef DISABLE_LIMIT_PIN_PULL_UP
LIMIT_PORT &= ~(LIMIT_MASK); // Normal low operation. Requires external pull-down.
#else
Lots of re-organization and cleaning-up. Some bug fixes. - Added a new source and header file called system. These files contain the system commands and variables, as well as all of the system headers and standard libraries Grbl uses. Centralizing some of the code. - Re-organized the include headers throughout the source code. - ENABLE_M7 define was missing from config.h. Now there. - SPINDLE_MAX_RPM and SPINDLE_MIN_RPM now defined in config.h. No uncommenting to prevent user issues. Minimum spindle RPM now provides the lower, near 0V, scale adjustment, i.e. some spindles can go really slow so why use up our 256 voltage bins for them? - Remove some persistent variables from coolant and spindle control. They were redundant. - Removed a VARIABLE_SPINDLE define in cpu_map.h that shouldn’t have been there. - Changed the DEFAULT_ARC_TOLERANCE to 0.002mm to improve arc tracing. Before we had issues with performance, no longer. - Fixed a bug with the hard limits and the software debounce feature enabled. The invert limit pin setting wasn’t honored. - Fixed a bug with the homing direction mask. Now is like it used to be. At least for now. - Re-organized main.c to serve as only as the reset/initialization routine. Makes things a little bit clearer in terms of execution procedures. - Re-organized protocol.c as the overall master control unit for execution procedures. Not quite there yet, but starting to make a little more sense in how things are run. - Removed updating of old settings records. So many new settings have been added that it’s not worth adding the code to migrate old user settings. - Tweaked spindle_control.c a bit and made it more clear and consistent with other parts of Grbl. - Tweaked the stepper disable bit code in stepper.c. Requires less flash memory.
2014-01-11 04:22:10 +01:00
LIMIT_PORT |= (LIMIT_MASK); // Enable internal pull-up resistors. Normal high operation.
#endif
if (bit_istrue(settings.flags,BITFLAG_HARD_LIMIT_ENABLE)) {
2017-01-05 02:48:59 +01:00
//LIMIT_PCMSK |= LIMIT_MASK; // Enable specific pins of the Pin Change Interrupt
//PCICR |= (1 << LIMIT_INT); // Enable Pin Change Interrupt
Re-factored system states and alarm management. Serial baud support greater than 57600. - Refactored system states to be more clear and concise. Alarm locks processes when position is unknown to indicate to user something has gone wrong. - Changed mc_alarm to mc_reset, which now manages the system reset function. Centralizes it. - Renamed '$X' kill homing lock to kill alarm lock. - Created an alarm error reporting method to clear up what is an alarm: message vs a status error: message. For GUIs mainly. Alarm codes are negative. Status codes are positive. - Serial baud support upto 115200. Previous baudrate calc was unstable for 57600 and above. - Alarm state locks out all g-code blocks, including startup scripts, but allows user to access settings and internal commands. For example, to disable hard limits, if they are problematic. - Hard limits do not respond in an alarm state. - Fixed a problem with the hard limit interrupt during the homing cycle. The interrupt register is still active during the homing cycle and still signal the interrupt to trigger when re-enabled. Instead, just disabled the register. - Homing rate adjusted. All axes move at homing seek rate, regardless of how many axes move at the same time. This is unlike how the stepper module does it as a point to point rate. - New config.h settings to disable the homing rate adjustment and the force homing upon powerup. - Reduced the number of startup lines back down to 2 from 3. This discourages users from placing motion block in there, which can be very dangerous. - Startup blocks now run only after an alarm-free reset or after a homing cycle. Does not run when $X kill is called. For satefy reasons
2012-11-15 01:36:29 +01:00
} else {
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
limits_disable();
}
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
#ifdef ENABLE_SOFTWARE_DEBOUNCE
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
MCUSR &= ~(1<<WDRF);
WDTCSR |= (1<<WDCE) | (1<<WDE);
WDTCSR = (1<<WDP0); // Set time-out at ~32msec.
#endif
}
// Disables hard limits.
void limits_disable()
{
2017-01-05 02:48:59 +01:00
//LIMIT_PCMSK &= ~LIMIT_MASK; // Disable specific pins of the Pin Change Interrupt
//PCICR &= ~(1 << LIMIT_INT); // Disable Pin Change Interrupt
}
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
// Returns limit state as a bit-wise uint8 variable. Each bit indicates an axis limit, where
// triggered is 1 and not triggered is 0. Invert mask is applied. Axes are defined by their
// number in bit position, i.e. Z_AXIS is (1<<2) or bit 2, and Y_AXIS is (1<<1) or bit 1.
uint8_t limits_get_state()
{
uint8_t limit_state = 0;
2017-01-05 02:48:59 +01:00
uint32_t pin = (LIMIT_PIN & LIMIT_MASK);
#ifdef INVERT_LIMIT_PIN_MASK
pin ^= INVERT_LIMIT_PIN_MASK;
#endif
if (bit_isfalse(settings.flags,BITFLAG_INVERT_LIMIT_PINS)) { pin ^= LIMIT_MASK; }
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
if (pin) {
uint8_t idx;
for (idx=0; idx<N_AXIS; idx++) {
if (pin & get_limit_pin_mask(idx)) { limit_state |= (1 << idx); }
}
}
return(limit_state);
}
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
// This is the Limit Pin Change Interrupt, which handles the hard limit feature. A bouncing
Re-factored system states and alarm management. Serial baud support greater than 57600. - Refactored system states to be more clear and concise. Alarm locks processes when position is unknown to indicate to user something has gone wrong. - Changed mc_alarm to mc_reset, which now manages the system reset function. Centralizes it. - Renamed '$X' kill homing lock to kill alarm lock. - Created an alarm error reporting method to clear up what is an alarm: message vs a status error: message. For GUIs mainly. Alarm codes are negative. Status codes are positive. - Serial baud support upto 115200. Previous baudrate calc was unstable for 57600 and above. - Alarm state locks out all g-code blocks, including startup scripts, but allows user to access settings and internal commands. For example, to disable hard limits, if they are problematic. - Hard limits do not respond in an alarm state. - Fixed a problem with the hard limit interrupt during the homing cycle. The interrupt register is still active during the homing cycle and still signal the interrupt to trigger when re-enabled. Instead, just disabled the register. - Homing rate adjusted. All axes move at homing seek rate, regardless of how many axes move at the same time. This is unlike how the stepper module does it as a point to point rate. - New config.h settings to disable the homing rate adjustment and the force homing upon powerup. - Reduced the number of startup lines back down to 2 from 3. This discourages users from placing motion block in there, which can be very dangerous. - Startup blocks now run only after an alarm-free reset or after a homing cycle. Does not run when $X kill is called. For satefy reasons
2012-11-15 01:36:29 +01:00
// limit switch can cause a lot of problems, like false readings and multiple interrupt calls.
// If a switch is triggered at all, something bad has happened and treat it as such, regardless
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
// if a limit switch is being disengaged. It's impossible to reliably tell the state of a
// bouncing pin because the Arduino microcontroller does not retain any state information when
// detecting a pin change. If we poll the pins in the ISR, you can miss the correct reading if the
// switch is bouncing.
// NOTE: Do not attach an e-stop to the limit pins, because this interrupt is disabled during
// homing cycles and will not respond correctly. Upon user request or need, there may be a
// special pinout for an e-stop, but it is generally recommended to just directly connect
// your e-stop switch to the Arduino reset pin, since it is the most correct way to do this.
#ifndef ENABLE_SOFTWARE_DEBOUNCE
ISR(LIMIT_INT_vect) // DEFAULT: Limit pin change interrupt process.
{
// Ignore limit switches if already in an alarm state or in-process of executing an alarm.
// When in the alarm state, Grbl should have been reset or will force a reset, so any pending
// moves in the planner and serial buffers are all cleared and newly sent blocks will be
// locked out until a homing cycle or a kill lock command. Allows the user to disable the hard
// limit setting if their limits are constantly triggering after a reset and move their axes.
if (sys.state != STATE_ALARM) {
if (!(sys_rt_exec_alarm)) {
#ifdef HARD_LIMIT_FORCE_STATE_CHECK
// Check limit pin state.
if (limits_get_state()) {
mc_reset(); // Initiate system kill.
system_set_exec_alarm(EXEC_ALARM_HARD_LIMIT); // Indicate hard limit critical event
}
#else
mc_reset(); // Initiate system kill.
system_set_exec_alarm(EXEC_ALARM_HARD_LIMIT); // Indicate hard limit critical event
#endif
}
}
}
#else // OPTIONAL: Software debounce limit pin routine.
// Upon limit pin change, enable watchdog timer to create a short delay.
ISR(LIMIT_INT_vect) { if (!(WDTCSR & (1<<WDIE))) { WDTCSR |= (1<<WDIE); } }
ISR(WDT_vect) // Watchdog timer ISR
{
WDTCSR &= ~(1<<WDIE); // Disable watchdog timer.
if (sys.state != STATE_ALARM) { // Ignore if already in alarm state.
if (!(sys_rt_exec_alarm)) {
// Check limit pin state.
if (limits_get_state()) {
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
mc_reset(); // Initiate system kill.
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
system_set_exec_alarm(EXEC_ALARM_HARD_LIMIT); // Indicate hard limit critical event
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
}
}
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
}
}
#endif
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
// Homes the specified cycle axes, sets the machine position, and performs a pull-off motion after
// completing. Homing is a special motion case, which involves rapid uncontrolled stops to locate
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
// the trigger point of the limit switches. The rapid stops are handled by a system level axis lock
// mask, which prevents the stepper algorithm from executing step pulses. Homing motions typically
// circumvent the processes for executing motions in normal operation.
// NOTE: Only the abort realtime command can interrupt this process.
// TODO: Move limit pin-specific calls to a general function for portability.
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
void limits_go_home(uint8_t cycle_mask)
{
if (sys.abort) { return; } // Block if system reset has been issued.
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
// Initialize plan data struct for homing motion. Spindle and coolant are disabled.
plan_line_data_t plan_data;
plan_line_data_t *pl_data = &plan_data;
memset(pl_data,0,sizeof(plan_line_data_t));
pl_data->condition = (PL_COND_FLAG_SYSTEM_MOTION|PL_COND_FLAG_NO_FEED_OVERRIDE);
#ifdef USE_LINE_NUMBERS
pl_data->line_number = HOMING_CYCLE_LINE_NUMBER;
#endif
// Initialize variables used for homing computations.
uint8_t n_cycle = (2*N_HOMING_LOCATE_CYCLE+1);
2017-01-05 01:04:38 +01:00
uint32_t step_pin[N_AXIS];
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
float target[N_AXIS];
float max_travel = 0.0;
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
uint8_t idx;
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
for (idx=0; idx<N_AXIS; idx++) {
// Initialize step pin masks
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
step_pin[idx] = get_step_pin_mask(idx);
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
#ifdef COREXY
if ((idx==A_MOTOR)||(idx==B_MOTOR)) { step_pin[idx] = (get_step_pin_mask(X_AXIS)|get_step_pin_mask(Y_AXIS)); }
#endif
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
if (bit_istrue(cycle_mask,bit(idx))) {
// Set target based on max_travel setting. Ensure homing switches engaged with search scalar.
// NOTE: settings.max_travel[] is stored as a negative value.
max_travel = max(max_travel,(-HOMING_AXIS_SEARCH_SCALAR)*settings.max_travel[idx]);
}
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
}
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
// Set search mode with approach at seek rate to quickly engage the specified cycle_mask limit switches.
bool approach = true;
float homing_rate = settings.homing_seek_rate;
2017-01-05 01:04:38 +01:00
uint32_t limit_state, axislock, n_active_axis;
do {
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
system_convert_array_steps_to_mpos(target,sys_position);
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
// Initialize and declare variables needed for homing routine.
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
axislock = 0;
n_active_axis = 0;
for (idx=0; idx<N_AXIS; idx++) {
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
// Set target location for active axes and setup computation for homing rate.
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
if (bit_istrue(cycle_mask,bit(idx))) {
n_active_axis++;
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
#ifdef COREXY
if (idx == X_AXIS) {
int32_t axis_position = system_convert_corexy_to_y_axis_steps(sys_position);
sys_position[A_MOTOR] = axis_position;
sys_position[B_MOTOR] = -axis_position;
} else if (idx == Y_AXIS) {
int32_t axis_position = system_convert_corexy_to_x_axis_steps(sys_position);
sys_position[A_MOTOR] = sys_position[B_MOTOR] = axis_position;
} else {
sys_position[Z_AXIS] = 0;
}
#else
sys_position[idx] = 0;
#endif
// Set target direction based on cycle mask and homing cycle approach state.
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
// NOTE: This happens to compile smaller than any other implementation tried.
if (bit_istrue(settings.homing_dir_mask,bit(idx))) {
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
if (approach) { target[idx] = -max_travel; }
else { target[idx] = max_travel; }
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
} else {
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
if (approach) { target[idx] = max_travel; }
else { target[idx] = -max_travel; }
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
}
// Apply axislock to the step port pins active in this cycle.
axislock |= step_pin[idx];
}
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
}
homing_rate *= sqrt(n_active_axis); // [sqrt(N_AXIS)] Adjust so individual axes all move at homing rate.
sys.homing_axis_lock = axislock;
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
// Perform homing cycle. Planner buffer should be empty, as required to initiate the homing cycle.
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
pl_data->feed_rate = homing_rate; // Set current homing rate.
plan_buffer_line(target, pl_data); // Bypass mc_line(). Directly plan homing motion.
sys.step_control = STEP_CONTROL_EXECUTE_SYS_MOTION; // Set to execute homing motion and clear existing flags.
st_prep_buffer(); // Prep and fill segment buffer from newly planned block.
st_wake_up(); // Initiate motion
do {
if (approach) {
// Check limit state. Lock out cycle axes when they change.
limit_state = limits_get_state();
for (idx=0; idx<N_AXIS; idx++) {
if (axislock & step_pin[idx]) {
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
if (limit_state & (1 << idx)) {
#ifdef COREXY
if (idx==Z_AXIS) { axislock &= ~(step_pin[Z_AXIS]); }
else { axislock &= ~(step_pin[A_MOTOR]|step_pin[B_MOTOR]); }
#else
axislock &= ~(step_pin[idx]);
#endif
}
}
}
sys.homing_axis_lock = axislock;
}
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
st_prep_buffer(); // Check and prep segment buffer. NOTE: Should take no longer than 200us.
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
// Exit routines: No time to run protocol_execute_realtime() in this loop.
if (sys_rt_exec_state & (EXEC_SAFETY_DOOR | EXEC_RESET | EXEC_CYCLE_STOP)) {
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
uint8_t rt_exec = sys_rt_exec_state;
// Homing failure condition: Reset issued during cycle.
if (rt_exec & EXEC_RESET) { system_set_exec_alarm(EXEC_ALARM_HOMING_FAIL_RESET); }
// Homing failure condition: Safety door was opened.
if (rt_exec & EXEC_SAFETY_DOOR) { system_set_exec_alarm(EXEC_ALARM_HOMING_FAIL_DOOR); }
// Homing failure condition: Limit switch still engaged after pull-off motion
if (!approach && (limits_get_state() & cycle_mask)) { system_set_exec_alarm(EXEC_ALARM_HOMING_FAIL_PULLOFF); }
// Homing failure condition: Limit switch not found during approach.
if (approach && (rt_exec & EXEC_CYCLE_STOP)) { system_set_exec_alarm(EXEC_ALARM_HOMING_FAIL_APPROACH); }
if (sys_rt_exec_alarm) {
mc_reset(); // Stop motors, if they are running.
protocol_execute_realtime();
return;
} else {
// Pull-off motion complete. Disable CYCLE_STOP from executing.
system_clear_exec_state_flag(EXEC_CYCLE_STOP);
break;
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
}
}
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
} while (STEP_MASK & axislock);
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
st_reset(); // Immediately force kill steppers and reset step segment buffer.
delay_ms(settings.homing_debounce_delay); // Delay to allow transient dynamics to dissipate.
// Reverse direction and reset homing rate for locate cycle(s).
approach = !approach;
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
// After first cycle, homing enters locating phase. Shorten search to pull-off distance.
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
if (approach) {
max_travel = settings.homing_pulloff*HOMING_AXIS_LOCATE_SCALAR;
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
homing_rate = settings.homing_feed_rate;
} else {
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
max_travel = settings.homing_pulloff;
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
homing_rate = settings.homing_seek_rate;
}
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
} while (n_cycle-- > 0);
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
// The active cycle axes should now be homed and machine limits have been located. By
// default, Grbl defines machine space as all negative, as do most CNCs. Since limit switches
// can be on either side of an axes, check and set axes machine zero appropriately. Also,
// set up pull-off maneuver from axes limit switches that have been homed. This provides
// some initial clearance off the switches and should also help prevent them from falsely
// triggering when hard limits are enabled or when more than one axes shares a limit pin.
int32_t set_axis_position;
// Set machine positions for homed limit switches. Don't update non-homed axes.
for (idx=0; idx<N_AXIS; idx++) {
// NOTE: settings.max_travel[] is stored as a negative value.
if (cycle_mask & bit(idx)) {
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
#ifdef HOMING_FORCE_SET_ORIGIN
set_axis_position = 0;
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
#else
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
if ( bit_istrue(settings.homing_dir_mask,bit(idx)) ) {
Critical M0/2/30 fix. Homing updates. - Critical fix for M0 program pause. Due to its recent change, it would cause Grbl to suspend but wouldn’t notify the user of why Grbl was not doing anything. The state would show IDLE and a cycle start would resume it. Grbl now enters a HOLD state to better indicate the state change. - Critical fix for M2 and M30 program end. As with M0, the state previously would show IDLE while suspended. Grbl now does not suspend upon program end and leaves job control to the GUI. Grbl simply reports a `[Pgm End]` as a feedback message and resets certain g-code modes. - M2/30 g-code reseting fix. Previously Grbl would soft-reset after an M2/30, but this was not complaint to the (linuxcnc) g-code standard. It simply resets [G1,G17,G90,G94,G40,G54,M5,M9,M48] and keeps all other modes the same. - M0/M2/M30 check-mode fix. It now does not suspend the machine during check-mode. - Minor bug fix related to commands similar to G90.1, but not G90.1, not reporting an unsupported command. - Homing cycle refactoring. To help reduce the chance of users misunderstanding their limit switch wiring, Grbl only moves a short distance for the locate cycles only. In addition, the homing cycle pulls-off the limit switch by the pull-off distance to re-engage and locate home. This should improve its accuracy. - HOMING_FORCE_ORIGIN now sets the origin to the pull-off location, rather than where the limit switch was triggered. - Updated default junction deviation to 0.01mm. Recent tests showed that this improves Grbl’s cornering behavior a bit. - Added the ShapeOko3 defaults. - Added new feedback message `[Pgm End]` for M2/30 notification. - Limit pin reporting is now a $10 status report option. Requested by OEMs to help simplify support troubleshooting.
2015-05-17 21:25:36 +02:00
set_axis_position = lround((settings.max_travel[idx]+settings.homing_pulloff)*settings.steps_per_mm[idx]);
} else {
set_axis_position = lround(-settings.homing_pulloff*settings.steps_per_mm[idx]);
Settings refactoring. Bug fixes. Misc new features. This is likely the last major change to the v0.9 code base before push to master. Only two minor things remain on the agenda (CoreXY support, force clear EEPROM, and an extremely low federate bug). - NEW! Grbl is now compile-able and may be flashed directly through the Arduino IDE. Only minor changes were required for this compatibility. See the Wiki to learn how to do it. - New status reporting mask to turn on and off what Grbl sends back. This includes machine coordinates, work coordinates, serial RX buffer usage, and planner buffer usage. Expandable to more information on user request, but that’s it for now. - Settings have been completely renumbered to allow for future new settings to be installed without having to constantly reshuffle and renumber all of the settings every time. - All settings masks have been standardized to mean bit 0 = X, bit 1 = Y, and bit 2 = Z, to reduce confusion on how they work. The invert masks used by the internal Grbl system were updated to accommodate this change as well. - New invert probe pin setting, which does what it sounds like. - Fixed a probing cycle bug, where it would freeze intermittently, and removed some redundant code. - Homing may now be set to the origin wherever the limit switches are. Traditionally machine coordinates should always be in negative space, but when limit switches on are on the opposite side, the machine coordinate would be set to -max_travel for the axis. Now you can always make it [0,0,0] via a compile-time option in config.h. (Soft limits routine was updated to account for this as well.) - Probe coordinate message immediately after a probing cycle may now be turned off via a compile-time option in config.h. By default the probing location is always reported. - Reduced the N_ARC_CORRECTION default value to reflect the changes in how circles are generated by an arc tolerance, rather than a fixed arc segment setting. - Increased the incoming line buffer limit from 70 to 80 characters. Had some extra memory space to invest into this. - Fixed a bug where tool number T was not being tracked and reported correctly. - Added a print free memory function for debugging purposes. Not used otherwise. - Realtime rate report should now work during feed holds, but it hasn’t been tested yet. - Updated the streaming scripts with MIT-license and added the simple streaming to the main stream.py script to allow for settings to be sent. - Some minor code refactoring to improve flash efficiency. Reduced the flash by several hundred KB, which was re-invested in some of these new features.
2014-07-26 23:01:34 +02:00
}
#endif
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
#ifdef COREXY
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
if (idx==X_AXIS) {
int32_t off_axis_position = system_convert_corexy_to_y_axis_steps(sys_position);
sys_position[A_MOTOR] = set_axis_position + off_axis_position;
sys_position[B_MOTOR] = set_axis_position - off_axis_position;
} else if (idx==Y_AXIS) {
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
int32_t off_axis_position = system_convert_corexy_to_x_axis_steps(sys_position);
sys_position[A_MOTOR] = off_axis_position + set_axis_position;
sys_position[B_MOTOR] = off_axis_position - set_axis_position;
} else {
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
sys_position[idx] = set_axis_position;
}
#else
sys_position[idx] = set_axis_position;
#endif
}
}
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
sys.step_control = STEP_CONTROL_NORMAL_OP; // Return step control to normal operation.
}
// Performs a soft limit check. Called from mc_line() only. Assumes the machine has been homed,
// the workspace volume is in all negative space, and the system is in normal operation.
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
// NOTE: Used by jogging to limit travel within soft-limit volume.
void limits_soft_check(float *target)
{
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
if (system_check_travel_limits(target)) {
sys.soft_limit = true;
// Force feed hold if cycle is active. All buffered blocks are guaranteed to be within
// workspace volume so just come to a controlled stop so position is not lost. When complete
// enter alarm mode.
if (sys.state == STATE_CYCLE) {
system_set_exec_state_flag(EXEC_FEED_HOLD);
do {
protocol_execute_realtime();
if (sys.abort) { return; }
} while ( sys.state != STATE_IDLE );
}
Grbl v1.0e huge beta release. Overrides and new reporting. - Feature: Realtime feed, rapid, and spindle speed overrides. These alter the running machine state within tens of milliseconds! - Feed override: 100%, +/-10%, +/-1% commands with values 1-200% of programmed feed - Rapid override: 100%, 50%, 25% rapid rate commands - Spindle speed override: 100%, +/-10%, +/-1% commands with values 50-200% of programmed speed - Override values have configurable limits and increments in config.h. - Feature: Realtime toggle overrides for spindle stop, flood coolant, and optionally mist coolant - Spindle stop: Enables and disables spindle during a feed hold. Automatically restores last spindles state. - Flood and mist coolant: Immediately toggles coolant state until next toggle or g-code coolant command. - Feature: Jogging mode! Incremental and absolute modes supported. - Grbl accepts jogging-specific commands like $J=X100F50. An axis word and feed rate are required. G20/21 and G90/G91 commands are accepted. - Jog motions can be canceled at any time by a feed hold `!` command. The buffer is automatically flushed. (No resetting required). - Jog motions do not alter the g-code parser state so GUIs don’t have to track what they changed and correct it. - Feature: Laser mode setting. Allows Grbl to execute continuous motions with spindle speed and state changes. - Feature: Significantly improved status reports. Overhauled to cram in more meaningful data and still make it smaller on average. - All available data is now sent by default, but does not appear if it doesn’t change or is not active. - Machine position(MPos) or work position(WPos) is reported but not both at the same time. Instead, the work coordinate offsets (WCO)are sent intermittently whenever it changes or refreshes after 10-30 status reports. Position vectors are easily computed by WPos = MPos - WCO. - All data has changed in some way. Details of changes are in the markdown documents and wiki. - Feature: 16 new realtime commands to control overrides. All in extended-ASCII character space. - While they are not easily typeable and requires a GUI, they can’t be accidentally triggered by some latent character in the g-code program and have tons of room for expansion. - Feature: New substates for HOLD and SAFETY DOOR. A `:x` is appended to the state, where `x` is an integer and indicates a substate. - For example, each integer of a door state describes in what phase the machine is in during parking. Substates are detailed in the documentation. - Feature: With the alarm codes, homing and probe alarms have been expanded with more codes to provide more exact feedback on what caused the alarm. - Feature: New hard limit check upon power-up or reset. If detected, a feedback message to check the limit switches sent immediately after the welcome message. - May be disabled in config.h. - OEM feature: Enable/disable `$RST=` individual commands based on desired behavior in config.h. - OEM feature: Configurable EEPROM wipe to prevent certain data from being deleted during firmware upgrade to a new settings version or `RST=*` command. - OEM feature: Enable/disable the `$I=` build info write string with external EEPROM write example sketch. - This prevents a user from altering the build info string in EEPROM. This requires the vendor to write the string to EEPROM via external means. An Arduino example sketch is provided to accomplish this. This would be useful for contain product data that is retrievable. - Tweak: All feedback has been drastically trimmed to free up flash space for the v1.0 release. - The `$` help message is just one string, listing available commands. - The `$$` settings printout no longer includes descriptions. Only the setting values. (Sorry it’s this or remove overrides!) - Grbl `error:` and `ALARM:` responses now only contain codes. No descriptions. All codes are explained in documentation. - Grbl’s old feedback style may be restored via a config.h, but keep in mind that it will likely not fit into the Arduino’s flash space. - Tweak: Grbl now forces a buffer sync or stop motion whenever a g-code command needs to update and write a value to EEPROM or changes the work coordinate offset. - This addresses two old issues in all prior Grbl versions. First, an EEPROM write requires interrupts to be disabled, including stepper and serial comm. Steps can be lost and data can be corrupted. Second, the work position may not be correlated to the actual machine position, since machine position is derived from the actual current execution state, while work position is based on the g-code parser offset state. They are usually not in sync and the parser state is several motions behind. This forced sync ensures work and machine positions are always correct. - This behavior can be disabled through a config.h option, but it’s not recommended to do so. - Tweak: To make status reports standardized, users can no longer change what is reported via status report mask, except for only toggling machine or work positions. - All other data fields are included in the report and can only be disabled through the config.h file. It’s not recommended to alter this, because GUIs will be expecting this data to be present and may not be compatible. - Tweak: Homing cycle and parking motion no longer report a negative line number in a status report. These will now not report a line number at all. - Tweak: New `[Restoring spindle]` message when restoring from a spindle stop override. Provides feedback what Grbl is doing while the spindle is powering up and a 4.0 second delay is enforced. - Tweak: Override values are reset to 100% upon M2/30. This behavior can be disabled in config.h - Tweak: The planner buffer size has been reduced from 18 to 16 to free up RAM for tracking and controlling overrides. - Tweak: TX buffer size has been increased from 64 to 90 bytes to improve status reporting and overall performance. - Tweak: Removed the MOTION CANCEL state. It was redundant and didn’t affect Grbl’s overall operation by doing so. - Tweak: Grbl’s serial buffer increased by +1 internally, such that 128 bytes means 128, not 127 due to the ring buffer implementation. Long overdue. - Tweak: Altered sys.alarm variable to be set by alarm codes, rather than bit flags. Simplified how it worked overall. - Tweak: Planner buffer and serial RX buffer usage has been combined in the status reports. - Tweak: Pin state reporting has been refactored to report only the pins “triggered” and nothing when not “triggered”. - Tweak: Current machine rate or speed is now included in every report. - Tweak: The work coordinate offset (WCO) and override states only need to be refreshed intermittently or reported when they change. The refresh rates may be altered for each in the config.h file with different idle and busy rates to lessen Grbl’s load during a job. - Tweak: For temporary compatibility to existing GUIs until they are updated, an option to revert back to the old style status reports is available in config.h, but not recommended for long term use. - Tweak: Removed old limit pin state reporting option from config.h in lieu of new status report that includes them. - Tweak: Updated the defaults.h file to include laser mode, altered status report mask, and fix an issue with a missing invert probe pin default. - Refactor: Changed how planner line data is generated and passed to the planner and onto the step generator. By making it a struct variable, this saved significant flash space. - Refactor: Major re-factoring of the planner to incorporate override values and allow for re-calculations fast enough to immediately take effect during operation. No small feat. - Refactor: Re-factored the step segment generator for re-computing new override states. - Refactor: Re-factored spindle_control.c to accommodate the spindle speed overrides and laser mode. - Refactor: Re-factored parts of the codebase for a new jogging mode. Still under development though and slated to be part of the official v1.0 release. Hang tight. - Refactor: Created functions for computing a unit vector and value limiting based on axis maximums to free up more flash. - Refactor: The spindle PWM is now set directly inside of the stepper ISR as it loads new step segments. - Refactor: Moved machine travel checks out of soft limits function into its own since jogging uses this too. - Refactor: Removed coolant_stop() and combined with coolant_set_state(). - Refactor: The serial RX ISR forks off extended ASCII values to quickly assess the new override realtime commands. - Refactor: Altered some names of the step control flags. - Refactor: Improved efficiency of the serial RX get buffer count function. - Refactor: Saved significant flash by removing and combining print functions. Namely the uint8 base10 and base2 functions. - Refactor: Moved the probe state check in the main stepper ISR to improve its efficiency. - Refactor: Single character printPgmStrings() went converted to direct serial_write() commands to save significant flash space. - Documentation: Detailed Markdown documents on error codes, alarm codes, messages, new real-time commands, new status reports, and how jogging works. More to come later and will be posted on the Wiki as well. - Documentation: CSV files for quick importing of Grbl error and alarm codes. - Bug Fix: Applied v0.9 master fixes to CoreXY homing. - Bug Fix: The print float function would cause Grbl to crash if a value was 1e6 or greater. Increased the buffer by 3 bytes to help prevent this in the future. - Bug Fix: Build info and startup string EEPROM restoring was not writing the checksum value. - Bug Fix: Corrected an issue with safety door restoring the proper spindle and coolant state. It worked before, but breaks with laser mode that can continually change spindle state per planner block. - Bug Fix: Move system position and probe position arrays out of the system_t struct. Ran into some compiling errors that were hard to track down as to why. Moving them out fixed it.
2016-09-22 03:08:24 +02:00
mc_reset(); // Issue system reset and ensure spindle and coolant are shutdown.
system_set_exec_alarm(EXEC_ALARM_SOFT_LIMIT); // Indicate soft limit critical event
protocol_execute_realtime(); // Execute to enter critical event loop and system abort
return;
}
}