Merge pull request #1301 from wolfmanjm/add/temps_to_query

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

diff --git a/src/main.cpp b/src/main.cpp
index d0f2647..4bb591e 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -101,11 +101,7 @@ void init() {
     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
+    SimpleShell::version_command("", kernel->streams);
 
     bool sdok= (sd.disk_initialize() == 0);
     if(!sdok) kernel->streams->printf("SDCard failed to initialize\r\n");
@@ -116,7 +112,7 @@ void init() {
 
 #ifdef DISABLEMSD
     // attempt to be able to disable msd in config
-    if(sdok && !kernel->config->value( disable_msd_checksum )->by_default(false)->as_bool()){
+    if(sdok && !kernel->config->value( disable_msd_checksum )->by_default(true)->as_bool()){
         // HACK to zero the memory USBMSD uses as it and its objects seem to not initialize properly in the ctor
         size_t n= sizeof(USBMSD);
         void *v = AHB0.alloc(n);
@@ -158,7 +154,7 @@ void init() {
     delete tp;
     #endif
     #ifndef NO_TOOLS_LASER
-//    kernel->add_module( new Laser() );
+    kernel->add_module( new Laser() );
     #endif
     #ifndef NO_TOOLS_SPINDLE
     SpindleMaker *sm= new SpindleMaker();