From 7b6b4b2087d40c7e91853d63f09d358aad671ce4 Mon Sep 17 00:00:00 2001 From: Stefan de Bruijn Date: Sat, 8 Aug 2020 20:18:05 +0200 Subject: [PATCH] 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 --- Grbl_Esp32/Grbl_Esp32.ino | 5 +---- Grbl_Esp32/{ => src}/BTconfig.cpp | 0 Grbl_Esp32/{ => src}/BTconfig.h | 0 Grbl_Esp32/{ => src}/JSONencoder.cpp | 0 Grbl_Esp32/{ => src}/JSONencoder.h | 0 Grbl_Esp32/{ => src}/Machines/3axis_v3.h | 0 Grbl_Esp32/{ => src}/Machines/3axis_v4.h | 0 Grbl_Esp32/{ => src}/Machines/3axis_xyx.h | 0 .../{ => src}/Machines/4axis_external_driver.h | 0 Grbl_Esp32/{ => src}/Machines/6_pack_stepstick_v1.h | 0 Grbl_Esp32/{ => src}/Machines/6_pack_trinamic_V1.h | 0 Grbl_Esp32/{ => src}/Machines/atari_1020.h | 0 .../{ => src}/Machines/esp32_printer_controller.h | 0 Grbl_Esp32/{ => src}/Machines/espduino.h | 0 Grbl_Esp32/{ => src}/Machines/foo_6axis.h | 0 Grbl_Esp32/{ => src}/Machines/i2s_out_xxyyzz.h | 0 Grbl_Esp32/{ => src}/Machines/i2s_out_xyzabc.h | 0 .../{ => src}/Machines/i2s_out_xyzabc_trinamic.h | 0 Grbl_Esp32/{ => src}/Machines/lowrider_v1p2.h | 0 Grbl_Esp32/{ => src}/Machines/midtbot.h | 0 Grbl_Esp32/{ => src}/Machines/mpcnc_v1p1.h | 0 Grbl_Esp32/{ => src}/Machines/mpcnc_v1p2.h | 0 Grbl_Esp32/{ => src}/Machines/pen_laser.h | 0 Grbl_Esp32/{ => src}/Machines/polar_coaster.h | 0 .../{ => src}/Machines/spi_daisy_4axis_xyyz.h | 0 Grbl_Esp32/{ => src}/Machines/spi_daisy_4axis_xyz.h | 0 .../{ => src}/Machines/spi_daisy_4axis_xyza.h | 0 Grbl_Esp32/{ => src}/Machines/spindle_class_test.h | 0 Grbl_Esp32/{ => src}/Machines/template.h | 0 Grbl_Esp32/{ => src}/Machines/test_drive.h | 0 Grbl_Esp32/{ => src}/Machines/tmc2130_pen.h | 0 Grbl_Esp32/{ => src}/Motors/MotorClass.cpp | 6 +----- Grbl_Esp32/{ => src}/Motors/MotorClass.h | 0 Grbl_Esp32/{ => src}/Motors/RcServoClass.cpp | 2 ++ Grbl_Esp32/{ => src}/Motors/RcServoClass.h | 0 .../{ => src}/Motors/StandardStepperClass.cpp | 2 ++ Grbl_Esp32/{ => src}/Motors/TrinamicDriverClass.cpp | 1 + Grbl_Esp32/{ => src}/Motors/TrinamicDriverClass.h | 0 Grbl_Esp32/{ => src}/Motors/UnipolarMotorClass.cpp | 2 ++ Grbl_Esp32/{ => src}/Pins.cpp | 0 Grbl_Esp32/{ => src}/Pins.h | 0 Grbl_Esp32/{ => src}/ProcessSettings.cpp | 0 Grbl_Esp32/{ => src}/SettingsClass.cpp | 0 Grbl_Esp32/{ => src}/SettingsClass.h | 0 Grbl_Esp32/{ => src}/SettingsDefinitions.cpp | 0 Grbl_Esp32/{ => src}/SettingsDefinitions.h | 0 Grbl_Esp32/{ => src}/Spindles/10vSpindle.cpp | 0 Grbl_Esp32/{ => src}/Spindles/BESCSpindle.cpp | 0 Grbl_Esp32/{ => src}/Spindles/DacSpindle.cpp | 0 Grbl_Esp32/{ => src}/Spindles/HuanyangSpindle.cpp | 0 Grbl_Esp32/{ => src}/Spindles/Laser.cpp | 0 Grbl_Esp32/{ => src}/Spindles/NullSpindle.cpp | 0 Grbl_Esp32/{ => src}/Spindles/PWMSpindle.cpp | 0 Grbl_Esp32/{ => src}/Spindles/RelaySpindle.cpp | 0 Grbl_Esp32/{ => src}/Spindles/SpindleClass.cpp | 9 +-------- Grbl_Esp32/{ => src}/Spindles/SpindleClass.h | 0 Grbl_Esp32/{ => src}/WebSettings.cpp | 0 Grbl_Esp32/{ => src}/WebSettings.h | 0 Grbl_Esp32/{ => src}/authentication.cpp | 0 Grbl_Esp32/{ => src}/authentication.h | 0 Grbl_Esp32/{ => src}/commands.cpp | 0 Grbl_Esp32/{ => src}/commands.h | 0 Grbl_Esp32/{ => src}/config.h | 0 Grbl_Esp32/{ => src}/coolant_control.cpp | 0 Grbl_Esp32/{ => src}/coolant_control.h | 0 Grbl_Esp32/{ => src}/cpu_map.h | 0 Grbl_Esp32/{ => src}/custom_code.cpp | 0 Grbl_Esp32/{ => src}/data/favicon.ico | Bin Grbl_Esp32/{ => src}/data/index.html.gz | Bin Grbl_Esp32/{ => src}/defaults.h | 0 Grbl_Esp32/{ => src}/espresponse.cpp | 0 Grbl_Esp32/{ => src}/espresponse.h | 0 Grbl_Esp32/{ => src}/gcode.cpp | 0 Grbl_Esp32/{ => src}/gcode.h | 0 Grbl_Esp32/{ => src}/grbl.h | 0 Grbl_Esp32/{ => src}/grbl_eeprom.cpp | 0 Grbl_Esp32/{ => src}/grbl_eeprom.h | 0 Grbl_Esp32/{ => src}/grbl_limits.cpp | 0 Grbl_Esp32/{ => src}/grbl_limits.h | 0 Grbl_Esp32/{ => src}/grbl_sd.cpp | 0 Grbl_Esp32/{ => src}/grbl_sd.h | 0 Grbl_Esp32/{ => src}/grbl_unipolar.cppold | 0 Grbl_Esp32/{ => src}/grbl_unipolar.hold | 0 Grbl_Esp32/{ => src}/i2s_out.cpp | 0 Grbl_Esp32/{ => src}/i2s_out.h | 0 Grbl_Esp32/{ => src}/inputbuffer.cpp | 0 Grbl_Esp32/{ => src}/inputbuffer.h | 0 Grbl_Esp32/{ => src}/jog.cpp | 0 Grbl_Esp32/{ => src}/jog.h | 0 Grbl_Esp32/{ => src}/machine.h | 2 +- Grbl_Esp32/{ => src}/machine_common.h | 0 Grbl_Esp32/{ => src}/motion_control.cpp | 0 Grbl_Esp32/{ => src}/motion_control.h | 0 Grbl_Esp32/{ => src}/nofile.h | 0 Grbl_Esp32/{ => src}/notifications_service.cpp | 0 Grbl_Esp32/{ => src}/notifications_service.h | 0 Grbl_Esp32/{ => src}/nuts_bolts.cpp | 0 Grbl_Esp32/{ => src}/nuts_bolts.h | 0 Grbl_Esp32/{ => src}/planner.cpp | 0 Grbl_Esp32/{ => src}/planner.h | 0 Grbl_Esp32/{ => src}/probe.cpp | 0 Grbl_Esp32/{ => src}/probe.h | 0 Grbl_Esp32/{ => src}/protocol.cpp | 0 Grbl_Esp32/{ => src}/protocol.h | 0 Grbl_Esp32/{ => src}/report.cpp | 0 Grbl_Esp32/{ => src}/report.h | 0 Grbl_Esp32/{ => src}/serial.cpp | 0 Grbl_Esp32/{ => src}/serial.h | 0 Grbl_Esp32/{ => src}/serial2socket.cpp | 0 Grbl_Esp32/{ => src}/serial2socket.h | 0 Grbl_Esp32/{ => src}/servo_axis.cpp | 0 Grbl_Esp32/{ => src}/servo_axis.h | 0 Grbl_Esp32/{ => src}/settings.cpp | 0 Grbl_Esp32/{ => src}/settings.h | 0 Grbl_Esp32/{ => src}/solenoid_pen.cpp | 0 Grbl_Esp32/{ => src}/solenoid_pen.h | 0 Grbl_Esp32/{ => src}/stepper.cpp | 0 Grbl_Esp32/{ => src}/stepper.h | 0 Grbl_Esp32/{ => src}/system.cpp | 0 Grbl_Esp32/{ => src}/system.h | 0 Grbl_Esp32/{ => src}/tdef.h | 0 Grbl_Esp32/{ => src}/telnet_server.cpp | 0 Grbl_Esp32/{ => src}/telnet_server.h | 0 Grbl_Esp32/{ => src}/tests/arcs_arrows.nc | 0 Grbl_Esp32/{ => src}/tests/parsetest.nc | 0 Grbl_Esp32/{ => src}/tests/raster_tree.nc | 0 Grbl_Esp32/{ => src}/tests/spindle/arcs_arrows.nc | 0 Grbl_Esp32/{ => src}/tests/spindle/spindle_modal.nc | 0 .../{ => src}/tests/spindle/tree_laser_mode.nc | 0 Grbl_Esp32/{ => src}/tests/spindle_testing.nc | 0 Grbl_Esp32/{ => src}/web_server.cpp | 0 Grbl_Esp32/{ => src}/web_server.h | 0 Grbl_Esp32/{ => src}/wificonfig.cpp | 0 Grbl_Esp32/{ => src}/wificonfig.h | 0 Grbl_Esp32/{ => src}/wifiservices.cpp | 0 Grbl_Esp32/{ => src}/wifiservices.h | 0 build-all.ps1 | 2 +- build-all.py | 2 +- build-all.sh | 2 +- 139 files changed, 14 insertions(+), 21 deletions(-) rename Grbl_Esp32/{ => src}/BTconfig.cpp (100%) rename Grbl_Esp32/{ => src}/BTconfig.h (100%) rename Grbl_Esp32/{ => src}/JSONencoder.cpp (100%) rename Grbl_Esp32/{ => src}/JSONencoder.h (100%) rename Grbl_Esp32/{ => src}/Machines/3axis_v3.h (100%) rename Grbl_Esp32/{ => src}/Machines/3axis_v4.h (100%) rename Grbl_Esp32/{ => src}/Machines/3axis_xyx.h (100%) rename Grbl_Esp32/{ => src}/Machines/4axis_external_driver.h (100%) rename Grbl_Esp32/{ => src}/Machines/6_pack_stepstick_v1.h (100%) rename Grbl_Esp32/{ => src}/Machines/6_pack_trinamic_V1.h (100%) rename Grbl_Esp32/{ => src}/Machines/atari_1020.h (100%) rename Grbl_Esp32/{ => src}/Machines/esp32_printer_controller.h (100%) rename Grbl_Esp32/{ => src}/Machines/espduino.h (100%) rename Grbl_Esp32/{ => src}/Machines/foo_6axis.h (100%) rename Grbl_Esp32/{ => src}/Machines/i2s_out_xxyyzz.h (100%) rename Grbl_Esp32/{ => src}/Machines/i2s_out_xyzabc.h (100%) rename Grbl_Esp32/{ => src}/Machines/i2s_out_xyzabc_trinamic.h (100%) rename Grbl_Esp32/{ => src}/Machines/lowrider_v1p2.h (100%) rename Grbl_Esp32/{ => src}/Machines/midtbot.h (100%) rename Grbl_Esp32/{ => src}/Machines/mpcnc_v1p1.h (100%) rename Grbl_Esp32/{ => src}/Machines/mpcnc_v1p2.h (100%) rename Grbl_Esp32/{ => src}/Machines/pen_laser.h (100%) rename Grbl_Esp32/{ => src}/Machines/polar_coaster.h (100%) rename Grbl_Esp32/{ => src}/Machines/spi_daisy_4axis_xyyz.h (100%) rename Grbl_Esp32/{ => src}/Machines/spi_daisy_4axis_xyz.h (100%) rename Grbl_Esp32/{ => src}/Machines/spi_daisy_4axis_xyza.h (100%) rename Grbl_Esp32/{ => src}/Machines/spindle_class_test.h (100%) rename Grbl_Esp32/{ => src}/Machines/template.h (100%) rename Grbl_Esp32/{ => src}/Machines/test_drive.h (100%) rename Grbl_Esp32/{ => src}/Machines/tmc2130_pen.h (100%) rename Grbl_Esp32/{ => src}/Motors/MotorClass.cpp (99%) rename Grbl_Esp32/{ => src}/Motors/MotorClass.h (100%) rename Grbl_Esp32/{ => src}/Motors/RcServoClass.cpp (99%) rename Grbl_Esp32/{ => src}/Motors/RcServoClass.h (100%) rename Grbl_Esp32/{ => src}/Motors/StandardStepperClass.cpp (99%) rename Grbl_Esp32/{ => src}/Motors/TrinamicDriverClass.cpp (99%) rename Grbl_Esp32/{ => src}/Motors/TrinamicDriverClass.h (100%) rename Grbl_Esp32/{ => src}/Motors/UnipolarMotorClass.cpp (99%) rename Grbl_Esp32/{ => src}/Pins.cpp (100%) rename Grbl_Esp32/{ => src}/Pins.h (100%) rename Grbl_Esp32/{ => src}/ProcessSettings.cpp (100%) rename Grbl_Esp32/{ => src}/SettingsClass.cpp (100%) rename Grbl_Esp32/{ => src}/SettingsClass.h (100%) rename Grbl_Esp32/{ => src}/SettingsDefinitions.cpp (100%) rename Grbl_Esp32/{ => src}/SettingsDefinitions.h (100%) rename Grbl_Esp32/{ => src}/Spindles/10vSpindle.cpp (100%) rename Grbl_Esp32/{ => src}/Spindles/BESCSpindle.cpp (100%) rename Grbl_Esp32/{ => src}/Spindles/DacSpindle.cpp (100%) rename Grbl_Esp32/{ => src}/Spindles/HuanyangSpindle.cpp (100%) rename Grbl_Esp32/{ => src}/Spindles/Laser.cpp (100%) rename Grbl_Esp32/{ => src}/Spindles/NullSpindle.cpp (100%) rename Grbl_Esp32/{ => src}/Spindles/PWMSpindle.cpp (100%) rename Grbl_Esp32/{ => src}/Spindles/RelaySpindle.cpp (100%) rename Grbl_Esp32/{ => src}/Spindles/SpindleClass.cpp (91%) rename Grbl_Esp32/{ => src}/Spindles/SpindleClass.h (100%) rename Grbl_Esp32/{ => src}/WebSettings.cpp (100%) rename Grbl_Esp32/{ => src}/WebSettings.h (100%) rename Grbl_Esp32/{ => src}/authentication.cpp (100%) rename Grbl_Esp32/{ => src}/authentication.h (100%) rename Grbl_Esp32/{ => src}/commands.cpp (100%) rename Grbl_Esp32/{ => src}/commands.h (100%) rename Grbl_Esp32/{ => src}/config.h (100%) rename Grbl_Esp32/{ => src}/coolant_control.cpp (100%) rename Grbl_Esp32/{ => src}/coolant_control.h (100%) rename Grbl_Esp32/{ => src}/cpu_map.h (100%) rename Grbl_Esp32/{ => src}/custom_code.cpp (100%) rename Grbl_Esp32/{ => src}/data/favicon.ico (100%) rename Grbl_Esp32/{ => src}/data/index.html.gz (100%) rename Grbl_Esp32/{ => src}/defaults.h (100%) rename Grbl_Esp32/{ => src}/espresponse.cpp (100%) rename Grbl_Esp32/{ => src}/espresponse.h (100%) rename Grbl_Esp32/{ => src}/gcode.cpp (100%) rename Grbl_Esp32/{ => src}/gcode.h (100%) rename Grbl_Esp32/{ => src}/grbl.h (100%) rename Grbl_Esp32/{ => src}/grbl_eeprom.cpp (100%) rename Grbl_Esp32/{ => src}/grbl_eeprom.h (100%) rename Grbl_Esp32/{ => src}/grbl_limits.cpp (100%) rename Grbl_Esp32/{ => src}/grbl_limits.h (100%) rename Grbl_Esp32/{ => src}/grbl_sd.cpp (100%) rename Grbl_Esp32/{ => src}/grbl_sd.h (100%) rename Grbl_Esp32/{ => src}/grbl_unipolar.cppold (100%) rename Grbl_Esp32/{ => src}/grbl_unipolar.hold (100%) rename Grbl_Esp32/{ => src}/i2s_out.cpp (100%) rename Grbl_Esp32/{ => src}/i2s_out.h (100%) rename Grbl_Esp32/{ => src}/inputbuffer.cpp (100%) rename Grbl_Esp32/{ => src}/inputbuffer.h (100%) rename Grbl_Esp32/{ => src}/jog.cpp (100%) rename Grbl_Esp32/{ => src}/jog.h (100%) rename Grbl_Esp32/{ => src}/machine.h (96%) rename Grbl_Esp32/{ => src}/machine_common.h (100%) rename Grbl_Esp32/{ => src}/motion_control.cpp (100%) rename Grbl_Esp32/{ => src}/motion_control.h (100%) rename Grbl_Esp32/{ => src}/nofile.h (100%) rename Grbl_Esp32/{ => src}/notifications_service.cpp (100%) rename Grbl_Esp32/{ => src}/notifications_service.h (100%) rename Grbl_Esp32/{ => src}/nuts_bolts.cpp (100%) rename Grbl_Esp32/{ => src}/nuts_bolts.h (100%) rename Grbl_Esp32/{ => src}/planner.cpp (100%) rename Grbl_Esp32/{ => src}/planner.h (100%) rename Grbl_Esp32/{ => src}/probe.cpp (100%) rename Grbl_Esp32/{ => src}/probe.h (100%) rename Grbl_Esp32/{ => src}/protocol.cpp (100%) rename Grbl_Esp32/{ => src}/protocol.h (100%) rename Grbl_Esp32/{ => src}/report.cpp (100%) rename Grbl_Esp32/{ => src}/report.h (100%) rename Grbl_Esp32/{ => src}/serial.cpp (100%) rename Grbl_Esp32/{ => src}/serial.h (100%) rename Grbl_Esp32/{ => src}/serial2socket.cpp (100%) rename Grbl_Esp32/{ => src}/serial2socket.h (100%) rename Grbl_Esp32/{ => src}/servo_axis.cpp (100%) rename Grbl_Esp32/{ => src}/servo_axis.h (100%) rename Grbl_Esp32/{ => src}/settings.cpp (100%) rename Grbl_Esp32/{ => src}/settings.h (100%) rename Grbl_Esp32/{ => src}/solenoid_pen.cpp (100%) rename Grbl_Esp32/{ => src}/solenoid_pen.h (100%) rename Grbl_Esp32/{ => src}/stepper.cpp (100%) rename Grbl_Esp32/{ => src}/stepper.h (100%) rename Grbl_Esp32/{ => src}/system.cpp (100%) rename Grbl_Esp32/{ => src}/system.h (100%) rename Grbl_Esp32/{ => src}/tdef.h (100%) rename Grbl_Esp32/{ => src}/telnet_server.cpp (100%) rename Grbl_Esp32/{ => src}/telnet_server.h (100%) rename Grbl_Esp32/{ => src}/tests/arcs_arrows.nc (100%) rename Grbl_Esp32/{ => src}/tests/parsetest.nc (100%) rename Grbl_Esp32/{ => src}/tests/raster_tree.nc (100%) rename Grbl_Esp32/{ => src}/tests/spindle/arcs_arrows.nc (100%) rename Grbl_Esp32/{ => src}/tests/spindle/spindle_modal.nc (100%) rename Grbl_Esp32/{ => src}/tests/spindle/tree_laser_mode.nc (100%) rename Grbl_Esp32/{ => src}/tests/spindle_testing.nc (100%) rename Grbl_Esp32/{ => src}/web_server.cpp (100%) rename Grbl_Esp32/{ => src}/web_server.h (100%) rename Grbl_Esp32/{ => src}/wificonfig.cpp (100%) rename Grbl_Esp32/{ => src}/wificonfig.h (100%) rename Grbl_Esp32/{ => src}/wifiservices.cpp (100%) rename Grbl_Esp32/{ => src}/wifiservices.h (100%) diff --git a/Grbl_Esp32/Grbl_Esp32.ino b/Grbl_Esp32/Grbl_Esp32.ino index f85b47e8..ca3f0587 100644 --- a/Grbl_Esp32/Grbl_Esp32.ino +++ b/Grbl_Esp32/Grbl_Esp32.ino @@ -18,12 +18,9 @@ along with Grbl. If not, see . */ -#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. diff --git a/Grbl_Esp32/BTconfig.cpp b/Grbl_Esp32/src/BTconfig.cpp similarity index 100% rename from Grbl_Esp32/BTconfig.cpp rename to Grbl_Esp32/src/BTconfig.cpp diff --git a/Grbl_Esp32/BTconfig.h b/Grbl_Esp32/src/BTconfig.h similarity index 100% rename from Grbl_Esp32/BTconfig.h rename to Grbl_Esp32/src/BTconfig.h diff --git a/Grbl_Esp32/JSONencoder.cpp b/Grbl_Esp32/src/JSONencoder.cpp similarity index 100% rename from Grbl_Esp32/JSONencoder.cpp rename to Grbl_Esp32/src/JSONencoder.cpp diff --git a/Grbl_Esp32/JSONencoder.h b/Grbl_Esp32/src/JSONencoder.h similarity index 100% rename from Grbl_Esp32/JSONencoder.h rename to Grbl_Esp32/src/JSONencoder.h diff --git a/Grbl_Esp32/Machines/3axis_v3.h b/Grbl_Esp32/src/Machines/3axis_v3.h similarity index 100% rename from Grbl_Esp32/Machines/3axis_v3.h rename to Grbl_Esp32/src/Machines/3axis_v3.h diff --git a/Grbl_Esp32/Machines/3axis_v4.h b/Grbl_Esp32/src/Machines/3axis_v4.h similarity index 100% rename from Grbl_Esp32/Machines/3axis_v4.h rename to Grbl_Esp32/src/Machines/3axis_v4.h diff --git a/Grbl_Esp32/Machines/3axis_xyx.h b/Grbl_Esp32/src/Machines/3axis_xyx.h similarity index 100% rename from Grbl_Esp32/Machines/3axis_xyx.h rename to Grbl_Esp32/src/Machines/3axis_xyx.h diff --git a/Grbl_Esp32/Machines/4axis_external_driver.h b/Grbl_Esp32/src/Machines/4axis_external_driver.h similarity index 100% rename from Grbl_Esp32/Machines/4axis_external_driver.h rename to Grbl_Esp32/src/Machines/4axis_external_driver.h diff --git a/Grbl_Esp32/Machines/6_pack_stepstick_v1.h b/Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h similarity index 100% rename from Grbl_Esp32/Machines/6_pack_stepstick_v1.h rename to Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h diff --git a/Grbl_Esp32/Machines/6_pack_trinamic_V1.h b/Grbl_Esp32/src/Machines/6_pack_trinamic_V1.h similarity index 100% rename from Grbl_Esp32/Machines/6_pack_trinamic_V1.h rename to Grbl_Esp32/src/Machines/6_pack_trinamic_V1.h diff --git a/Grbl_Esp32/Machines/atari_1020.h b/Grbl_Esp32/src/Machines/atari_1020.h similarity index 100% rename from Grbl_Esp32/Machines/atari_1020.h rename to Grbl_Esp32/src/Machines/atari_1020.h diff --git a/Grbl_Esp32/Machines/esp32_printer_controller.h b/Grbl_Esp32/src/Machines/esp32_printer_controller.h similarity index 100% rename from Grbl_Esp32/Machines/esp32_printer_controller.h rename to Grbl_Esp32/src/Machines/esp32_printer_controller.h diff --git a/Grbl_Esp32/Machines/espduino.h b/Grbl_Esp32/src/Machines/espduino.h similarity index 100% rename from Grbl_Esp32/Machines/espduino.h rename to Grbl_Esp32/src/Machines/espduino.h diff --git a/Grbl_Esp32/Machines/foo_6axis.h b/Grbl_Esp32/src/Machines/foo_6axis.h similarity index 100% rename from Grbl_Esp32/Machines/foo_6axis.h rename to Grbl_Esp32/src/Machines/foo_6axis.h diff --git a/Grbl_Esp32/Machines/i2s_out_xxyyzz.h b/Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h similarity index 100% rename from Grbl_Esp32/Machines/i2s_out_xxyyzz.h rename to Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h diff --git a/Grbl_Esp32/Machines/i2s_out_xyzabc.h b/Grbl_Esp32/src/Machines/i2s_out_xyzabc.h similarity index 100% rename from Grbl_Esp32/Machines/i2s_out_xyzabc.h rename to Grbl_Esp32/src/Machines/i2s_out_xyzabc.h diff --git a/Grbl_Esp32/Machines/i2s_out_xyzabc_trinamic.h b/Grbl_Esp32/src/Machines/i2s_out_xyzabc_trinamic.h similarity index 100% rename from Grbl_Esp32/Machines/i2s_out_xyzabc_trinamic.h rename to Grbl_Esp32/src/Machines/i2s_out_xyzabc_trinamic.h diff --git a/Grbl_Esp32/Machines/lowrider_v1p2.h b/Grbl_Esp32/src/Machines/lowrider_v1p2.h similarity index 100% rename from Grbl_Esp32/Machines/lowrider_v1p2.h rename to Grbl_Esp32/src/Machines/lowrider_v1p2.h diff --git a/Grbl_Esp32/Machines/midtbot.h b/Grbl_Esp32/src/Machines/midtbot.h similarity index 100% rename from Grbl_Esp32/Machines/midtbot.h rename to Grbl_Esp32/src/Machines/midtbot.h diff --git a/Grbl_Esp32/Machines/mpcnc_v1p1.h b/Grbl_Esp32/src/Machines/mpcnc_v1p1.h similarity index 100% rename from Grbl_Esp32/Machines/mpcnc_v1p1.h rename to Grbl_Esp32/src/Machines/mpcnc_v1p1.h diff --git a/Grbl_Esp32/Machines/mpcnc_v1p2.h b/Grbl_Esp32/src/Machines/mpcnc_v1p2.h similarity index 100% rename from Grbl_Esp32/Machines/mpcnc_v1p2.h rename to Grbl_Esp32/src/Machines/mpcnc_v1p2.h diff --git a/Grbl_Esp32/Machines/pen_laser.h b/Grbl_Esp32/src/Machines/pen_laser.h similarity index 100% rename from Grbl_Esp32/Machines/pen_laser.h rename to Grbl_Esp32/src/Machines/pen_laser.h diff --git a/Grbl_Esp32/Machines/polar_coaster.h b/Grbl_Esp32/src/Machines/polar_coaster.h similarity index 100% rename from Grbl_Esp32/Machines/polar_coaster.h rename to Grbl_Esp32/src/Machines/polar_coaster.h diff --git a/Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h similarity index 100% rename from Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h rename to Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h diff --git a/Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyz.h similarity index 100% rename from Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h rename to Grbl_Esp32/src/Machines/spi_daisy_4axis_xyz.h diff --git a/Grbl_Esp32/Machines/spi_daisy_4axis_xyza.h b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyza.h similarity index 100% rename from Grbl_Esp32/Machines/spi_daisy_4axis_xyza.h rename to Grbl_Esp32/src/Machines/spi_daisy_4axis_xyza.h diff --git a/Grbl_Esp32/Machines/spindle_class_test.h b/Grbl_Esp32/src/Machines/spindle_class_test.h similarity index 100% rename from Grbl_Esp32/Machines/spindle_class_test.h rename to Grbl_Esp32/src/Machines/spindle_class_test.h diff --git a/Grbl_Esp32/Machines/template.h b/Grbl_Esp32/src/Machines/template.h similarity index 100% rename from Grbl_Esp32/Machines/template.h rename to Grbl_Esp32/src/Machines/template.h diff --git a/Grbl_Esp32/Machines/test_drive.h b/Grbl_Esp32/src/Machines/test_drive.h similarity index 100% rename from Grbl_Esp32/Machines/test_drive.h rename to Grbl_Esp32/src/Machines/test_drive.h diff --git a/Grbl_Esp32/Machines/tmc2130_pen.h b/Grbl_Esp32/src/Machines/tmc2130_pen.h similarity index 100% rename from Grbl_Esp32/Machines/tmc2130_pen.h rename to Grbl_Esp32/src/Machines/tmc2130_pen.h diff --git a/Grbl_Esp32/Motors/MotorClass.cpp b/Grbl_Esp32/src/Motors/MotorClass.cpp similarity index 99% rename from Grbl_Esp32/Motors/MotorClass.cpp rename to Grbl_Esp32/src/Motors/MotorClass.cpp index c1d7d891..b5d1dfe6 100644 --- a/Grbl_Esp32/Motors/MotorClass.cpp +++ b/Grbl_Esp32/src/Motors/MotorClass.cpp @@ -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 diff --git a/Grbl_Esp32/Motors/MotorClass.h b/Grbl_Esp32/src/Motors/MotorClass.h similarity index 100% rename from Grbl_Esp32/Motors/MotorClass.h rename to Grbl_Esp32/src/Motors/MotorClass.h diff --git a/Grbl_Esp32/Motors/RcServoClass.cpp b/Grbl_Esp32/src/Motors/RcServoClass.cpp similarity index 99% rename from Grbl_Esp32/Motors/RcServoClass.cpp rename to Grbl_Esp32/src/Motors/RcServoClass.cpp index d6e157af..49ae4341 100644 --- a/Grbl_Esp32/Motors/RcServoClass.cpp +++ b/Grbl_Esp32/src/Motors/RcServoClass.cpp @@ -45,6 +45,8 @@ along with Grbl. If not, see . */ +#include "MotorClass.h" + RcServo ::RcServo() {} RcServo ::RcServo(uint8_t axis_index, uint8_t pwm_pin, float min, float max) { diff --git a/Grbl_Esp32/Motors/RcServoClass.h b/Grbl_Esp32/src/Motors/RcServoClass.h similarity index 100% rename from Grbl_Esp32/Motors/RcServoClass.h rename to Grbl_Esp32/src/Motors/RcServoClass.h diff --git a/Grbl_Esp32/Motors/StandardStepperClass.cpp b/Grbl_Esp32/src/Motors/StandardStepperClass.cpp similarity index 99% rename from Grbl_Esp32/Motors/StandardStepperClass.cpp rename to Grbl_Esp32/src/Motors/StandardStepperClass.cpp index 2a0490b6..2374d094 100644 --- a/Grbl_Esp32/Motors/StandardStepperClass.cpp +++ b/Grbl_Esp32/src/Motors/StandardStepperClass.cpp @@ -21,6 +21,8 @@ along with Grbl. If not, see . */ +#include "MotorClass.h" + StandardStepper ::StandardStepper() {} StandardStepper ::StandardStepper(uint8_t axis_index, uint8_t step_pin, uint8_t dir_pin, uint8_t disable_pin) { diff --git a/Grbl_Esp32/Motors/TrinamicDriverClass.cpp b/Grbl_Esp32/src/Motors/TrinamicDriverClass.cpp similarity index 99% rename from Grbl_Esp32/Motors/TrinamicDriverClass.cpp rename to Grbl_Esp32/src/Motors/TrinamicDriverClass.cpp index 1c76fb84..f36a4abf 100644 --- a/Grbl_Esp32/Motors/TrinamicDriverClass.cpp +++ b/Grbl_Esp32/src/Motors/TrinamicDriverClass.cpp @@ -17,6 +17,7 @@ along with Grbl. If not, see . */ +#include "MotorClass.h" #include #include "TrinamicDriverClass.h" diff --git a/Grbl_Esp32/Motors/TrinamicDriverClass.h b/Grbl_Esp32/src/Motors/TrinamicDriverClass.h similarity index 100% rename from Grbl_Esp32/Motors/TrinamicDriverClass.h rename to Grbl_Esp32/src/Motors/TrinamicDriverClass.h diff --git a/Grbl_Esp32/Motors/UnipolarMotorClass.cpp b/Grbl_Esp32/src/Motors/UnipolarMotorClass.cpp similarity index 99% rename from Grbl_Esp32/Motors/UnipolarMotorClass.cpp rename to Grbl_Esp32/src/Motors/UnipolarMotorClass.cpp index 1dae539d..3c8aed36 100644 --- a/Grbl_Esp32/Motors/UnipolarMotorClass.cpp +++ b/Grbl_Esp32/src/Motors/UnipolarMotorClass.cpp @@ -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) { diff --git a/Grbl_Esp32/Pins.cpp b/Grbl_Esp32/src/Pins.cpp similarity index 100% rename from Grbl_Esp32/Pins.cpp rename to Grbl_Esp32/src/Pins.cpp diff --git a/Grbl_Esp32/Pins.h b/Grbl_Esp32/src/Pins.h similarity index 100% rename from Grbl_Esp32/Pins.h rename to Grbl_Esp32/src/Pins.h diff --git a/Grbl_Esp32/ProcessSettings.cpp b/Grbl_Esp32/src/ProcessSettings.cpp similarity index 100% rename from Grbl_Esp32/ProcessSettings.cpp rename to Grbl_Esp32/src/ProcessSettings.cpp diff --git a/Grbl_Esp32/SettingsClass.cpp b/Grbl_Esp32/src/SettingsClass.cpp similarity index 100% rename from Grbl_Esp32/SettingsClass.cpp rename to Grbl_Esp32/src/SettingsClass.cpp diff --git a/Grbl_Esp32/SettingsClass.h b/Grbl_Esp32/src/SettingsClass.h similarity index 100% rename from Grbl_Esp32/SettingsClass.h rename to Grbl_Esp32/src/SettingsClass.h diff --git a/Grbl_Esp32/SettingsDefinitions.cpp b/Grbl_Esp32/src/SettingsDefinitions.cpp similarity index 100% rename from Grbl_Esp32/SettingsDefinitions.cpp rename to Grbl_Esp32/src/SettingsDefinitions.cpp diff --git a/Grbl_Esp32/SettingsDefinitions.h b/Grbl_Esp32/src/SettingsDefinitions.h similarity index 100% rename from Grbl_Esp32/SettingsDefinitions.h rename to Grbl_Esp32/src/SettingsDefinitions.h diff --git a/Grbl_Esp32/Spindles/10vSpindle.cpp b/Grbl_Esp32/src/Spindles/10vSpindle.cpp similarity index 100% rename from Grbl_Esp32/Spindles/10vSpindle.cpp rename to Grbl_Esp32/src/Spindles/10vSpindle.cpp diff --git a/Grbl_Esp32/Spindles/BESCSpindle.cpp b/Grbl_Esp32/src/Spindles/BESCSpindle.cpp similarity index 100% rename from Grbl_Esp32/Spindles/BESCSpindle.cpp rename to Grbl_Esp32/src/Spindles/BESCSpindle.cpp diff --git a/Grbl_Esp32/Spindles/DacSpindle.cpp b/Grbl_Esp32/src/Spindles/DacSpindle.cpp similarity index 100% rename from Grbl_Esp32/Spindles/DacSpindle.cpp rename to Grbl_Esp32/src/Spindles/DacSpindle.cpp diff --git a/Grbl_Esp32/Spindles/HuanyangSpindle.cpp b/Grbl_Esp32/src/Spindles/HuanyangSpindle.cpp similarity index 100% rename from Grbl_Esp32/Spindles/HuanyangSpindle.cpp rename to Grbl_Esp32/src/Spindles/HuanyangSpindle.cpp diff --git a/Grbl_Esp32/Spindles/Laser.cpp b/Grbl_Esp32/src/Spindles/Laser.cpp similarity index 100% rename from Grbl_Esp32/Spindles/Laser.cpp rename to Grbl_Esp32/src/Spindles/Laser.cpp diff --git a/Grbl_Esp32/Spindles/NullSpindle.cpp b/Grbl_Esp32/src/Spindles/NullSpindle.cpp similarity index 100% rename from Grbl_Esp32/Spindles/NullSpindle.cpp rename to Grbl_Esp32/src/Spindles/NullSpindle.cpp diff --git a/Grbl_Esp32/Spindles/PWMSpindle.cpp b/Grbl_Esp32/src/Spindles/PWMSpindle.cpp similarity index 100% rename from Grbl_Esp32/Spindles/PWMSpindle.cpp rename to Grbl_Esp32/src/Spindles/PWMSpindle.cpp diff --git a/Grbl_Esp32/Spindles/RelaySpindle.cpp b/Grbl_Esp32/src/Spindles/RelaySpindle.cpp similarity index 100% rename from Grbl_Esp32/Spindles/RelaySpindle.cpp rename to Grbl_Esp32/src/Spindles/RelaySpindle.cpp diff --git a/Grbl_Esp32/Spindles/SpindleClass.cpp b/Grbl_Esp32/src/Spindles/SpindleClass.cpp similarity index 91% rename from Grbl_Esp32/Spindles/SpindleClass.cpp rename to Grbl_Esp32/src/Spindles/SpindleClass.cpp index af3da724..a6786a5d 100644 --- a/Grbl_Esp32/Spindles/SpindleClass.cpp +++ b/Grbl_Esp32/src/Spindles/SpindleClass.cpp @@ -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 diff --git a/Grbl_Esp32/Spindles/SpindleClass.h b/Grbl_Esp32/src/Spindles/SpindleClass.h similarity index 100% rename from Grbl_Esp32/Spindles/SpindleClass.h rename to Grbl_Esp32/src/Spindles/SpindleClass.h diff --git a/Grbl_Esp32/WebSettings.cpp b/Grbl_Esp32/src/WebSettings.cpp similarity index 100% rename from Grbl_Esp32/WebSettings.cpp rename to Grbl_Esp32/src/WebSettings.cpp diff --git a/Grbl_Esp32/WebSettings.h b/Grbl_Esp32/src/WebSettings.h similarity index 100% rename from Grbl_Esp32/WebSettings.h rename to Grbl_Esp32/src/WebSettings.h diff --git a/Grbl_Esp32/authentication.cpp b/Grbl_Esp32/src/authentication.cpp similarity index 100% rename from Grbl_Esp32/authentication.cpp rename to Grbl_Esp32/src/authentication.cpp diff --git a/Grbl_Esp32/authentication.h b/Grbl_Esp32/src/authentication.h similarity index 100% rename from Grbl_Esp32/authentication.h rename to Grbl_Esp32/src/authentication.h diff --git a/Grbl_Esp32/commands.cpp b/Grbl_Esp32/src/commands.cpp similarity index 100% rename from Grbl_Esp32/commands.cpp rename to Grbl_Esp32/src/commands.cpp diff --git a/Grbl_Esp32/commands.h b/Grbl_Esp32/src/commands.h similarity index 100% rename from Grbl_Esp32/commands.h rename to Grbl_Esp32/src/commands.h diff --git a/Grbl_Esp32/config.h b/Grbl_Esp32/src/config.h similarity index 100% rename from Grbl_Esp32/config.h rename to Grbl_Esp32/src/config.h diff --git a/Grbl_Esp32/coolant_control.cpp b/Grbl_Esp32/src/coolant_control.cpp similarity index 100% rename from Grbl_Esp32/coolant_control.cpp rename to Grbl_Esp32/src/coolant_control.cpp diff --git a/Grbl_Esp32/coolant_control.h b/Grbl_Esp32/src/coolant_control.h similarity index 100% rename from Grbl_Esp32/coolant_control.h rename to Grbl_Esp32/src/coolant_control.h diff --git a/Grbl_Esp32/cpu_map.h b/Grbl_Esp32/src/cpu_map.h similarity index 100% rename from Grbl_Esp32/cpu_map.h rename to Grbl_Esp32/src/cpu_map.h diff --git a/Grbl_Esp32/custom_code.cpp b/Grbl_Esp32/src/custom_code.cpp similarity index 100% rename from Grbl_Esp32/custom_code.cpp rename to Grbl_Esp32/src/custom_code.cpp diff --git a/Grbl_Esp32/data/favicon.ico b/Grbl_Esp32/src/data/favicon.ico similarity index 100% rename from Grbl_Esp32/data/favicon.ico rename to Grbl_Esp32/src/data/favicon.ico diff --git a/Grbl_Esp32/data/index.html.gz b/Grbl_Esp32/src/data/index.html.gz similarity index 100% rename from Grbl_Esp32/data/index.html.gz rename to Grbl_Esp32/src/data/index.html.gz diff --git a/Grbl_Esp32/defaults.h b/Grbl_Esp32/src/defaults.h similarity index 100% rename from Grbl_Esp32/defaults.h rename to Grbl_Esp32/src/defaults.h diff --git a/Grbl_Esp32/espresponse.cpp b/Grbl_Esp32/src/espresponse.cpp similarity index 100% rename from Grbl_Esp32/espresponse.cpp rename to Grbl_Esp32/src/espresponse.cpp diff --git a/Grbl_Esp32/espresponse.h b/Grbl_Esp32/src/espresponse.h similarity index 100% rename from Grbl_Esp32/espresponse.h rename to Grbl_Esp32/src/espresponse.h diff --git a/Grbl_Esp32/gcode.cpp b/Grbl_Esp32/src/gcode.cpp similarity index 100% rename from Grbl_Esp32/gcode.cpp rename to Grbl_Esp32/src/gcode.cpp diff --git a/Grbl_Esp32/gcode.h b/Grbl_Esp32/src/gcode.h similarity index 100% rename from Grbl_Esp32/gcode.h rename to Grbl_Esp32/src/gcode.h diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/src/grbl.h similarity index 100% rename from Grbl_Esp32/grbl.h rename to Grbl_Esp32/src/grbl.h diff --git a/Grbl_Esp32/grbl_eeprom.cpp b/Grbl_Esp32/src/grbl_eeprom.cpp similarity index 100% rename from Grbl_Esp32/grbl_eeprom.cpp rename to Grbl_Esp32/src/grbl_eeprom.cpp diff --git a/Grbl_Esp32/grbl_eeprom.h b/Grbl_Esp32/src/grbl_eeprom.h similarity index 100% rename from Grbl_Esp32/grbl_eeprom.h rename to Grbl_Esp32/src/grbl_eeprom.h diff --git a/Grbl_Esp32/grbl_limits.cpp b/Grbl_Esp32/src/grbl_limits.cpp similarity index 100% rename from Grbl_Esp32/grbl_limits.cpp rename to Grbl_Esp32/src/grbl_limits.cpp diff --git a/Grbl_Esp32/grbl_limits.h b/Grbl_Esp32/src/grbl_limits.h similarity index 100% rename from Grbl_Esp32/grbl_limits.h rename to Grbl_Esp32/src/grbl_limits.h diff --git a/Grbl_Esp32/grbl_sd.cpp b/Grbl_Esp32/src/grbl_sd.cpp similarity index 100% rename from Grbl_Esp32/grbl_sd.cpp rename to Grbl_Esp32/src/grbl_sd.cpp diff --git a/Grbl_Esp32/grbl_sd.h b/Grbl_Esp32/src/grbl_sd.h similarity index 100% rename from Grbl_Esp32/grbl_sd.h rename to Grbl_Esp32/src/grbl_sd.h diff --git a/Grbl_Esp32/grbl_unipolar.cppold b/Grbl_Esp32/src/grbl_unipolar.cppold similarity index 100% rename from Grbl_Esp32/grbl_unipolar.cppold rename to Grbl_Esp32/src/grbl_unipolar.cppold diff --git a/Grbl_Esp32/grbl_unipolar.hold b/Grbl_Esp32/src/grbl_unipolar.hold similarity index 100% rename from Grbl_Esp32/grbl_unipolar.hold rename to Grbl_Esp32/src/grbl_unipolar.hold diff --git a/Grbl_Esp32/i2s_out.cpp b/Grbl_Esp32/src/i2s_out.cpp similarity index 100% rename from Grbl_Esp32/i2s_out.cpp rename to Grbl_Esp32/src/i2s_out.cpp diff --git a/Grbl_Esp32/i2s_out.h b/Grbl_Esp32/src/i2s_out.h similarity index 100% rename from Grbl_Esp32/i2s_out.h rename to Grbl_Esp32/src/i2s_out.h diff --git a/Grbl_Esp32/inputbuffer.cpp b/Grbl_Esp32/src/inputbuffer.cpp similarity index 100% rename from Grbl_Esp32/inputbuffer.cpp rename to Grbl_Esp32/src/inputbuffer.cpp diff --git a/Grbl_Esp32/inputbuffer.h b/Grbl_Esp32/src/inputbuffer.h similarity index 100% rename from Grbl_Esp32/inputbuffer.h rename to Grbl_Esp32/src/inputbuffer.h diff --git a/Grbl_Esp32/jog.cpp b/Grbl_Esp32/src/jog.cpp similarity index 100% rename from Grbl_Esp32/jog.cpp rename to Grbl_Esp32/src/jog.cpp diff --git a/Grbl_Esp32/jog.h b/Grbl_Esp32/src/jog.h similarity index 100% rename from Grbl_Esp32/jog.h rename to Grbl_Esp32/src/jog.h diff --git a/Grbl_Esp32/machine.h b/Grbl_Esp32/src/machine.h similarity index 96% rename from Grbl_Esp32/machine.h rename to Grbl_Esp32/src/machine.h index 9a907e06..f76f7b8f 100644 --- a/Grbl_Esp32/machine.h +++ b/Grbl_Esp32/src/machine.h @@ -47,7 +47,7 @@ PWM // supplied automatically. // MACHINE_PATHNAME_QUOTED constructs a path that is suitable for #include -# define MACHINE_PATHNAME_QUOTED(name) +# define MACHINE_PATHNAME_QUOTED(name) # include MACHINE_PATHNAME_QUOTED(MACHINE_FILENAME) diff --git a/Grbl_Esp32/machine_common.h b/Grbl_Esp32/src/machine_common.h similarity index 100% rename from Grbl_Esp32/machine_common.h rename to Grbl_Esp32/src/machine_common.h diff --git a/Grbl_Esp32/motion_control.cpp b/Grbl_Esp32/src/motion_control.cpp similarity index 100% rename from Grbl_Esp32/motion_control.cpp rename to Grbl_Esp32/src/motion_control.cpp diff --git a/Grbl_Esp32/motion_control.h b/Grbl_Esp32/src/motion_control.h similarity index 100% rename from Grbl_Esp32/motion_control.h rename to Grbl_Esp32/src/motion_control.h diff --git a/Grbl_Esp32/nofile.h b/Grbl_Esp32/src/nofile.h similarity index 100% rename from Grbl_Esp32/nofile.h rename to Grbl_Esp32/src/nofile.h diff --git a/Grbl_Esp32/notifications_service.cpp b/Grbl_Esp32/src/notifications_service.cpp similarity index 100% rename from Grbl_Esp32/notifications_service.cpp rename to Grbl_Esp32/src/notifications_service.cpp diff --git a/Grbl_Esp32/notifications_service.h b/Grbl_Esp32/src/notifications_service.h similarity index 100% rename from Grbl_Esp32/notifications_service.h rename to Grbl_Esp32/src/notifications_service.h diff --git a/Grbl_Esp32/nuts_bolts.cpp b/Grbl_Esp32/src/nuts_bolts.cpp similarity index 100% rename from Grbl_Esp32/nuts_bolts.cpp rename to Grbl_Esp32/src/nuts_bolts.cpp diff --git a/Grbl_Esp32/nuts_bolts.h b/Grbl_Esp32/src/nuts_bolts.h similarity index 100% rename from Grbl_Esp32/nuts_bolts.h rename to Grbl_Esp32/src/nuts_bolts.h diff --git a/Grbl_Esp32/planner.cpp b/Grbl_Esp32/src/planner.cpp similarity index 100% rename from Grbl_Esp32/planner.cpp rename to Grbl_Esp32/src/planner.cpp diff --git a/Grbl_Esp32/planner.h b/Grbl_Esp32/src/planner.h similarity index 100% rename from Grbl_Esp32/planner.h rename to Grbl_Esp32/src/planner.h diff --git a/Grbl_Esp32/probe.cpp b/Grbl_Esp32/src/probe.cpp similarity index 100% rename from Grbl_Esp32/probe.cpp rename to Grbl_Esp32/src/probe.cpp diff --git a/Grbl_Esp32/probe.h b/Grbl_Esp32/src/probe.h similarity index 100% rename from Grbl_Esp32/probe.h rename to Grbl_Esp32/src/probe.h diff --git a/Grbl_Esp32/protocol.cpp b/Grbl_Esp32/src/protocol.cpp similarity index 100% rename from Grbl_Esp32/protocol.cpp rename to Grbl_Esp32/src/protocol.cpp diff --git a/Grbl_Esp32/protocol.h b/Grbl_Esp32/src/protocol.h similarity index 100% rename from Grbl_Esp32/protocol.h rename to Grbl_Esp32/src/protocol.h diff --git a/Grbl_Esp32/report.cpp b/Grbl_Esp32/src/report.cpp similarity index 100% rename from Grbl_Esp32/report.cpp rename to Grbl_Esp32/src/report.cpp diff --git a/Grbl_Esp32/report.h b/Grbl_Esp32/src/report.h similarity index 100% rename from Grbl_Esp32/report.h rename to Grbl_Esp32/src/report.h diff --git a/Grbl_Esp32/serial.cpp b/Grbl_Esp32/src/serial.cpp similarity index 100% rename from Grbl_Esp32/serial.cpp rename to Grbl_Esp32/src/serial.cpp diff --git a/Grbl_Esp32/serial.h b/Grbl_Esp32/src/serial.h similarity index 100% rename from Grbl_Esp32/serial.h rename to Grbl_Esp32/src/serial.h diff --git a/Grbl_Esp32/serial2socket.cpp b/Grbl_Esp32/src/serial2socket.cpp similarity index 100% rename from Grbl_Esp32/serial2socket.cpp rename to Grbl_Esp32/src/serial2socket.cpp diff --git a/Grbl_Esp32/serial2socket.h b/Grbl_Esp32/src/serial2socket.h similarity index 100% rename from Grbl_Esp32/serial2socket.h rename to Grbl_Esp32/src/serial2socket.h diff --git a/Grbl_Esp32/servo_axis.cpp b/Grbl_Esp32/src/servo_axis.cpp similarity index 100% rename from Grbl_Esp32/servo_axis.cpp rename to Grbl_Esp32/src/servo_axis.cpp diff --git a/Grbl_Esp32/servo_axis.h b/Grbl_Esp32/src/servo_axis.h similarity index 100% rename from Grbl_Esp32/servo_axis.h rename to Grbl_Esp32/src/servo_axis.h diff --git a/Grbl_Esp32/settings.cpp b/Grbl_Esp32/src/settings.cpp similarity index 100% rename from Grbl_Esp32/settings.cpp rename to Grbl_Esp32/src/settings.cpp diff --git a/Grbl_Esp32/settings.h b/Grbl_Esp32/src/settings.h similarity index 100% rename from Grbl_Esp32/settings.h rename to Grbl_Esp32/src/settings.h diff --git a/Grbl_Esp32/solenoid_pen.cpp b/Grbl_Esp32/src/solenoid_pen.cpp similarity index 100% rename from Grbl_Esp32/solenoid_pen.cpp rename to Grbl_Esp32/src/solenoid_pen.cpp diff --git a/Grbl_Esp32/solenoid_pen.h b/Grbl_Esp32/src/solenoid_pen.h similarity index 100% rename from Grbl_Esp32/solenoid_pen.h rename to Grbl_Esp32/src/solenoid_pen.h diff --git a/Grbl_Esp32/stepper.cpp b/Grbl_Esp32/src/stepper.cpp similarity index 100% rename from Grbl_Esp32/stepper.cpp rename to Grbl_Esp32/src/stepper.cpp diff --git a/Grbl_Esp32/stepper.h b/Grbl_Esp32/src/stepper.h similarity index 100% rename from Grbl_Esp32/stepper.h rename to Grbl_Esp32/src/stepper.h diff --git a/Grbl_Esp32/system.cpp b/Grbl_Esp32/src/system.cpp similarity index 100% rename from Grbl_Esp32/system.cpp rename to Grbl_Esp32/src/system.cpp diff --git a/Grbl_Esp32/system.h b/Grbl_Esp32/src/system.h similarity index 100% rename from Grbl_Esp32/system.h rename to Grbl_Esp32/src/system.h diff --git a/Grbl_Esp32/tdef.h b/Grbl_Esp32/src/tdef.h similarity index 100% rename from Grbl_Esp32/tdef.h rename to Grbl_Esp32/src/tdef.h diff --git a/Grbl_Esp32/telnet_server.cpp b/Grbl_Esp32/src/telnet_server.cpp similarity index 100% rename from Grbl_Esp32/telnet_server.cpp rename to Grbl_Esp32/src/telnet_server.cpp diff --git a/Grbl_Esp32/telnet_server.h b/Grbl_Esp32/src/telnet_server.h similarity index 100% rename from Grbl_Esp32/telnet_server.h rename to Grbl_Esp32/src/telnet_server.h diff --git a/Grbl_Esp32/tests/arcs_arrows.nc b/Grbl_Esp32/src/tests/arcs_arrows.nc similarity index 100% rename from Grbl_Esp32/tests/arcs_arrows.nc rename to Grbl_Esp32/src/tests/arcs_arrows.nc diff --git a/Grbl_Esp32/tests/parsetest.nc b/Grbl_Esp32/src/tests/parsetest.nc similarity index 100% rename from Grbl_Esp32/tests/parsetest.nc rename to Grbl_Esp32/src/tests/parsetest.nc diff --git a/Grbl_Esp32/tests/raster_tree.nc b/Grbl_Esp32/src/tests/raster_tree.nc similarity index 100% rename from Grbl_Esp32/tests/raster_tree.nc rename to Grbl_Esp32/src/tests/raster_tree.nc diff --git a/Grbl_Esp32/tests/spindle/arcs_arrows.nc b/Grbl_Esp32/src/tests/spindle/arcs_arrows.nc similarity index 100% rename from Grbl_Esp32/tests/spindle/arcs_arrows.nc rename to Grbl_Esp32/src/tests/spindle/arcs_arrows.nc diff --git a/Grbl_Esp32/tests/spindle/spindle_modal.nc b/Grbl_Esp32/src/tests/spindle/spindle_modal.nc similarity index 100% rename from Grbl_Esp32/tests/spindle/spindle_modal.nc rename to Grbl_Esp32/src/tests/spindle/spindle_modal.nc diff --git a/Grbl_Esp32/tests/spindle/tree_laser_mode.nc b/Grbl_Esp32/src/tests/spindle/tree_laser_mode.nc similarity index 100% rename from Grbl_Esp32/tests/spindle/tree_laser_mode.nc rename to Grbl_Esp32/src/tests/spindle/tree_laser_mode.nc diff --git a/Grbl_Esp32/tests/spindle_testing.nc b/Grbl_Esp32/src/tests/spindle_testing.nc similarity index 100% rename from Grbl_Esp32/tests/spindle_testing.nc rename to Grbl_Esp32/src/tests/spindle_testing.nc diff --git a/Grbl_Esp32/web_server.cpp b/Grbl_Esp32/src/web_server.cpp similarity index 100% rename from Grbl_Esp32/web_server.cpp rename to Grbl_Esp32/src/web_server.cpp diff --git a/Grbl_Esp32/web_server.h b/Grbl_Esp32/src/web_server.h similarity index 100% rename from Grbl_Esp32/web_server.h rename to Grbl_Esp32/src/web_server.h diff --git a/Grbl_Esp32/wificonfig.cpp b/Grbl_Esp32/src/wificonfig.cpp similarity index 100% rename from Grbl_Esp32/wificonfig.cpp rename to Grbl_Esp32/src/wificonfig.cpp diff --git a/Grbl_Esp32/wificonfig.h b/Grbl_Esp32/src/wificonfig.h similarity index 100% rename from Grbl_Esp32/wificonfig.h rename to Grbl_Esp32/src/wificonfig.h diff --git a/Grbl_Esp32/wifiservices.cpp b/Grbl_Esp32/src/wifiservices.cpp similarity index 100% rename from Grbl_Esp32/wifiservices.cpp rename to Grbl_Esp32/src/wifiservices.cpp diff --git a/Grbl_Esp32/wifiservices.h b/Grbl_Esp32/src/wifiservices.h similarity index 100% rename from Grbl_Esp32/wifiservices.h rename to Grbl_Esp32/src/wifiservices.h diff --git a/build-all.ps1 b/build-all.ps1 index 113513d2..3b15bdb0 100644 --- a/build-all.ps1 +++ b/build-all.ps1 @@ -15,7 +15,7 @@ Function BuildMachine($names) { } # Build all the machines -foreach ($filepath in Get-ChildItem -file .\Grbl_Esp32\Machines\*) { +foreach ($filepath in Get-ChildItem -file .\Grbl_Esp32\src\Machines\*) { BuildMachine($filepath.name, "") } diff --git a/build-all.py b/build-all.py index 61ddd443..9b99c229 100755 --- a/build-all.py +++ b/build-all.py @@ -22,7 +22,7 @@ cmd = ['platformio','run'] verbose = '-v' in sys.argv numErrors = 0 -for name in os.listdir('Grbl_Esp32/Machines'): +for name in os.listdir('Grbl_Esp32/src/Machines'): exitCode = buildMachine(name, verbose=verbose) if exitCode != 0: numErrors += 1 diff --git a/build-all.sh b/build-all.sh index f0644acf..da12b6dc 100755 --- a/build-all.sh +++ b/build-all.sh @@ -33,7 +33,7 @@ BuildMachine () { } # Build all the machines -for file in `ls ./Grbl_Esp32/Machines/*`; do +for file in `ls ./Grbl_Esp32/src/Machines/*`; do base=`basename $file` BuildMachine $base "" done