Rename limits.h to avoid conflict
This commit is contained in:
@@ -248,8 +248,8 @@ void ecmcGrbl::doMainWorker() {
|
||||
serial_reset_read_buffer(); // Clear serial read buffer
|
||||
gc_init(); // Set g-code parser to default state
|
||||
spindle_init();
|
||||
coolant_init();
|
||||
//limits_init();
|
||||
coolant_init();
|
||||
limits_init(); //Why is this function not working...
|
||||
probe_init();
|
||||
plan_reset(); // Clear block buffer and planner variables
|
||||
st_reset(); // Clear stepper subsystem variables.
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
#include "coolant_control.h"
|
||||
#include "eeprom.h"
|
||||
#include "gcode.h"
|
||||
#include "limits.h"
|
||||
#include "grbl_limits.h"
|
||||
#include "motion_control.h"
|
||||
#include "planner.h"
|
||||
#include "print.h"
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
//#include "ecmcMotion.h"
|
||||
|
||||
// Homing axis search distance multiplier. Computed by this value times the cycle travel.
|
||||
#ifndef HOMING_AXIS_SEARCH_SCALAR
|
||||
@@ -38,6 +37,8 @@
|
||||
#define DUAL_AXIS_CHECK_TRIGGER_2 bit(2)
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
void limits_init()
|
||||
{
|
||||
printf("%s:%s:%d Not supported yet..\n",__FILE__,__FUNCTION__,__LINE__);
|
||||
@@ -19,9 +19,8 @@
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef limits_h
|
||||
#define limits_h
|
||||
|
||||
#ifndef grbl_limits_h
|
||||
#define grbl_limits_h
|
||||
|
||||
// Initialize the limits module
|
||||
void limits_init();
|
||||
27108
iocsh/log.log
27108
iocsh/log.log
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user