3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile error

Browse Source 
fix compile


Fix compile error
This commit is contained in:
Alex Voinea 2020-08-12 17:25:49 +03:00
parent 5530b99882
commit 8d9dc73d1b
No known key found for this signature in database
GPG Key ID: F5034E7CFCF2F973
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Dcodes.cpp
View File

@ -1,5 +1,5 @@
#include "Dcodes.h" #include "Dcodes.h"
//#include "Marlin.h" #include "Marlin.h"
#include "Configuration.h" #include "Configuration.h"
#include "language.h" #include "language.h"
#include "cmdqueue.h" #include "cmdqueue.h"

2
Firmware/Marlin.h
View File

@ -512,6 +512,6 @@ void load_filament_final_feed();
void marlin_wait_for_click(); void marlin_wait_for_click();
void raise_z_above(float target, bool plan=true); void raise_z_above(float target, bool plan=true);
void softReset(); extern "C" void softReset();
#endif #endif

13
Firmware/Marlin_main.cpp
View File

@ -648,6 +648,12 @@ void failstats_reset_print()
#endif #endif
} }
void softReset()
{
cli();
wdt_enable(WDTO_15MS);
while(1);
}
#ifdef MESH_BED_LEVELING #ifdef MESH_BED_LEVELING
@ -11715,13 +11721,6 @@ void disable_force_z()
#endif // TMC2130 #endif // TMC2130
} }
void softReset()
{
cli();
wdt_enable(WDTO_15MS);
while(1);
}
void enable_force_z() void enable_force_z()
{ {
if(bEnableForce_z) if(bEnableForce_z)