mirror of
https://github.com/bdring/Grbl_Esp32.git
synced 2025-08-13 10:04:28 +02:00
Fixed C++ includes (#518)
* Moved all files to the src folder * Removed all cpp includes; fixed by including the header file where needed * Fixed build scripts and machine.h * Removed temp file. sigh. Co-authored-by: Stefan de Bruijn <stefan@nubilosoft.com>
This commit is contained in:
@@ -18,12 +18,9 @@
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "grbl.h"
|
||||
#include "src/grbl.h"
|
||||
#include "WiFi.h"
|
||||
|
||||
#include "Spindles/SpindleClass.cpp"
|
||||
#include "Motors/MotorClass.cpp"
|
||||
|
||||
// Declare system global variable structure
|
||||
system_t sys;
|
||||
int32_t sys_position[N_AXIS]; // Real-time machine (aka home) position vector in steps.
|
||||
|
@@ -32,11 +32,7 @@
|
||||
*/
|
||||
|
||||
#include "../grbl.h"
|
||||
#include "TrinamicDriverClass.cpp"
|
||||
#include "StandardStepperClass.cpp"
|
||||
#include "UnipolarMotorClass.cpp"
|
||||
#include "RcServoClass.cpp"
|
||||
//#include "SolenoidClass.cpp"
|
||||
#include "MotorClass.h"
|
||||
|
||||
Motor* myMotor[MAX_AXES][MAX_GANGED]; // number of axes (normal and ganged)
|
||||
static TaskHandle_t readSgTaskHandle = 0; // for realtime stallguard data diaplay
|
@@ -45,6 +45,8 @@
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "MotorClass.h"
|
||||
|
||||
RcServo ::RcServo() {}
|
||||
|
||||
RcServo ::RcServo(uint8_t axis_index, uint8_t pwm_pin, float min, float max) {
|
@@ -21,6 +21,8 @@
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "MotorClass.h"
|
||||
|
||||
StandardStepper ::StandardStepper() {}
|
||||
|
||||
StandardStepper ::StandardStepper(uint8_t axis_index, uint8_t step_pin, uint8_t dir_pin, uint8_t disable_pin) {
|
@@ -17,6 +17,7 @@
|
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
*/
|
||||
#include "MotorClass.h"
|
||||
#include <TMCStepper.h>
|
||||
#include "TrinamicDriverClass.h"
|
||||
|
@@ -1,3 +1,5 @@
|
||||
#include "MotorClass.h"
|
||||
|
||||
UnipolarMotor ::UnipolarMotor() {}
|
||||
|
||||
UnipolarMotor ::UnipolarMotor(uint8_t axis_index, uint8_t pin_phase0, uint8_t pin_phase1, uint8_t pin_phase2, uint8_t pin_phase3) {
|
@@ -27,14 +27,7 @@
|
||||
SPINDLE_DIR_PIN
|
||||
|
||||
*/
|
||||
#include "NullSpindle.cpp"
|
||||
#include "PWMSpindle.cpp"
|
||||
#include "DacSpindle.cpp"
|
||||
#include "RelaySpindle.cpp"
|
||||
#include "Laser.cpp"
|
||||
#include "HuanyangSpindle.cpp"
|
||||
#include "BESCSpindle.cpp"
|
||||
#include "10vSpindle.cpp"
|
||||
#include "SpindleClass.h"
|
||||
|
||||
// An instance of each type of spindle is created here.
|
||||
// This allows the spindle to be dynamicly switched
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
@@ -47,7 +47,7 @@ PWM
|
||||
// supplied automatically.
|
||||
|
||||
// MACHINE_PATHNAME_QUOTED constructs a path that is suitable for #include
|
||||
# define MACHINE_PATHNAME_QUOTED(name) <Machines/name>
|
||||
# define MACHINE_PATHNAME_QUOTED(name) <src/Machines/name>
|
||||
|
||||
# include MACHINE_PATHNAME_QUOTED(MACHINE_FILENAME)
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user