Browse Source

Fix M30 issue

FB4S_WIFI
Sergey 3 years ago
parent
commit
8563a3c65d
  1. 14
      Marlin/src/gcode/gcode.cpp
  2. 5
      Marlin/src/module/mks_wifi/mks_wifi_gcodes.cpp
  3. 4
      platformio.ini

14
Marlin/src/gcode/gcode.cpp

@ -540,10 +540,11 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
mks_m30(parser.string_arg); mks_m30(parser.string_arg);
}else{ }else{
M30(); M30();
} };
#else #else
M30(); M30();
#endif #endif
break;
#if HAS_MEDIA_SUBCALLS #if HAS_MEDIA_SUBCALLS
case 32: M32(); break; // M32: Select file and start SD print case 32: M32(); break; // M32: Select file and start SD print
@ -605,7 +606,8 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#else #else
M105(); M105();
#endif #endif
return; // M105: Report Temperatures (and say "ok") break;
// M105: Report Temperatures (and say "ok")
#if HAS_FAN #if HAS_FAN
case 106: M106(); break; // M106: Fan On case 106: M106(); break; // M106: Fan On
@ -1084,9 +1086,9 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#endif #endif
#if ENABLED(MKS_WIFI) #if ENABLED(MKS_WIFI)
case 991: if(port.index == MKS_WIFI_SERIAL_NUM){mks_m991();}; return; case 991: if(port.index == MKS_WIFI_SERIAL_NUM){mks_m991();}; break;
case 992: if(port.index == MKS_WIFI_SERIAL_NUM){mks_m992();}; return; case 992: if(port.index == MKS_WIFI_SERIAL_NUM){mks_m992();}; break;
case 994: if(port.index == MKS_WIFI_SERIAL_NUM){mks_m994();}; return; case 994: if(port.index == MKS_WIFI_SERIAL_NUM){mks_m994();}; break;
#endif #endif
#if ENABLED(MKS_WIFI) #if ENABLED(MKS_WIFI)
@ -1098,7 +1100,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
M997(); M997();
#endif #endif
}; };
return; break;
#else #else
#if ENABLED(PLATFORM_M997_SUPPORT) #if ENABLED(PLATFORM_M997_SUPPORT)
case 997: M997(); break; // M997: Perform in-application firmware update case 997: M997(); break; // M997: Perform in-application firmware update

5
Marlin/src/module/mks_wifi/mks_wifi_gcodes.cpp

@ -106,7 +106,10 @@ void mks_m27(void){
void mks_m30(char *filename){ void mks_m30(char *filename){
filename[0]='0'; if( (filename[0] == '1') && (filename[1]=':') ){ //Full path form Cura "1:/filename"
filename[0]='0';
}
DEBUG("M30: %s",filename); DEBUG("M30: %s",filename);
sd_delete_file(filename); sd_delete_file(filename);

4
platformio.ini

@ -14,8 +14,8 @@
src_dir = Marlin src_dir = Marlin
boards_dir = buildroot/share/PlatformIO/boards boards_dir = buildroot/share/PlatformIO/boards
#default_envs = mks_robin_nano_v1_3_f4 #default_envs = mks_robin_nano_v1_3_f4
#default_envs = mks_robin_nano35_maple default_envs = mks_robin_nano35_maple
default_envs = mks_robin_nano35 #default_envs = mks_robin_nano35
include_dir = Marlin include_dir = Marlin
extra_configs = extra_configs =
ini/avr.ini ini/avr.ini

Loading…
Cancel
Save