diff --git a/SphereBot Arduino/SphereBot/SphereBot.ino b/SphereBot Arduino/SphereBot/SphereBot.ino index 02bbb8a..dc5d9b8 100644 --- a/SphereBot Arduino/SphereBot/SphereBot.ino +++ b/SphereBot Arduino/SphereBot/SphereBot.ino @@ -426,7 +426,7 @@ void process_commands(char command[], int command_length) // deals with standard for(int i=0;i<100;i++) { SoftwareServo::refresh(); - delay(80); + delay(250); } servoEnabled=false; } diff --git a/Spherebot_UI/Spherebot_UI.pro.user b/Spherebot_UI/Spherebot_UI.pro.user index 0eea0c6..fe909d2 100644 --- a/Spherebot_UI/Spherebot_UI.pro.user +++ b/Spherebot_UI/Spherebot_UI.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -270,7 +270,7 @@ Spherebot_UI - Qt4ProjectManager.Qt4RunConfiguration:G:/A_PROJECTS/Spherebot-Host-GUI V2.0/Spherebot_UI/Spherebot_UI.pro + Qt4ProjectManager.Qt4RunConfiguration:F:/User-Daten/Documents/GitHub/Spherebot-Host-GUI/Spherebot_UI/Spherebot_UI.pro Spherebot_UI.pro false diff --git a/Spherebot_UI/bin/Spherebot_UI.exe b/Spherebot_UI/bin/Spherebot_UI.exe index 1eabe37..19d5bdc 100644 Binary files a/Spherebot_UI/bin/Spherebot_UI.exe and b/Spherebot_UI/bin/Spherebot_UI.exe differ diff --git a/Spherebot_UI/mainwindow.cpp b/Spherebot_UI/mainwindow.cpp index 93f26cd..c441ecc 100644 --- a/Spherebot_UI/mainwindow.cpp +++ b/Spherebot_UI/mainwindow.cpp @@ -193,6 +193,16 @@ bool MainWindow::saveFile(const QString &fileName) return true; } +void MainWindow::interpretGcode(QString code) +{ + code = removeComments(code); + QStringList lines = code.split("\n"); + for(int i;iport->canReadLine()) diff --git a/Spherebot_UI/mainwindow.h b/Spherebot_UI/mainwindow.h index 1498362..d0bbc94 100644 --- a/Spherebot_UI/mainwindow.h +++ b/Spherebot_UI/mainwindow.h @@ -102,6 +102,7 @@ private: QMessageBox *restartLayerMsgBox; QTimer FitInTimer; //timer to trigger the fitIn function for the graphics view. Actually this shouldn´t be necessary! + void interpretGcode(QString code); }; #endif // MAINWINDOW_H