FIx suspend/pause and saving/restoring Extruder state, this is complex due to possibl...

[clinton/Smoothieware.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 90bfc80..351f965 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -89,11 +89,6 @@ GPIO leds[5] = {
     GPIO(P4_28)
 };
 
-// debug pins, only used if defined in src/makefile
-#ifdef STEPTICKER_DEBUG_PIN
-GPIO stepticker_debug_pin(STEPTICKER_DEBUG_PIN);
-#endif
-
 void init() {
 
     // Default pins to low status
@@ -102,16 +97,14 @@ void init() {
         leds[i]= 0;
     }
 
-#ifdef STEPTICKER_DEBUG_PIN
-    stepticker_debug_pin.output();
-    stepticker_debug_pin= 0;
-#endif
-
     Kernel* kernel = new Kernel();
 
     kernel->streams->printf("Smoothie Running @%ldMHz\r\n", SystemCoreClock / 1000000);
     Version version;
     kernel->streams->printf("  Build version %s, Build date %s\r\n", version.get_build(), version.get_build_date());
+#ifdef CNC
+    kernel->streams->printf("  CNC Build\r\n");
+#endif
 
     bool sdok= (sd.disk_initialize() == 0);
     if(!sdok) kernel->streams->printf("SDCard failed to initialize\r\n");
@@ -262,6 +255,7 @@ void init() {
     }
 
     // start the timers and interrupts
+    THEKERNEL->conveyor->start();
     THEKERNEL->step_ticker->start();
     THEKERNEL->slow_ticker->start();
 }