grbl-LPC-CoreXY/grbl/spindle_control.c

238 lines
8.0 KiB
C
Raw Normal View History

2009-01-25 00:48:56 +01:00
/*
spindle_control.c - spindle control methods
Part of Grbl
2009-01-25 00:48:56 +01: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
Copyright (c) 2012-2016 Sungeun K. Jeon for Gnea Research LLC
Copyright (c) 2009-2011 Simen Svale Skogsrud
2009-01-25 00:48:56 +01: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/>.
*/
#include "grbl.h"
2017-01-13 01:28:38 +01:00
#include "pwm_driver.h"
2009-01-25 00:48:56 +01: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
#ifdef VARIABLE_SPINDLE
static float pwm_gradient; // Precalulated value to speed up rpm to PWM conversions.
2017-05-18 12:47:37 +02:00
float spindle_pwm_period;
float spindle_pwm_off_value;
float spindle_pwm_min_value;
float spindle_pwm_max_value;
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
#endif
2009-01-25 00:48:56 +01:00
void spindle_init()
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 VARIABLE_SPINDLE
spindle_pwm_period = (SystemCoreClock / settings.spindle_pwm_freq);
2017-05-18 12:47:37 +02:00
spindle_pwm_off_value = (spindle_pwm_period * settings.spindle_pwm_off_value / 100);
spindle_pwm_min_value = (spindle_pwm_period * settings.spindle_pwm_min_value / 100);
spindle_pwm_max_value = (spindle_pwm_period * settings.spindle_pwm_max_value / 100);
pwm_init(&SPINDLE_PWM_CHANNEL, SPINDLE_PWM_USE_PRIMARY_PIN, SPINDLE_PWM_USE_SECONDARY_PIN, spindle_pwm_period, 0);
2017-01-13 01:28:38 +01:00
pwm_enable(&SPINDLE_PWM_CHANNEL);
v1.0 Beta Release. - Tons of new stuff in this release, which is fairly stable and well tested. However, much more is coming soon! - Real-time parking motion with safety door. When this compile option is enabled, an opened safety door will cause Grbl to automatically feed hold, retract, de-energize the spindle/coolant, and parks near Z max. After the door is closed and resume is commanded, this reverses and the program continues as if nothing happened. This is also highly configurable. See config.h for details. - New spindle max and min rpm ‘$’ settings! This has been requested often. Grbl will output 5V when commanded to turn on the spindle at its max rpm, and 0.02V with min rpm. The voltage and the rpm range are linear to each other. This should help users tweak their settings to get close to true rpm’s. - If the new max rpm ‘$’ setting is set = 0 or less than min rpm, the spindle speed PWM pin will act like a regular on/off spindle enable pin. On pin D11. - BEWARE: Your old EEPROM settings will be wiped! The new spindle rpm settings require a new settings version, so Grbl will automatically wipe and restore the EEPROM with the new defaults. - Control pin can now be inverted individually with a CONTROL_INVERT_MASK in the cpu_map header file. Not typical for users to need this, but handy to have. - Fixed bug when Grbl receive too many characters in a line and overflows. Previously it would respond with an error per overflow character and another acknowledge upon an EOL character. This broke the streaming protocol. Now fixed to only respond with an error after an EOL character. - Fixed a bug with the safety door during an ALARM mode. You now can’t home or unlock the axes until the safety door has been closed. This is for safety reasons (obviously.) - Tweaked some the Mega2560 cpu_map settings . Increased segment buffer size and fixed the spindle PWM settings to output at a higher PWM frequency. - Generalized the delay function used by G4 delay for use by parking motion. Allows non-blocking status reports and real-time control during re-energizing of the spindle and coolant. - Added spindle rpm max and min defaults to default.h files. - Added a new print float for rpm values.
2015-08-28 05:37:19 +02:00
2017-01-13 01:28:38 +01:00
/* not ported
v1.0 Beta Release. - Tons of new stuff in this release, which is fairly stable and well tested. However, much more is coming soon! - Real-time parking motion with safety door. When this compile option is enabled, an opened safety door will cause Grbl to automatically feed hold, retract, de-energize the spindle/coolant, and parks near Z max. After the door is closed and resume is commanded, this reverses and the program continues as if nothing happened. This is also highly configurable. See config.h for details. - New spindle max and min rpm ‘$’ settings! This has been requested often. Grbl will output 5V when commanded to turn on the spindle at its max rpm, and 0.02V with min rpm. The voltage and the rpm range are linear to each other. This should help users tweak their settings to get close to true rpm’s. - If the new max rpm ‘$’ setting is set = 0 or less than min rpm, the spindle speed PWM pin will act like a regular on/off spindle enable pin. On pin D11. - BEWARE: Your old EEPROM settings will be wiped! The new spindle rpm settings require a new settings version, so Grbl will automatically wipe and restore the EEPROM with the new defaults. - Control pin can now be inverted individually with a CONTROL_INVERT_MASK in the cpu_map header file. Not typical for users to need this, but handy to have. - Fixed bug when Grbl receive too many characters in a line and overflows. Previously it would respond with an error per overflow character and another acknowledge upon an EOL character. This broke the streaming protocol. Now fixed to only respond with an error after an EOL character. - Fixed a bug with the safety door during an ALARM mode. You now can’t home or unlock the axes until the safety door has been closed. This is for safety reasons (obviously.) - Tweaked some the Mega2560 cpu_map settings . Increased segment buffer size and fixed the spindle PWM settings to output at a higher PWM frequency. - Generalized the delay function used by G4 delay for use by parking motion. Allows non-blocking status reports and real-time control during re-energizing of the spindle and coolant. - Added spindle rpm max and min defaults to default.h files. - Added a new print float for rpm values.
2015-08-28 05:37:19 +02:00
// Configure variable spindle PWM and enable pin, if requried. On the Uno, PWM and enable are
// combined unless configured otherwise.
#ifdef USE_SPINDLE_DIR_AS_ENABLE_PIN
SPINDLE_ENABLE_DDR |= (1<<SPINDLE_ENABLE_BIT); // Configure as output pin.
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
v1.0 Beta Release. - Tons of new stuff in this release, which is fairly stable and well tested. However, much more is coming soon! - Real-time parking motion with safety door. When this compile option is enabled, an opened safety door will cause Grbl to automatically feed hold, retract, de-energize the spindle/coolant, and parks near Z max. After the door is closed and resume is commanded, this reverses and the program continues as if nothing happened. This is also highly configurable. See config.h for details. - New spindle max and min rpm ‘$’ settings! This has been requested often. Grbl will output 5V when commanded to turn on the spindle at its max rpm, and 0.02V with min rpm. The voltage and the rpm range are linear to each other. This should help users tweak their settings to get close to true rpm’s. - If the new max rpm ‘$’ setting is set = 0 or less than min rpm, the spindle speed PWM pin will act like a regular on/off spindle enable pin. On pin D11. - BEWARE: Your old EEPROM settings will be wiped! The new spindle rpm settings require a new settings version, so Grbl will automatically wipe and restore the EEPROM with the new defaults. - Control pin can now be inverted individually with a CONTROL_INVERT_MASK in the cpu_map header file. Not typical for users to need this, but handy to have. - Fixed bug when Grbl receive too many characters in a line and overflows. Previously it would respond with an error per overflow character and another acknowledge upon an EOL character. This broke the streaming protocol. Now fixed to only respond with an error after an EOL character. - Fixed a bug with the safety door during an ALARM mode. You now can’t home or unlock the axes until the safety door has been closed. This is for safety reasons (obviously.) - Tweaked some the Mega2560 cpu_map settings . Increased segment buffer size and fixed the spindle PWM settings to output at a higher PWM frequency. - Generalized the delay function used by G4 delay for use by parking motion. Allows non-blocking status reports and real-time control during re-energizing of the spindle and coolant. - Added spindle rpm max and min defaults to default.h files. - Added a new print float for rpm values.
2015-08-28 05:37:19 +02:00
SPINDLE_DIRECTION_DDR |= (1<<SPINDLE_DIRECTION_BIT); // Configure as output pin.
#endif
2017-01-13 01:28:38 +01: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
pwm_gradient = (spindle_pwm_max_value-spindle_pwm_min_value)/(settings.rpm_max-settings.rpm_min);
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
2017-01-13 01:28:38 +01:00
/* not ported
v1.0 Beta Release. - Tons of new stuff in this release, which is fairly stable and well tested. However, much more is coming soon! - Real-time parking motion with safety door. When this compile option is enabled, an opened safety door will cause Grbl to automatically feed hold, retract, de-energize the spindle/coolant, and parks near Z max. After the door is closed and resume is commanded, this reverses and the program continues as if nothing happened. This is also highly configurable. See config.h for details. - New spindle max and min rpm ‘$’ settings! This has been requested often. Grbl will output 5V when commanded to turn on the spindle at its max rpm, and 0.02V with min rpm. The voltage and the rpm range are linear to each other. This should help users tweak their settings to get close to true rpm’s. - If the new max rpm ‘$’ setting is set = 0 or less than min rpm, the spindle speed PWM pin will act like a regular on/off spindle enable pin. On pin D11. - BEWARE: Your old EEPROM settings will be wiped! The new spindle rpm settings require a new settings version, so Grbl will automatically wipe and restore the EEPROM with the new defaults. - Control pin can now be inverted individually with a CONTROL_INVERT_MASK in the cpu_map header file. Not typical for users to need this, but handy to have. - Fixed bug when Grbl receive too many characters in a line and overflows. Previously it would respond with an error per overflow character and another acknowledge upon an EOL character. This broke the streaming protocol. Now fixed to only respond with an error after an EOL character. - Fixed a bug with the safety door during an ALARM mode. You now can’t home or unlock the axes until the safety door has been closed. This is for safety reasons (obviously.) - Tweaked some the Mega2560 cpu_map settings . Increased segment buffer size and fixed the spindle PWM settings to output at a higher PWM frequency. - Generalized the delay function used by G4 delay for use by parking motion. Allows non-blocking status reports and real-time control during re-energizing of the spindle and coolant. - Added spindle rpm max and min defaults to default.h files. - Added a new print float for rpm values.
2015-08-28 05:37:19 +02:00
// Configure no variable spindle and only enable pin.
SPINDLE_ENABLE_DDR |= (1<<SPINDLE_ENABLE_BIT); // Configure as output pin.
SPINDLE_DIRECTION_DDR |= (1<<SPINDLE_DIRECTION_BIT); // Configure as output pin.
2017-01-13 01:28:38 +01:00
*/
#endif
v1.0 Beta Release. - Tons of new stuff in this release, which is fairly stable and well tested. However, much more is coming soon! - Real-time parking motion with safety door. When this compile option is enabled, an opened safety door will cause Grbl to automatically feed hold, retract, de-energize the spindle/coolant, and parks near Z max. After the door is closed and resume is commanded, this reverses and the program continues as if nothing happened. This is also highly configurable. See config.h for details. - New spindle max and min rpm ‘$’ settings! This has been requested often. Grbl will output 5V when commanded to turn on the spindle at its max rpm, and 0.02V with min rpm. The voltage and the rpm range are linear to each other. This should help users tweak their settings to get close to true rpm’s. - If the new max rpm ‘$’ setting is set = 0 or less than min rpm, the spindle speed PWM pin will act like a regular on/off spindle enable pin. On pin D11. - BEWARE: Your old EEPROM settings will be wiped! The new spindle rpm settings require a new settings version, so Grbl will automatically wipe and restore the EEPROM with the new defaults. - Control pin can now be inverted individually with a CONTROL_INVERT_MASK in the cpu_map header file. Not typical for users to need this, but handy to have. - Fixed bug when Grbl receive too many characters in a line and overflows. Previously it would respond with an error per overflow character and another acknowledge upon an EOL character. This broke the streaming protocol. Now fixed to only respond with an error after an EOL character. - Fixed a bug with the safety door during an ALARM mode. You now can’t home or unlock the axes until the safety door has been closed. This is for safety reasons (obviously.) - Tweaked some the Mega2560 cpu_map settings . Increased segment buffer size and fixed the spindle PWM settings to output at a higher PWM frequency. - Generalized the delay function used by G4 delay for use by parking motion. Allows non-blocking status reports and real-time control during re-energizing of the spindle and coolant. - Added spindle rpm max and min defaults to default.h files. - Added a new print float for rpm values.
2015-08-28 05:37:19 +02:00
spindle_stop();
}
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
uint8_t spindle_get_state()
{
2017-01-13 01:28:38 +01:00
/* not ported
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
#ifdef VARIABLE_SPINDLE
#ifdef USE_SPINDLE_DIR_AS_ENABLE_PIN
// No spindle direction output pin.
#ifdef INVERT_SPINDLE_ENABLE_PIN
if (bit_isfalse(SPINDLE_ENABLE_PORT,(1<<SPINDLE_ENABLE_BIT))) { return(SPINDLE_STATE_CW); }
#else
if (bit_istrue(SPINDLE_ENABLE_PORT,(1<<SPINDLE_ENABLE_BIT))) { return(SPINDLE_STATE_CW); }
#endif
#else
if (SPINDLE_TCCRA_REGISTER & (1<<SPINDLE_COMB_BIT)) { // Check if PWM is enabled.
if (SPINDLE_DIRECTION_PORT & (1<<SPINDLE_DIRECTION_BIT)) { return(SPINDLE_STATE_CCW); }
else { return(SPINDLE_STATE_CW); }
}
#endif
#else
#ifdef INVERT_SPINDLE_ENABLE_PIN
if (bit_isfalse(SPINDLE_ENABLE_PORT,(1<<SPINDLE_ENABLE_BIT))) {
#else
if (bit_istrue(SPINDLE_ENABLE_PORT,(1<<SPINDLE_ENABLE_BIT))) {
#endif
if (SPINDLE_DIRECTION_PORT & (1<<SPINDLE_DIRECTION_BIT)) { return(SPINDLE_STATE_CCW); }
else { return(SPINDLE_STATE_CW); }
}
#endif
2017-01-13 01:28:38 +01:00
*/
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
return(SPINDLE_STATE_DISABLE);
}
// Disables the spindle and sets PWM output to zero when PWM variable spindle speed is enabled.
// Called by various main program and ISR routines. Keep routine small, fast, and efficient.
// Called by spindle_init(), spindle_set_speed(), spindle_set_state(), and mc_reset().
void spindle_stop()
{
#ifdef VARIABLE_SPINDLE
2017-01-13 01:28:38 +01:00
pwm_set_width(&SPINDLE_PWM_CHANNEL, 0);
/* not ported
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 USE_SPINDLE_DIR_AS_ENABLE_PIN
#ifdef INVERT_SPINDLE_ENABLE_PIN
v1.0 Beta Release. - Tons of new stuff in this release, which is fairly stable and well tested. However, much more is coming soon! - Real-time parking motion with safety door. When this compile option is enabled, an opened safety door will cause Grbl to automatically feed hold, retract, de-energize the spindle/coolant, and parks near Z max. After the door is closed and resume is commanded, this reverses and the program continues as if nothing happened. This is also highly configurable. See config.h for details. - New spindle max and min rpm ‘$’ settings! This has been requested often. Grbl will output 5V when commanded to turn on the spindle at its max rpm, and 0.02V with min rpm. The voltage and the rpm range are linear to each other. This should help users tweak their settings to get close to true rpm’s. - If the new max rpm ‘$’ setting is set = 0 or less than min rpm, the spindle speed PWM pin will act like a regular on/off spindle enable pin. On pin D11. - BEWARE: Your old EEPROM settings will be wiped! The new spindle rpm settings require a new settings version, so Grbl will automatically wipe and restore the EEPROM with the new defaults. - Control pin can now be inverted individually with a CONTROL_INVERT_MASK in the cpu_map header file. Not typical for users to need this, but handy to have. - Fixed bug when Grbl receive too many characters in a line and overflows. Previously it would respond with an error per overflow character and another acknowledge upon an EOL character. This broke the streaming protocol. Now fixed to only respond with an error after an EOL character. - Fixed a bug with the safety door during an ALARM mode. You now can’t home or unlock the axes until the safety door has been closed. This is for safety reasons (obviously.) - Tweaked some the Mega2560 cpu_map settings . Increased segment buffer size and fixed the spindle PWM settings to output at a higher PWM frequency. - Generalized the delay function used by G4 delay for use by parking motion. Allows non-blocking status reports and real-time control during re-energizing of the spindle and coolant. - Added spindle rpm max and min defaults to default.h files. - Added a new print float for rpm values.
2015-08-28 05:37:19 +02:00
SPINDLE_ENABLE_PORT |= (1<<SPINDLE_ENABLE_BIT); // Set pin to high
#else
SPINDLE_ENABLE_PORT &= ~(1<<SPINDLE_ENABLE_BIT); // Set pin to low
#endif
#endif
2017-01-13 01:28:38 +01:00
*/
#else
2017-01-13 01:28:38 +01:00
/* not ported
#ifdef INVERT_SPINDLE_ENABLE_PIN
v1.0 Beta Release. - Tons of new stuff in this release, which is fairly stable and well tested. However, much more is coming soon! - Real-time parking motion with safety door. When this compile option is enabled, an opened safety door will cause Grbl to automatically feed hold, retract, de-energize the spindle/coolant, and parks near Z max. After the door is closed and resume is commanded, this reverses and the program continues as if nothing happened. This is also highly configurable. See config.h for details. - New spindle max and min rpm ‘$’ settings! This has been requested often. Grbl will output 5V when commanded to turn on the spindle at its max rpm, and 0.02V with min rpm. The voltage and the rpm range are linear to each other. This should help users tweak their settings to get close to true rpm’s. - If the new max rpm ‘$’ setting is set = 0 or less than min rpm, the spindle speed PWM pin will act like a regular on/off spindle enable pin. On pin D11. - BEWARE: Your old EEPROM settings will be wiped! The new spindle rpm settings require a new settings version, so Grbl will automatically wipe and restore the EEPROM with the new defaults. - Control pin can now be inverted individually with a CONTROL_INVERT_MASK in the cpu_map header file. Not typical for users to need this, but handy to have. - Fixed bug when Grbl receive too many characters in a line and overflows. Previously it would respond with an error per overflow character and another acknowledge upon an EOL character. This broke the streaming protocol. Now fixed to only respond with an error after an EOL character. - Fixed a bug with the safety door during an ALARM mode. You now can’t home or unlock the axes until the safety door has been closed. This is for safety reasons (obviously.) - Tweaked some the Mega2560 cpu_map settings . Increased segment buffer size and fixed the spindle PWM settings to output at a higher PWM frequency. - Generalized the delay function used by G4 delay for use by parking motion. Allows non-blocking status reports and real-time control during re-energizing of the spindle and coolant. - Added spindle rpm max and min defaults to default.h files. - Added a new print float for rpm values.
2015-08-28 05:37:19 +02:00
SPINDLE_ENABLE_PORT |= (1<<SPINDLE_ENABLE_BIT); // Set pin to high
#else
SPINDLE_ENABLE_PORT &= ~(1<<SPINDLE_ENABLE_BIT); // Set pin to low
#endif
2017-01-13 01:28:38 +01: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
#endif
2009-01-25 00:48:56 +01: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
#ifdef VARIABLE_SPINDLE
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
// Sets spindle speed PWM output and enable pin, if configured. Called by spindle_set_state()
// and stepper ISR. Keep routine small and efficient.
2017-01-13 01:28:38 +01:00
void spindle_set_speed(uint32_t pwm_value)
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
{
2017-01-13 01:28:38 +01:00
pwm_set_width(&SPINDLE_PWM_CHANNEL, pwm_value);
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
}
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
// Called by spindle_set_state() and step segment generator. Keep routine small and efficient.
2017-01-13 01:28:38 +01:00
uint32_t spindle_compute_pwm_value(float rpm)
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
{
2017-01-13 01:28:38 +01:00
uint32_t pwm_value;
rpm *= (0.010*sys.spindle_speed_ovr); // Scale by spindle speed override value.
2017-01-13 01:28:38 +01:00
if (rpm <= 0) {
sys.spindle_speed = 0;
pwm_value = spindle_pwm_off_value; //SPINDLE_PWM_OFF_VALUE
2017-01-13 01:28:38 +01:00
}
else if (rpm <= settings.rpm_min) {
sys.spindle_speed = settings.rpm_min;
pwm_value = spindle_pwm_min_value; //SPINDLE_PWM_MIN_VALUE
2017-01-13 01:28:38 +01:00
}
else if (rpm >= settings.rpm_max) {
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
sys.spindle_speed = settings.rpm_max;
pwm_value = spindle_pwm_max_value - 1; //SPINDLE_PWM_MAX_VALUE
2017-01-13 01:28:38 +01:00
}
else {
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
sys.spindle_speed = rpm;
pwm_value = floor((rpm - settings.rpm_min) * pwm_gradient) + spindle_pwm_min_value; //SPINDLE_PWM_MIN_VALUE
if(pwm_value >= spindle_pwm_max_value) //SPINDLE_PWM_MAX_VALUE
pwm_value = spindle_pwm_max_value - 1; //SPINDLE_PWM_MAX_VALUE
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
}
return(pwm_value);
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
}
#endif
// Immediately sets spindle running state with direction and spindle rpm via PWM, if enabled.
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
// Called by g-code parser spindle_sync(), parking retract and restore, g-code program end,
// sleep, and spindle stop override.
#ifdef VARIABLE_SPINDLE
void spindle_set_state(uint8_t state, float rpm)
#else
void _spindle_set_state(uint8_t state)
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
#endif
{
v1.0 Beta Release. - Tons of new stuff in this release, which is fairly stable and well tested. However, much more is coming soon! - Real-time parking motion with safety door. When this compile option is enabled, an opened safety door will cause Grbl to automatically feed hold, retract, de-energize the spindle/coolant, and parks near Z max. After the door is closed and resume is commanded, this reverses and the program continues as if nothing happened. This is also highly configurable. See config.h for details. - New spindle max and min rpm ‘$’ settings! This has been requested often. Grbl will output 5V when commanded to turn on the spindle at its max rpm, and 0.02V with min rpm. The voltage and the rpm range are linear to each other. This should help users tweak their settings to get close to true rpm’s. - If the new max rpm ‘$’ setting is set = 0 or less than min rpm, the spindle speed PWM pin will act like a regular on/off spindle enable pin. On pin D11. - BEWARE: Your old EEPROM settings will be wiped! The new spindle rpm settings require a new settings version, so Grbl will automatically wipe and restore the EEPROM with the new defaults. - Control pin can now be inverted individually with a CONTROL_INVERT_MASK in the cpu_map header file. Not typical for users to need this, but handy to have. - Fixed bug when Grbl receive too many characters in a line and overflows. Previously it would respond with an error per overflow character and another acknowledge upon an EOL character. This broke the streaming protocol. Now fixed to only respond with an error after an EOL character. - Fixed a bug with the safety door during an ALARM mode. You now can’t home or unlock the axes until the safety door has been closed. This is for safety reasons (obviously.) - Tweaked some the Mega2560 cpu_map settings . Increased segment buffer size and fixed the spindle PWM settings to output at a higher PWM frequency. - Generalized the delay function used by G4 delay for use by parking motion. Allows non-blocking status reports and real-time control during re-energizing of the spindle and coolant. - Added spindle rpm max and min defaults to default.h files. - Added a new print float for rpm values.
2015-08-28 05:37:19 +02:00
if (sys.abort) { return; } // Block during abort.
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
if (state == SPINDLE_DISABLE) { // Halt or set spindle direction and rpm.
#ifdef VARIABLE_SPINDLE
sys.spindle_speed = 0.0;
#endif
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
spindle_stop();
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
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
} else {
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
#ifndef USE_SPINDLE_DIR_AS_ENABLE_PIN
2017-01-13 01:28:38 +01:00
/* not ported
if (state == SPINDLE_ENABLE_CW) {
SPINDLE_DIRECTION_PORT &= ~(1<<SPINDLE_DIRECTION_BIT);
} else {
SPINDLE_DIRECTION_PORT |= (1<<SPINDLE_DIRECTION_BIT);
}
2017-01-13 01:28:38 +01:00
*/
#endif
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
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
#ifdef VARIABLE_SPINDLE
v1.1e: New laser features. G-code parser refactoring. CoreXY homing fix. - Increment to v1.1e due to new laser features. - After several discussions with some prominent laser people, a few tweaks to the new laser mode has been installed. - LASER: M3 behaves in a constant power mode. - LASER: M4 behaves in a dynamic power mode, where the laser power is automatically adjusted based on how fast Grbl is moving relative to the programmed feed rate. This is the same as the CONSTANT_POWER_PER_RATE config.h option in the last version. NOTE: When not in motion in M4, Grbl automatically turns off the laser. Again, it only operates while moving! - LASER: Only G1, G2, and G3 motion modes will turn on the laser. So, this means that G0, G80 motion modes will always keep the laser disabled. No matter if M3/M4 are active! - LASER: A spindle stop override is automatically invoked when a laser is put in a feed hold. This behavior may be disabled by a config.h option. - Lots of little tweaks to the g-code parser to help streamline it a bit. It should no effect how it operates. Generally just added a parser flag to track and execute certain scenarios a little more clearly. - Jog motions now allow line numbers to be passed to it and will be displayed in the status reports. - Fixed a CoreXY homing bug. - Fixed an issue when $13 is changed, WCO isn’t sent immediately. - Altered how spindle PWM is set in the stepper ISR. Updated on a step segment basis now. May need to change this back if there are any oddities from doing this. - Updated some documentation. Clarified why M0 no longer showing up in $G and why a `1.` floating point values are shown with no decimals, like so `1`.
2016-12-04 02:02:45 +01:00
// NOTE: Assumes all calls to this function is when Grbl is not moving or must remain off.
if (settings.flags & BITFLAG_LASER_MODE) {
if (state == SPINDLE_ENABLE_CCW) { rpm = 0.0; } // TODO: May need to be rpm_min*(100/MAX_SPINDLE_SPEED_OVERRIDE);
}
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
spindle_set_speed(spindle_compute_pwm_value(rpm));
#endif
v1.1f. Parking override control. Spindle enable pin option. [ver] v1.1f update due to tweaks to interface from new parking override control. [new] Parking motion override control via new `M56 P0` and `M56 P1` command, which disables and enables the parking motion, respectively. Requires ENABLE_PARKING_OVERRIDE_CONTROL and PARKING_ENABLE enabled in config.h. Primarily for OEMs. [new] `M56` appears in the $G report when enabled. [new] Five new build info identification letters. Some were missing and a couple are new. Updated the CSV and documentation to reflect these new items. [new] Spindle enable pin configuration option to alter its behavior based on how certain lasers work. By default, Grbl treats the enable pin separately and leaves it on when S is 0. The new option turns the enable pin on and off with S>0 and S=0. This only is in effect when a user enables the USE_SPINDLE_DIR_AS_ENABLE_PIN option. [fix] M4 is now allowed to work when USE_SPINDLE_DIR_AS_ENABLE_PIN is enabled. Previously this was blocked and was problematic for laser folks using M4. [fix] Properly declared system variables as extern. Not sure how that went unnoticed or why it worked up until now but it has. [fix] EXTREMELY RARE. When AMASS is intentionally disabled and sent a motion command that is _one step_ in length, Grbl would not actuate the step due to numerical round-off. Applied a fix to prevent the round-off issue. [fix] Added a compile-time check for AMASS settings to make sure that the numerical round-off issue doesn’t effect it. This would only happen if someone set AMASS max levels to zero. It does not effect AMASS with its current defaults. [fix] Wrapped the mc_parking_motion() function in an ifdef for porting purposes. [fix] Fixed an issue when in inverse time mode and G0’s would require a F word. This was not correct. [fix] Added a note in the defaults.h file that MAX_TRAVEL values must be positive. Some users were setting this negative and it was causing issues.
2017-01-29 01:13:06 +01:00
#if (defined(USE_SPINDLE_DIR_AS_ENABLE_PIN) && \
!defined(SPINDLE_ENABLE_OFF_WITH_ZERO_SPEED)) || !defined(VARIABLE_SPINDLE)
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: Without variable spindle, the enable bit should just turn on or off, regardless
// if the spindle speed value is zero, as its ignored anyhow.
2017-01-13 01:28:38 +01:00
/* not ported
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 INVERT_SPINDLE_ENABLE_PIN
SPINDLE_ENABLE_PORT &= ~(1<<SPINDLE_ENABLE_BIT);
#else
SPINDLE_ENABLE_PORT |= (1<<SPINDLE_ENABLE_BIT);
2017-01-13 01:28:38 +01:00
#endif
*/
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
#endif
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
}
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
sys.report_ovr_counter = 0; // Set to report change immediately
}
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
// G-code parser entry-point for setting spindle state. Forces a planner buffer sync and bails
// if an abort or check-mode is active.
#ifdef VARIABLE_SPINDLE
void spindle_sync(uint8_t state, float rpm)
{
if (sys.state == STATE_CHECK_MODE) { return; }
protocol_buffer_synchronize(); // Empty planner buffer to ensure spindle is set when programmed.
spindle_set_state(state,rpm);
}
#else
void _spindle_sync(uint8_t state)
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
{
if (sys.state == STATE_CHECK_MODE) { return; }
protocol_buffer_synchronize(); // Empty planner buffer to ensure spindle is set when programmed.
_spindle_set_state(state);
v1.1d: Tweaked interface a bit. Added realtime spindle speed and build option data. Minor bug fixes. - Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
2016-10-18 07:48:25 +02:00
}
#endif