From f9593975ce249dc89093375b5b5e3ff1ded181a0 Mon Sep 17 00:00:00 2001 From: bdring Date: Fri, 3 Apr 2020 16:26:45 -0500 Subject: [PATCH] Basic functionalty for testing. --- Grbl_Esp32/grbl.h | 4 ++-- Grbl_Esp32/tools/SpindleClass.cpp | 30 +++++++++++++++++++++++++++++- Grbl_Esp32/tools/SpindleClass.h | 23 +++++++++++++++++++++++ 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/grbl.h index b7ef650a..a0125ecf 100644 --- a/Grbl_Esp32/grbl.h +++ b/Grbl_Esp32/grbl.h @@ -19,8 +19,8 @@ */ // Grbl versioning system -#define GRBL_VERSION "1.1f" -#define GRBL_VERSION_BUILD "20200319" +#define GRBL_VERSION "1.2a" +#define GRBL_VERSION_BUILD "20200403" //#include #include diff --git a/Grbl_Esp32/tools/SpindleClass.cpp b/Grbl_Esp32/tools/SpindleClass.cpp index ac2ca73b..396901b0 100644 --- a/Grbl_Esp32/tools/SpindleClass.cpp +++ b/Grbl_Esp32/tools/SpindleClass.cpp @@ -1,8 +1,36 @@ /* + SpindleClass.cpp + + A Spindle Class + + Part of Grbl_ESP32 + Copyright (c) 2014-2016 Sungeun K. Jeon for Gnea Research LLC + + 2020 - 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 . + +*/ + +/* + +TODO Testing - Should $G show actual speed + Should $G show actual speed (Regular Grbl does not) + Speed overrides only take place during motion + */ #include "grbl.h" #include "SpindleClass.h" diff --git a/Grbl_Esp32/tools/SpindleClass.h b/Grbl_Esp32/tools/SpindleClass.h index b22082ba..ff959fff 100644 --- a/Grbl_Esp32/tools/SpindleClass.h +++ b/Grbl_Esp32/tools/SpindleClass.h @@ -1,3 +1,26 @@ +/* + SpindleClass.h + + Header file for a Spindle Class + + Part of Grbl_ESP32 + Copyright (c) 2014-2016 Sungeun K. Jeon for Gnea Research LLC + + 2020 - 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 . + +*/ #include "grbl.h" #ifndef SPINDLE_CLASS_H