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

Merge branch 'Devt' of https://github.com/bdring/Grbl_Esp32 into Devt

Browse Source
This commit is contained in:
bdring
2021-02-19 16:20:48 -06:00
parent 26bf356cda 5bc3cf819b
commit 59301a27a9
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/src/Grbl.cpp
View File

@@ -39,8 +39,8 @@ void grbl_init() {
#endif
settings_init(); // Load Grbl settings from non-volatile storage
stepper_init(); // Configure stepper pins and interrupt timers
init_motors();
system_ini(); // Configure pinout pins and pin-change interrupt (Renamed due to conflict with esp32 files)
init_motors();
memset(sys_position, 0, sizeof(sys_position)); // Clear machine position.
machine_init(); // weak definition in Grbl.cpp does nothing
// Initialize system state.

4
Grbl_Esp32/src/Grbl.h
View File

@@ -21,8 +21,8 @@
*/
// Grbl versioning system
const char* const GRBL_VERSION_BUILD = "20210213";
const char* const GRBL_VERSION = "1.3a";
const char* const GRBL_VERSION_BUILD = "20210218";
//#include <sdkconfig.h>
#include <Arduino.h>

9
Grbl_Esp32/src/WebUI/WebServer.cpp
View File

@@ -280,7 +280,14 @@ namespace WebUI {
if ((path.substring(0, 4) == "/SD/")) {
//remove /SD
path = path.substring(3);
if (SDState::Idle != get_sd_state(true)) {
String content = "cannot open: ";
content += path + ", SD is not available.";
_webserver->send(500, "text/plain", content);
}
if (SD.exists(pathWithGz) || SD.exists(path)) {
set_sd_state(SDState::BusyUploading);
if (SD.exists(pathWithGz)) {
path = pathWithGz;
}
@@ -311,8 +318,10 @@ namespace WebUI {
if (i != totalFileSize) {
//error: TBD
}
set_sd_state(SDState::Idle);
return;
}
set_sd_state(SDState::Idle);
}
String content = "cannot find ";
content += path;