Homing alarm upon no switch. Licensing update.
- Homing cycle failure reports alarm feedback when the homing cycle is exited via a reset, interrupted by a safety door switch, or does not find the limit switch. - Homing cycle bug fix when not finding the limit switch. It would just idle before, but now will exit with an alarm. - Licensing update. Corrected licensing according to lawyer recommendations. Removed references to other Grbl versions.
This commit is contained in:
parent
d36d3519ef
commit
8c9fc7943e
45
COPYING
45
COPYING
@ -1,56 +1,31 @@
|
||||
------------------------------------------------------------------------------
|
||||
COPYRIGHT NOTICE FOR GRBL v0.9:
|
||||
COPYRIGHT NOTICE FOR GRBL:
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
GRBL v0.9 - Embedded CNC g-code interpreter and motion-controller
|
||||
Copyright (c) 2012-2014 Sungeun K. Jeon
|
||||
Grbl - Embedded CNC g-code interpreter and motion-controller
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011 Jens Geisler
|
||||
|
||||
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.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
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 this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
COPYRIGHT NOTICE(S) FOR WORK CONTAINED IN THIS SOFTWARE:
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
The MIT License (MIT)
|
||||
|
||||
GRBL(tm) v0.8 - Embedded CNC g-code interpreter and motion-controller
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2013 Sungeun K. Jeon
|
||||
Copyright (c) 2011 Jens Geisler
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
||||
-------------
|
||||
|
||||
Copyright (c) 2008, Atmel Corporation All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
@ -704,5 +679,3 @@ Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
config.h - compile time configuration
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2013-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2013 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
// This file contains compile-time configurations for Grbl's internal system. For the most part,
|
||||
// users will not need to directly modify these, but they are here for specific needs, i.e.
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
coolant_control.c - coolant control methods
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
coolant_control.h - spindle control methods
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
cpu_map.h - CPU and pin mapping configuration file
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
defaults.h - defaults settings configuration file
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
|
||||
|
@ -2,28 +2,20 @@
|
||||
eeprom.h - EEPROM methods
|
||||
Part of Grbl
|
||||
|
||||
The MIT License (MIT)
|
||||
|
||||
GRBL(tm) - Embedded CNC g-code interpreter and motion-controller
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
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.
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
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.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef eeprom_h
|
||||
|
11
grbl/gcode.c
11
grbl/gcode.c
@ -1,8 +1,9 @@
|
||||
/*
|
||||
gcode.c - rs274/ngc parser.
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
|
11
grbl/gcode.h
11
grbl/gcode.h
@ -1,8 +1,9 @@
|
||||
/*
|
||||
gcode.h - rs274/ngc parser.
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#ifndef gcode_h
|
||||
#define gcode_h
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
grbl.h - main Grbl include file
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2015 Sungeun K. Jeon
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
limits.c - code pertaining to limit-switches and performing the homing cycle
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
@ -202,8 +197,9 @@ void limits_go_home(uint8_t cycle_mask)
|
||||
st_prep_buffer(); // Check and prep segment buffer. NOTE: Should take no longer than 200us.
|
||||
// Check only for user reset. No time to run protocol_execute_realtime() in this loop.
|
||||
|
||||
if (sys.rt_exec_state & (EXEC_SAFETY_DOOR | EXEC_RESET)) { // Abort homing and alarm upon safety door.
|
||||
if (sys.rt_exec_state & EXEC_SAFETY_DOOR) { mc_reset(); }
|
||||
// Exit routines: User abort homing and alarm upon safety door or no limit switch found.
|
||||
if (sys.rt_exec_state & (EXEC_SAFETY_DOOR | EXEC_RESET | EXEC_CYCLE_STOP)) {
|
||||
if (sys.rt_exec_state & (EXEC_SAFETY_DOOR | EXEC_CYCLE_STOP)) { mc_reset(); }
|
||||
protocol_execute_realtime();
|
||||
return;
|
||||
}
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
limits.h - code pertaining to limit-switches and performing the homing cycle
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,11 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
*/
|
||||
|
||||
#ifndef limits_h
|
||||
#define limits_h
|
||||
|
11
grbl/main.c
11
grbl/main.c
@ -1,8 +1,9 @@
|
||||
/*
|
||||
main.c - An embedded CNC Controller with rs274/ngc (g-code) support
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
|
@ -1,8 +1,10 @@
|
||||
/*
|
||||
motion_control.c - high level interface for issuing motion commands
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,13 +19,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
Copyright (c) 2011 Jens Geisler
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
@ -361,7 +356,8 @@ void mc_reset()
|
||||
// the steppers enabled by avoiding the go_idle call altogether, unless the motion state is
|
||||
// violated, by which, all bets are off.
|
||||
if ((sys.state & (STATE_CYCLE | STATE_HOMING)) || (sys.suspend == SUSPEND_ENABLE_HOLD)) {
|
||||
bit_true_atomic(sys.rt_exec_alarm, EXEC_ALARM_ABORT_CYCLE);
|
||||
if (sys.state == STATE_HOMING) { bit_true_atomic(sys.rt_exec_alarm, EXEC_ALARM_HOMING_FAIL); }
|
||||
else { bit_true_atomic(sys.rt_exec_alarm, EXEC_ALARM_ABORT_CYCLE); }
|
||||
st_go_idle(); // Force kill steppers. Position has likely been lost.
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
motion_control.h - high level interface for issuing motion commands
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#ifndef motion_control_h
|
||||
#define motion_control_h
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
nuts_bolts.c - Shared functions
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
nuts_bolts.h - Header file for shared definitions, variables, and functions
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#ifndef nuts_bolts_h
|
||||
#define nuts_bolts_h
|
||||
|
@ -1,8 +1,10 @@
|
||||
/*
|
||||
planner.c - buffers movement commands and manages the acceleration profile plan
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011 Jens Geisler
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,13 +19,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
Copyright (c) 2011 Jens Geisler
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
planner.h - buffers movement commands and manages the acceleration profile plan
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#ifndef planner_h
|
||||
#define planner_h
|
||||
|
11
grbl/print.c
11
grbl/print.c
@ -1,8 +1,9 @@
|
||||
/*
|
||||
print.c - Functions for formatting output strings
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
|
11
grbl/print.h
11
grbl/print.h
@ -1,8 +1,9 @@
|
||||
/*
|
||||
print.h - Functions for formatting output strings
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#ifndef print_h
|
||||
#define print_h
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
probe.c - code pertaining to probing methods
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2014-2015 Sungeun K. Jeon
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
probe.h - code pertaining to probing methods
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2014-2015 Sungeun K. Jeon
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
protocol.c - controls Grbl execution protocol and procedures
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
@ -198,6 +193,8 @@ void protocol_execute_realtime()
|
||||
report_alarm_message(ALARM_ABORT_CYCLE);
|
||||
} else if (rt_exec & EXEC_ALARM_PROBE_FAIL) {
|
||||
report_alarm_message(ALARM_PROBE_FAIL);
|
||||
} else if (rt_exec & EXEC_ALARM_HOMING_FAIL) {
|
||||
report_alarm_message(ALARM_HOMING_FAIL);
|
||||
}
|
||||
// Halt everything upon a critical event flag. Currently hard and soft limits flag this.
|
||||
if (rt_exec & EXEC_CRITICAL_EVENT) {
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
protocol.h - controls Grbl execution protocol and procedures
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#ifndef protocol_h
|
||||
#define protocol_h
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
report.c - reporting and messaging methods
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
|
||||
@ -98,6 +98,8 @@ void report_alarm_message(int8_t alarm_code)
|
||||
printPgmString(PSTR("Abort during cycle")); break;
|
||||
case ALARM_PROBE_FAIL:
|
||||
printPgmString(PSTR("Probe fail")); break;
|
||||
case ALARM_HOMING_FAIL:
|
||||
printPgmString(PSTR("Homing fail")); break;
|
||||
}
|
||||
printPgmString(PSTR("\r\n"));
|
||||
delay_ms(500); // Force delay to ensure message clears serial write buffer.
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
report.h - reporting and messaging methods
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
|
||||
@ -59,6 +59,7 @@
|
||||
#define ALARM_SOFT_LIMIT_ERROR -2
|
||||
#define ALARM_ABORT_CYCLE -3
|
||||
#define ALARM_PROBE_FAIL -4
|
||||
#define ALARM_HOMING_FAIL -5
|
||||
|
||||
// Define Grbl feedback message codes.
|
||||
#define MESSAGE_CRITICAL_EVENT 1
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
serial.c - Low level functions for sending and recieving bytes via the serial port
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
serial.c - Low level functions for sending and recieving bytes via the serial port
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#ifndef serial_h
|
||||
#define serial_h
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
settings.c - eeprom configuration handling
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
settings.h - eeprom configuration handling
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#ifndef settings_h
|
||||
#define settings_h
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
spindle_control.c - spindle control methods
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
spindle_control.h - spindle control methods
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#ifndef spindle_control_h
|
||||
#define spindle_control_h
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
stepper.c - stepper motor driver: executes motion plans using stepper motors
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011-2012 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
/*
|
||||
stepper.h - stepper motor driver: executes motion plans of planner.c using the stepper motors
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2012-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2011-2015 Sungeun K. Jeon
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
|
||||
Grbl is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -17,12 +18,6 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
/*
|
||||
This file is based on work from Grbl v0.8, distributed under the
|
||||
terms of the MIT-license. See COPYING for more details.
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud
|
||||
Copyright (c) 2011 Sungeun K. Jeon
|
||||
*/
|
||||
|
||||
#ifndef stepper_h
|
||||
#define stepper_h
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
system.c - Handles system level commands and real-time processes
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2014-2015 Sungeun K. Jeon
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*
|
||||
system.h - Header for system level commands and real-time processes
|
||||
Part of Grbl v0.9
|
||||
Part of Grbl
|
||||
|
||||
Copyright (c) 2014-2015 Sungeun K. Jeon
|
||||
|
||||
@ -45,6 +45,7 @@
|
||||
#define EXEC_ALARM_SOFT_LIMIT bit(2) // bitmask 00000100
|
||||
#define EXEC_ALARM_ABORT_CYCLE bit(3) // bitmask 00001000
|
||||
#define EXEC_ALARM_PROBE_FAIL bit(4) // bitmask 00010000
|
||||
#define EXEC_ALARM_HOMING_FAIL bit(5) // bitmask 00100000
|
||||
|
||||
// Define system state bit map. The state variable primarily tracks the individual functions
|
||||
// of Grbl to manage each without overlapping. It is also used as a messaging flag for
|
||||
|
Loading…
Reference in New Issue
Block a user