Browse Source

Fix compile error

fix compile


Fix compile error
Alex Voinea 4 years ago
parent
commit
8d9dc73d1b
3 changed files with 8 additions and 9 deletions
  1. 1 1
      Firmware/Dcodes.cpp
  2. 1 1
      Firmware/Marlin.h
  3. 6 7
      Firmware/Marlin_main.cpp

+ 1 - 1
Firmware/Dcodes.cpp

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

+ 1 - 1
Firmware/Marlin.h

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

+ 6 - 7
Firmware/Marlin_main.cpp

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