mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-22 22:25:16 +02:00
Code Issues Releases Wiki Activity

Revert "fix typo"

Browse Source 
This reverts commit 8ae9261c1e.
This commit is contained in:
Luc
2019-08-29 18:23:28 +02:00
parent 8ae9261c1e
commit a9127acded
2 changed files with 2 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Grbl_Esp32/commands.cpp
View File

@@ -881,49 +881,6 @@ bool COMMANDS::execute_internal_command (int cmd, String cmd_params, level_authe
} }
break; break;
//Delete SD Card file / directory
//[ESP215]
case 215:
{
if (!espresponse) return false;
#ifdef ENABLE_AUTHENTICATION
if (auth_type == LEVEL_GUEST) {
espresponse->println ("Error: Wrong authentication!");
return false;
}
#endif
parameter = get_param (cmd_params, "", true);
if (parameter.length() != 0) {
int8_t state = get_sd_state(true);
if (state == SDCARD_IDLE) {
File file2del = SD.open(cmd_params.c_str());
if (file2del) {
if (file2del.isDirectory()) {
if (!SD.rmdir((char *)cmd_params.c_str())) {
espresponse->println ("Error: Cannot delete directory! Is directory empty?");
} else {
espresponse->println ("Directory deleted.");
}
} else {
if (!SD.remove((char *)cmd_params.c_str())) {
espresponse->println ("Error: Cannot delete file!");
} else {
espresponse->println ("File deleted.");
}
}
} else {
espresponse->println ("Error: Cannot stat file!");
}
file2del.close();
} else {
espresponse->println ((state == SDCARD_NOT_PRESENT) ? "No SD card" : "Busy");
}
} else {
espresponse->println ("Error: Missing file name!");
}
}
break;
//print SD file //print SD file
//[ESP220]<filename> //[ESP220]<filename>
case 220: case 220:

4
Grbl_Esp32/system.cpp
View File

@@ -45,8 +45,8 @@ void system_ini() // Renamed from system_init() due to conflict with esp32 files
#endif #endif
//customize pin definition if needed //customize pin definition if needed
#if (GRBL_SPI_SS != -1) || (GRBL_SPI_MISO != -1) || (GRBL_SPI_MOSI != -1) || (GRBL_SPI_SCK != -1) #if (GRBL_SPI_SS != -1) || (GRBL_SPI_MIS0 != -1) || (GRBL_SPI_MOSI != -1) || (GRBL_SPI_SCK != -1)
SPI.begin(GRBL_SPI_SCK, GRBL_SPI_MISO, GRBL_SPI_MOSI, GRBL_SPI_SS); SPI.begin(GRBL_SPI_SCK, GRBL_SPI_MIS0, GRBL_SPI_MOSI, GRBL_SPI_SS);
#endif #endif
} }