mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-31 10:01:48 +02:00
Code Issues Releases Wiki Activity

Merge pull request #407 from bdring/Devt

Browse Source 
Devt
This commit is contained in:
bdring
2020-05-14 17:01:22 -05:00
committed by GitHub
parent 7804758b14 1ad35c008f
commit a805fd04c1
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/Machines/atari_1020.h
View File

@@ -28,7 +28,7 @@
along with Grbl_ESP32. If not, see <http://www.gnu.org/licenses/>.
*/
#define MACHINE_NAME "MACHINE_ATARI_1020"
#define MACHINE_NAME "ATARI_1020"
#define CUSTOM_CODE_FILENAME "Custom/atari_1020.cpp"

2
Grbl_Esp32/Machines/lowrider_v1p2.h
View File

@@ -26,7 +26,7 @@
#define MACHINE_NAME "MACHINE_LOWRIDER_V1P2"
#define MACHINE_NAME "LOWRIDER_V1P2"
#define USE_GANGED_AXES // allow two motors on an axis

2
Grbl_Esp32/Machines/midtbot.h
View File

@@ -22,7 +22,7 @@
along with Grbl_ESP32. If not, see <http://www.gnu.org/licenses/>.
*/
#define MACHINE_NAME "MIDTBOT"
#define MACHINE_NAME "midTbot"
#define SPINDLE_TYPE SPINDLE_TYPE_NONE

2
Grbl_Esp32/Machines/polar_coaster.h
View File

@@ -22,7 +22,7 @@
along with Grbl_ESP32. If not, see <http://www.gnu.org/licenses/>.
*/
#define MACHINE_NAME "POLAR_COASTER"
#define MACHINE_NAME "Polar Coaster"
// This causes the custom code file to be included in the build
// via ../custom_code.cpp

2
Grbl_Esp32/Machines/servo_axis.h
View File

@@ -27,7 +27,7 @@
along with Grbl_ESP32. If not, see <http://www.gnu.org/licenses/>.
*/
#define MACHINE_NAME "MACHINE_SERVO_AXIS"
#define MACHINE_NAME "SERVO_AXIS"
// Pick a board version
//#define PEN_LASER_V1

2
Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h
View File

@@ -23,7 +23,7 @@
along with Grbl_ESP32. If not, see <http://www.gnu.org/licenses/>.
*/
#define MACHINE_NAME "SPI_DAISY_4X_xyyz"
#define MACHINE_NAME "SPI Daisy 4x XYYZ"
#ifdef N_AXIS
#undef N_AXIS

2
Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h
View File

@@ -23,7 +23,7 @@
along with Grbl_ESP32. If not, see <http://www.gnu.org/licenses/>.
*/
#define MACHINE_NAME "SPI_DAISY_4X_XYZ"
#define MACHINE_NAME "SPI Daisy 4x XYZ"
#ifdef N_AXIS
#undef N_AXIS

2
Grbl_Esp32/Machines/spi_daisy_4axis_xyza.h
View File

@@ -23,7 +23,7 @@
along with Grbl_ESP32. If not, see <http://www.gnu.org/licenses/>.
*/
#define MACHINE_NAME "SPI_DAISY_4X XYZA"
#define MACHINE_NAME "SPI Daisy 4x XYZA"
#ifdef N_AXIS
#undef N_AXIS

2
Grbl_Esp32/Spindles/HuanyangSpindle.cpp
View File

@@ -99,7 +99,7 @@ void vfd_cmd_task(void* pvParameters) {
} else {
// TODO: Should we ping the spindle here to make sure it does not go off line?
}
vTaskDelay(500); // TODO: What is the best value here?
vTaskDelay(200); // TODO: What is the best value here?
}
}

2
Grbl_Esp32/grbl.h
View File

@@ -22,7 +22,7 @@
// Grbl versioning system
#define GRBL_VERSION "1.2a"
#define GRBL_VERSION_BUILD "20200510"
#define GRBL_VERSION_BUILD "20200514"
//#include <sdkconfig.h>
#include <Arduino.h>

2
Grbl_Esp32/report.cpp
View File

@@ -258,7 +258,7 @@ void report_feedback_message(uint8_t message_code) { // OK to send to all client
#ifdef ENABLE_SD_CARD
case MESSAGE_SD_FILE_QUIT:
grbl_notifyf("SD print canceled", "Reset during SD file at line: %d", sd_get_current_line_number());
grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Reset during SD file at line: %d", sd_get_current_line_number);
grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Reset during SD file at line: %d", sd_get_current_line_number());
break;
#endif
}

2
Grbl_Esp32/serial.cpp
View File

@@ -82,7 +82,7 @@ void serial_init() {
NULL, // parameters
1, // priority
&serialCheckTaskHandle,
0 // core
1 // core
);
}