Added new Panel stuff

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

diff --git a/src/main.cpp b/src/main.cpp
index 28009ea..455e6b7 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,15 +10,17 @@
 #include "modules/tools/extruder/Extruder.h"
 #include "modules/tools/temperaturecontrol/TemperatureControlPool.h"
 #include "modules/tools/endstops/Endstops.h"
+#include "modules/tools/touchprobe/Touchprobe.h"
 #include "modules/tools/switch/SwitchPool.h"
 #include "modules/robot/Conveyor.h"
-#include "modules/utils/button/ButtonPool.h"
 #include "modules/utils/simpleshell/SimpleShell.h"
 #include "modules/utils/configurator/Configurator.h"
 #include "modules/utils/currentcontrol/CurrentControl.h"
 #include "modules/utils/player/Player.h"
 #include "modules/utils/pausebutton/PauseButton.h"
 #include "modules/utils/PlayLed/PlayLed.h"
+#include "modules/utils/panel/Panel.h"
+
 // #include "libs/ChaNFSSD/SDFileSystem.h"
 #include "libs/Config.h"
 #include "libs/nuts_bolts.h"
@@ -37,18 +39,17 @@
 
 #include "libs/Watchdog.h"
 
+#include "version.h"
+
 #define second_usb_serial_enable_checksum  CHECKSUM("second_usb_serial_enable")
 
 // Watchdog wd(5000000, WDT_MRI);
 
-// #include "libs/USBCDCMSC/USBCDCMSC.h"
-// SDFileSystem sd(p5, p6, p7, p8, "sd");  // LPC17xx specific : comment if you are not using a SD card ( for example with a mBed ).
-SDCard sd(P0_9, P0_8, P0_7, P0_6);
-//LocalFileSystem local("local");       // LPC17xx specific : comment if you are not running a mBed
-// USBCDCMSC cdcmsc(&sd);                  // LPC17xx specific : Composite serial + msc USB device
+// USB Stuff
+SDCard sd(P0_9, P0_8, P0_7, P0_6);      // this selects SPI1 as the sdcard as it is on Smoothieboard
+//SDCard sd(P0_18, P0_17, P0_15, P0_16);  // this selects SPI0 as the sdcard
 
 USB u;
-
 USBSerial usbserial(&u);
 USBMSD msc(&u, &sd);
 DFU dfu(&u);
@@ -77,7 +78,9 @@ int main() {
 
     Kernel* kernel = new Kernel();
 
-    kernel->streams->printf("Smoothie ( grbl port ) version 0.7.2 \r\n");
+    kernel->streams->printf("Smoothie ( grbl port ) version 0.7.2 with new accel @%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());
 
     // Create and add main modules
     kernel->add_module( new Laser() );
@@ -87,11 +90,12 @@ int main() {
     kernel->add_module( new CurrentControl() );
     kernel->add_module( new TemperatureControlPool() );
     kernel->add_module( new SwitchPool() );
-    kernel->add_module( new ButtonPool() );
     kernel->add_module( new PauseButton() );
     kernel->add_module( new PlayLed() );
     kernel->add_module( new Endstops() );
     kernel->add_module( new Player() );
+       kernel->add_module( new Panel() );
+    kernel->add_module( new Touchprobe() );
 
     // Create and initialize USB stuff
     u.init();