Added new Panel stuff

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

diff --git a/src/main.cpp b/src/main.cpp
index 837d429..455e6b7 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,30 +10,80 @@
 #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/Player.h"
+#include "modules/robot/Conveyor.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 "libs/ChaNFSSD/SDFileSystem.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"
 #include "libs/utils.h"
 
-#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 ).
-//LocalFileSystem local("local");       // LPC17xx specific : comment if you are not running a mBed
-USBCDCMSC cdcmsc(&sd);                  // LPC17xx specific : Composite serial + msc USB device
+// Debug
+#include "libs/SerialMessage.h"
+
+#include "libs/USBDevice/USB.h"
+#include "libs/USBDevice/USBMSD/USBMSD.h"
+#include "libs/USBDevice/USBMSD/SDCard.h"
+#include "libs/USBDevice/USBSerial/USBSerial.h"
+#include "libs/USBDevice/DFU.h"
+
+#include "libs/SDFAT.h"
+
+#include "libs/Watchdog.h"
+
+#include "version.h"
+
+#define second_usb_serial_enable_checksum  CHECKSUM("second_usb_serial_enable")
+
+// Watchdog wd(5000000, WDT_MRI);
+
+// 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);
+
+SDFAT mounter("sd", &sd);
+
+char buf[512];
+
+GPIO leds[5] = {
+    GPIO(P1_18),
+    GPIO(P1_19),
+    GPIO(P1_20),
+    GPIO(P1_21),
+    GPIO(P4_28)
+};
 
 int main() {
 
+    // Default pins to low status
+    for (int i = 0; i < 5; i++){
+        leds[i].output();
+        leds[i] = (i & 1) ^ 1;
+    }
+
+    sd.disk_initialize();
+
     Kernel* kernel = new Kernel();
 
-    kernel->streams->printf("Smoothie ( grbl port ) version 0.7.0 \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());
 
-    kernel->add_module( new Laser(p21) );
+    // Create and add main modules
+    kernel->add_module( new Laser() );
     kernel->add_module( new Extruder() );
     kernel->add_module( new SimpleShell() );
     kernel->add_module( new Configurator() );
@@ -41,15 +91,25 @@ int main() {
     kernel->add_module( new TemperatureControlPool() );
     kernel->add_module( new SwitchPool() );
     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() );
 
-    kernel->add_module( &cdcmsc );
-   
-    kernel->streams->printf("start\r\n");
+    // Create and initialize USB stuff
+    u.init();
+    kernel->add_module( &msc );
+    kernel->add_module( &usbserial );
+    if( kernel->config->value( second_usb_serial_enable_checksum )->by_default(false)->as_bool() ){
+        kernel->add_module( new USBSerial(&u) );
+    }
+    kernel->add_module( &dfu );
+    kernel->add_module( &u );
 
+    // Main loop
     while(1){
         kernel->call_event(ON_MAIN_LOOP);
         kernel->call_event(ON_IDLE);
     }
 }
-