mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-02 19:02:35 +02:00
Code Issues Releases Wiki Activity

Got rid of spindle_control.cpp and spindle_control.h

Browse Source
This commit is contained in:
bdring
2020-04-08 11:23:26 -05:00
parent ecd1401277
commit 2af0a07347
5 changed files with 9 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Grbl_Esp32/Grbl_Esp32.ino
View File

@@ -36,6 +36,7 @@ volatile uint8_t sys_rt_exec_accessory_override; // Global realtime executor bit
volatile uint8_t sys_rt_exec_debug;
#endif
NullSpindle my_spindle;
void setup() {

2
Grbl_Esp32/grbl.h
View File

@@ -51,7 +51,7 @@
#include "protocol.h"
#include "report.h"
#include "serial.h"
#include "spindle_control.h"
#include "tools/SpindleClass.h"
#include "stepper.h"
#include "jog.h"
#include "inputbuffer.h"

27
Grbl_Esp32/spindle_control.cpp
View File

@@ -1,27 +0,0 @@
/*
spindle_control.cpp - Header for system level commands and real-time processes
Part of Grbl
Copyright (c) 2014-2016 Sungeun K. Jeon for Gnea Research LLC
2018 - Bart Dring This file was modified for use on the ESP32
CPU. Do not use this with Grbl for atMega328P
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"
//#include "tools/SpindleClass.h"
// TODO Get rid of these intermediary functions and directly access object from Grbl
// This saves me from touching the grbl_esp32 code as much right now.
// define a spindle type
NullSpindle my_spindle;

29
Grbl_Esp32/spindle_control.h
View File

@@ -1,29 +0,0 @@
/*
spindle.h - Header for system level commands and real-time processes
Part of Grbl
Copyright (c) 2014-2016 Sungeun K. Jeon for Gnea Research LLC
2018 - Bart Dring This file was modified for use on the ESP32
CPU. Do not use this with Grbl for atMega328P
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/>.
*/
#ifndef spindle_control_h
#define spindle_control_h
#include "grbl.h"
#include "tools/SpindleClass.h"
extern NullSpindle my_spindle;
#endif

10
Grbl_Esp32/tools/SpindleClass.h
View File

@@ -21,9 +21,6 @@
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
*/
#include "grbl.h"
#include <driver/dac.h>
#define SPINDLE_STATE_DISABLE 0 // Must be zero.
#define SPINDLE_STATE_CW bit(0)
@@ -32,6 +29,11 @@
#ifndef SPINDLE_CLASS_H
#define SPINDLE_CLASS_H
#include "grbl.h"
#include <driver/dac.h>
// This is the base class. Do not use this as your spindle
class Spindle {
public:
@@ -118,5 +120,7 @@ class DacSpindle : public PWMSpindle {
void set_pwm(uint32_t duty); // sets DAC instead of PWM
};
extern NullSpindle my_spindle;
#endif